1053 files changed, 108996 insertions, 180483 deletions

diff --git a/BibleTime.kdevelop b/BibleTime.kdevelop
new file mode 100644
index 0000000..09dca47
--- /dev/null
+++ b/BibleTime.kdevelop
@@ -0,0 +1,137 @@
+<?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
new file mode 100644
index 0000000..b3b6af6
--- /dev/null
+++ b/BibleTime.kdevelop.pcs
diff --git a/BibleTime.kdevses b/BibleTime.kdevses
new file mode 100644
index 0000000..39e3e5e
--- /dev/null
+++ b/BibleTime.kdevses
@@ -0,0 +1,20 @@
+<?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/ChangeLog b/ChangeLog
index b0910e2..3efc7da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,86 @@
-<release-date> Joachim Ansorg <jansorg@gmx.de>
+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
@@ -129,10 +211,10 @@
 	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
 
@@ -280,7 +362,7 @@
 	*ResizeEvent in SearchScopeDialog
 
 1999-11-20 	Joachim Ansorg <Jockel123@gmx.de>
-	*Startuplogo is now a PNG, this makes the distribution smaller
+  *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>
@@ -491,3 +573,4 @@
 
 1999-08-27	Joachim Ansorg <Jockel123@gmx.de>
 	*First public release of BibleTime: Version 0.1
+
diff --git a/INSTALL b/INSTALL
index 6f9b1ca..7596a0a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,36 +1,57 @@
-Additions for BibleTime 1.1:
+Additions for BibleTime 1.4.1:
 ---------------------------
 
-These are instructions how to install BibleTime 1.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.1 requires:
-	-QT 2.2.x or later
-	-KDE 2.2.x (at least the libraries and the base package)
-	-SWORD 1.5.3
-	
-If you don't have the sources already please browse to www.bibletime.de to see
-a list of required packages with their download URLs.	
-		
-Compile BibleTime 1.1:
-----------------------------
-
-export QTDIR=<QT 2.2.x source directory>
-export KDEDIR=<KDE2 directory (where KDE2 is installed)>
+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
-make -f Makefile.cvs
-./configure					# create makefiles
-make							# compile BibleTime
-make install				# install BibleTime
+./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 jansorg@gmx.de, my peronal
+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.1. The new handbook
+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.
 
-Joachim <jansorg@gmx.de>
+The BibleTime team <info@bibletime.info>
 
 
 ______________________________________________________________________________
diff --git a/INSTALL.in b/INSTALL.in
index 4daa114..21c25ac 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -6,31 +6,52 @@ It's sometimes a little bit tricky to get Bibletime and SWORD working, but
 it's possible.
 
 BibleTime @VERSION@ requires:
-	-QT 2.2.x or later
-	-KDE 2.2.x (at least the libraries and the base package)
-	-SWORD 1.5.3
-	
-If you don't have the sources already please browse to www.bibletime.de to see
-a list of required packages with their download URLs.	
-		
+	-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 2.2.x source directory>
-export KDEDIR=<KDE2 directory (where KDE2 is installed)>
+export QTDIR=<QT source directory>
+export KDEDIR=<KDE directory (where KDE is installed)>
 export PATH=$KDEDIR/bin:$PATH
-make -f Makefile.cvs
-./configure					# create makefiles
-make							# compile BibleTime
-make install				# install BibleTime
+./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 jansorg@gmx.de, my peronal
+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.
 
-Joachim <jansorg@gmx.de>
+The BibleTime team <info@bibletime.info>
 
 
 ______________________________________________________________________________
diff --git a/Makefile.am b/Makefile.am
index 6acd225..184b725 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = bibletime admin .
+SUBDIRS = bibletime pot docs .
 
 EXTRA_DIST = \
 bibletime.kdevprj \
@@ -6,21 +6,45 @@ COPYING \
 ChangeLog \
 bibletime.spec.in bibletime.spec \
 README.in README \
-TODO.in TODO \
 INSTALL.in INSTALL\
 bibletime.lsm.in bibletime.lsm \
 configure.in.in configure.in \
 bibletime.desktop.in bibletime.desktop \
 NEWS.in NEWS \
-Makefile.cvs \
+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 = foreign 
-
-datadir = $(kde_appsdir)/Applications
-data_DATA = bibletime.desktop
+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
@@ -33,9 +57,21 @@ $(top_srcdir)/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:	
-	cd $(distdir) && make -f Makefile.cvs
+	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
index 030b140..2444ea1 100644
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -1,15 +1,14 @@
+#
+# 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 ""
-	@if test ! -d admin; then \
-	   echo "Please recheckout this module!" ;\
-	   echo "for cvs: use checkout once and after that update again" ;\
-	   echo "for cvsup: checkout kde-common from cvsup and" ;\
-	   echo "   link kde-common/admin to ./admin" ;\
-	   exit 1 ;\
-	fi
 	$(MAKE) -f admin/Makefile.common cvs
 
 .SILENT:
diff --git a/Makefile.in b/Makefile.in
index f6c6092..8decb16 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,189 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = .
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -201,141 +229,166 @@ 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@
-micodir = @micodir@
+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@
-
-SUBDIRS = bibletime admin .
-
-EXTRA_DIST =  bibletime.kdevprj COPYING ChangeLog bibletime.spec.in bibletime.spec README.in README TODO.in TODO INSTALL.in INSTALL bibletime.lsm.in bibletime.lsm configure.in.in configure.in bibletime.desktop.in bibletime.desktop NEWS.in NEWS Makefile.cvs bibletime.m4 sword.m4
-
+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 = foreign 
-
-datadir = $(kde_appsdir)/Applications
-data_DATA = bibletime.desktop
+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 TODO bibletime.lsm \
-bibletime.spec bibletime.desktop
-DATA =  $(data_DATA)
-
-DIST_COMMON =  README ./stamp-h.in COPYING ChangeLog INSTALL INSTALL.in \
-Makefile.am Makefile.in NEWS NEWS.in README.in TODO TODO.in \
-acinclude.m4 aclocal.m4 bibletime.desktop.in bibletime.lsm.in \
-bibletime.spec.in config.guess config.h.in config.sub configure \
-configure.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=bibletime.kdevses bibletime.start extractrc make-messages.sh packaging-howto.txt preparetips 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
+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  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --foreign ./Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign ./Makefile
-	cd $(top_srcdir) && perl admin/am_edit Makefile.in
+all: docs-am  config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+.SUFFIXES:
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
+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)
 
-config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
+$(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)
+$(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
 
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
 	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
 	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
 
-mostlyclean-hdr:
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
 
-clean-hdr:
+$(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
-
-maintainer-clean-hdr:
+	-rm -f config.h stamp-h1
 NEWS: $(top_builddir)/config.status NEWS.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 README: $(top_builddir)/config.status README.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 INSTALL: $(top_builddir)/config.status INSTALL.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-TODO: $(top_builddir)/config.status TODO.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 bibletime.lsm: $(top_builddir)/config.status bibletime.lsm.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 bibletime.spec: $(top_builddir)/config.status bibletime.spec.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 bibletime.desktop: $(top_builddir)/config.status bibletime.desktop.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-install-dataDATA: $(data_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	@list='$(data_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p; \
-	  fi; fi; \
-	done
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
-uninstall-dataDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(data_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(datadir)/$$p; \
-	done
+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.
@@ -343,13 +396,8 @@ uninstall-dataDATA:
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -369,13 +417,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -391,184 +444,312 @@ 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)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+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 -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+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
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
+top_distdir = .
 distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
 
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
+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)
-	-rm -rf $(distdir)
+	$(am__remove_distdir)
 	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign ./Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	$(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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (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
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
+	$(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
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+all-am: Makefile config.h
+installdirs: installdirs-recursive
+installdirs-am:
 
-install-exec-am:
+install: install-recursive
 install-exec: install-exec-recursive
-
-install-data-am: install-dataDATA install-data-local
 install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-dataDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(DATA) config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(datadir)
-
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 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)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
-
 #>- clean: clean-recursive
 #>+ 1
 clean: kde-rpo-clean  clean-recursive
 
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
-	-rm -f libtool
+#>- clean-am: clean-generic clean-libtool mostlyclean-am
+#>+ 1
+clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -f config.status
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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 config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-uninstall-dataDATA install-dataDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-local install-data-am \
-install-data install-am install uninstall-am uninstall all-redirect \
-all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+	-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
@@ -582,33 +763,90 @@ $(top_srcdir)/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
 
-dist-hook:	
-	cd $(distdir) && make -f Makefile.cvs
+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:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --foreign ./Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  Makefile
 	cd $(top_srcdir) && perl admin/am_edit Makefile.in
 
 
-#>+ 2
+#>+ 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
-#>+ 2
+
+#>+ 3
+final-install:
+	$(MAKE) install-am
+
+#>+ 3
 no-final:
 	$(MAKE) all-am
+
+#>+ 3
+no-final-install:
+	$(MAKE) install-am
+
 #>+ 3
 cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common 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
index c5a7988..91c101d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+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.
diff --git a/NEWS.in b/NEWS.in
index c5a7988..91c101d 100644
--- a/NEWS.in
+++ b/NEWS.in
@@ -1,3 +1,12 @@
+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.
diff --git a/README b/README
index ea4aa9f..a739762 100644
--- a/README
+++ b/README
@@ -7,42 +7,35 @@ In this file:
 
 General introduction:
 --------------------
-	This is BibleTime 1.1 for KDE 2.2.x.
-If you find bugs please report them to info@bibletime.de or use our
-online bugreport form on www.bibletime.de.
+This is BibleTime 1.4.1. BibleTime is a Bible study application for KDE 3.0 or later.
 
-Please do also send suggestions, criticism and moral support to info@bibletime.de .
-If you have too much money send it to one of the authors ;-)
+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.
-The AUTHORS file contains a list of authors working on BibleTime.
-There's also a SPEC file to create RPMs, it's called bibletime.spec.
+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 new handbook, it contains many instructions about the usage and
+Please read also the handbook, it contains many instructions about the usage and
 installation of BibleTime.
 
-And sorry for all the spelling errors (grammatical and syntax).
 
-Requirements
-------------
-	o QT 2.2x or later
-	o KDE 2.x
-	o SWORD 1.5.3
+Requirements: see file INSTALL
+-------------
 
 Documentation:
 --------------
-	We do have a great and really useful handbook now!
-Fred did a great job with it and worked long on it. We hope that you like it. You can read the handbook in the 
-help browser of KDE2. It's in the Applications section.
+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 distribute 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.de.
-If you don't live in Europe please have a look at www.crosswire.org.
-			
+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!
-Joachim <jansorg@gmx.de>
-
+The BibleTime developers, <info@bibletime.info>
diff --git a/README.in b/README.in
index 4716784..be8a628 100644
--- a/README.in
+++ b/README.in
@@ -7,42 +7,35 @@ In this file:
 
 General introduction:
 --------------------
-	This is BibleTime @VERSION@ for KDE 2.2.x.
-If you find bugs please report them to info@bibletime.de or use our
-online bugreport form on www.bibletime.de.
+This is BibleTime @VERSION@. BibleTime is a Bible study application for KDE 3.0 or later.
 
-Please do also send suggestions, criticism and moral support to info@bibletime.de .
-If you have too much money send it to one of the authors ;-)
+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.
-The AUTHORS file contains a list of authors working on BibleTime.
-There's also a SPEC file to create RPMs, it's called bibletime.spec.
+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 new handbook, it contains many instructions about the usage and
+Please read also the handbook, it contains many instructions about the usage and
 installation of BibleTime.
 
-And sorry for all the spelling errors (grammatical and syntax).
 
-Requirements
-------------
-	o QT 2.2x or later
-	o KDE 2.x
-	o SWORD 1.5.3
+Requirements: see file INSTALL
+-------------
 
 Documentation:
 --------------
-	We do have a great and really useful handbook now!
-Fred did a great job with it and worked long on it. We hope that you like it. You can read the handbook in the 
-help browser of KDE2. It's in the Applications section.
+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 distribute 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.de.
-If you don't live in Europe please have a look at www.crosswire.org.
-			
+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!
-Joachim <jansorg@gmx.de>
-
+The BibleTime developers, <info@bibletime.info>
diff --git a/TODO b/TODO
deleted file mode 100644
index 500ab9f..0000000
--- a/TODO
+++ /dev/null
@@ -1,34 +0,0 @@
-ToDo file for BibleTime 1.1
-
-Help wanted
------------
-
-We do especially need developers, but there are also other jobs like
-documentation writing, translating, artwork etc.
-For further information, see www.bibletime.de
-and www.sourceforge.net/projects/bibletime.
-
-Important unimplemented things:
--------------------------------
-	-searchdialog
-		o Better interface so it's more easy to use (thanks to Dre for the suggestions)
-		o perhaps RegExp edit widget (later)
-	-Installmanager
-	-Morphological analysis (maybe in 2.0 :)
-
-Things which should be optimized:
----------------------------------
-	[partly] Search for mem leaks
-	[partly] Optmize memory usage
-	[partly] Check BibleTime with a profiler and optimize the time consuming functions
-
-Features we are thinking about:
-------------------------------
-	-Commandline options: Implement commandline options to control BibleTime
-	  (e.g. open presenters, lookup verses and exit, import bookmarks and exit etc.	)
-
-	
-For a more up-to-date list of task please have a look at www.sourceforge.net/projects/bibletime/!
-
-
-Thank you!
\ No newline at end of file
diff --git a/TODO.in b/TODO.in
deleted file mode 100644
index 373aa0a..0000000
--- a/TODO.in
+++ /dev/null
@@ -1,34 +0,0 @@
-ToDo file for BibleTime @VERSION@
-
-Help wanted
------------
-
-We do especially need developers, but there are also other jobs like
-documentation writing, translating, artwork etc.
-For further information, see www.bibletime.de
-and www.sourceforge.net/projects/bibletime.
-
-Important unimplemented things:
--------------------------------
-	-searchdialog
-		o Better interface so it's more easy to use (thanks to Dre for the suggestions)
-		o perhaps RegExp edit widget (later)
-	-Installmanager
-	-Morphological analysis (maybe in 2.0 :)
-
-Things which should be optimized:
----------------------------------
-	[partly] Search for mem leaks
-	[partly] Optmize memory usage
-	[partly] Check BibleTime with a profiler and optimize the time consuming functions
-
-Features we are thinking about:
-------------------------------
-	-Commandline options: Implement commandline options to control BibleTime
-	  (e.g. open presenters, lookup verses and exit, import bookmarks and exit etc.	)
-
-	
-For a more up-to-date list of task please have a look at www.sourceforge.net/projects/bibletime/!
-
-
-Thank you!
\ No newline at end of file
diff --git a/acinclude.m4 b/acinclude.m4
index c5aafd7..64a6761 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -21,28 +21,142 @@ 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. If you decide that you
-dnl really want to modify it, contact coolo@kde.org mentioning that you have
-dnl and that the modified file should be committed to every module.
+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.
 
-dnl ------------------------------------------------------------------------
-dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
-dnl thanks to Raja R Harinath.
-dnl ------------------------------------------------------------------------
-dnl
-ifdef([_AC_PATH_X_DIRECT],[],
-   [AC_DEFUN([_AC_PATH_X_DIRECT],[AC_PATH_X_DIRECT])])
-ifdef([_AC_PATH_X_XMKMF],[],
-   [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])])
+# 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,
+AC_DEFUN([AC_FIND_FILE],
 [
 $3=NO
 for i in $2;
@@ -61,7 +175,7 @@ done
 
 dnl KDE_FIND_PATH(programm-name, variable-name, list of directories,
 dnl	if-not-found, test-parameter)
-AC_DEFUN(KDE_FIND_PATH,
+AC_DEFUN([KDE_FIND_PATH],
 [
    AC_MSG_CHECKING([for $1])
    if test -n "$$2"; then
@@ -114,7 +228,7 @@ AC_DEFUN(KDE_FIND_PATH,
    fi
 ])
 
-AC_DEFUN(KDE_MOC_ERROR_MESSAGE,
+AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
 [
     AC_MSG_ERROR([No Qt meta object compiler (moc) found!
 Please check whether you installed Qt correctly.
@@ -126,7 +240,7 @@ configure.
 ])
 ])
 
-AC_DEFUN(KDE_UIC_ERROR_MESSAGE,
+AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
 [
     AC_MSG_WARN([No Qt ui compiler (uic) found!
 Please check whether you installed Qt correctly.
@@ -138,13 +252,45 @@ 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_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"
@@ -156,10 +302,24 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC,
 
    KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
    if test -z "$UIC_NOT_NEEDED"; then
-     KDE_FIND_PATH(uic, UIC, [$qt_bindirs], [UIC=""])
-     if test -z "$UIC" ; 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: "
@@ -167,9 +327,16 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC,
 
    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,
+AC_DEFUN([KDE_1_CHECK_PATHS],
 [
   KDE_1_CHECK_PATH_HEADERS
 
@@ -217,7 +384,7 @@ KDE_SET_PATHS($kde_result)
 
 ])
 
-AC_DEFUN(KDE_SET_PATHS,
+AC_DEFUN([KDE_SET_PATHS],
 [
   kde_cv_all_paths="kde_have_all_paths=\"yes\" \
 	kde_htmldir=\"$kde_htmldir\" \
@@ -228,6 +395,7 @@ AC_DEFUN(KDE_SET_PATHS,
 	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\" \
@@ -236,60 +404,87 @@ AC_DEFUN(KDE_SET_PATHS,
 	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,
+AC_DEFUN([KDE_SET_DEFAULT_PATHS],
 [
 if test "$1" = "default"; then
 
   if test -z "$kde_htmldir"; then
-    kde_htmldir='\${prefix}/share/doc/HTML'
+    kde_htmldir='\${datadir}/doc/HTML'
   fi
   if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
+    kde_appsdir='\${datadir}/applnk'
   fi
   if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
+    kde_icondir='\${datadir}/icons'
   fi
   if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
+    kde_sounddir='\${datadir}/sounds'
   fi
   if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
+    kde_datadir='\${datadir}/apps'
   fi
   if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
+    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='\${prefix}/share/config'
+    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='\${prefix}/share/mimelnk'
+    kde_mimedir='\${datadir}/mimelnk'
   fi
   if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
+    kde_toolbardir='\${datadir}/toolbar'
   fi
   if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
+    kde_wallpaperdir='\${datadir}/wallpapers'
   fi
   if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
+    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='\${prefix}/share/services'
+    kde_servicesdir='\${datadir}/services'
   fi
   if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
+    kde_servicetypesdir='\${datadir}/servicetypes'
   fi
   if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
+    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)
@@ -306,31 +501,49 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_PATHS_FOR_COMPLETENESS,
+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 "$kde_have_all_paths" != "yes"; then
+   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_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_SUBST_PROGRAMS,
+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/kde2/bin /usr/kde/bin /usr/local/kde/bin"
+        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=:
@@ -342,13 +555,30 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
+        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/kde2/share /opt/kde/share $prefix/share"
+ 	    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
@@ -359,6 +589,13 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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)
@@ -367,6 +604,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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`
@@ -385,7 +623,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         AC_SUBST(kde_libs_htmldir)
 ])dnl
 
-AC_DEFUN(AC_CREATE_KFSSTND,
+AC_DEFUN([AC_CREATE_KFSSTND],
 [
 AC_REQUIRE([AC_CHECK_RPATH])
 
@@ -403,10 +641,13 @@ 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_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
@@ -430,7 +671,7 @@ KDE_SUBST_PROGRAMS
 
 ])
 
-AC_DEFUN(AC_SUBST_KFSSTND,
+AC_DEFUN([AC_SUBST_KFSSTND],
 [
 AC_SUBST(kde_htmldir)
 AC_SUBST(kde_appsdir)
@@ -439,14 +680,22 @@ 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
@@ -459,9 +708,8 @@ dnl AC_SUBST(kde_cgidir)
 dnl AC_SUBST(kde_toolbardir)
 ])
 
-AC_DEFUN(KDE_MISC_TESTS,
+AC_DEFUN([KDE_MISC_TESTS],
 [
-   AC_LANG_C
    dnl Checks for libraries.
    AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
    AC_SUBST(LIBUTIL)
@@ -480,7 +728,6 @@ support])
       AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
    fi
    AC_CHECK_SOCKLEN_T
-   AC_LANG_C
    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,
@@ -505,27 +752,23 @@ support])
    AC_CHECK_FUNC(shmat, ,
      AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
    
-   # Solaris 2.6 and others need -lresolv for res_init
-   AC_CHECK_FUNCS(res_init, , [
-     kde_libs_safe="$LIBS"
-     LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-     AC_TRY_LINK(
-[
-#include <resolv.h>
-],
-[ 
-res_init(); 
-],
-        LIBRESOLV="-lresolv"
-        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-        AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-     )
-     LIBS=$kde_libs_safe
+   # 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(LIBRESOLV)
    AC_SUBST(X_EXTRA_LIBS)
    AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
    AC_SUBST(LIBUCB)
@@ -541,6 +784,58 @@ res_init();
 
    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 ------------------------------------------------------------------------
@@ -548,13 +843,36 @@ 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_DEFUN([K_PATH_X],
 [
-AC_REQUIRE([AC_PROG_CPP])dnl
 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_LANG_SAVE
-AC_LANG_C
+
 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
@@ -572,7 +890,7 @@ fi
 ac_x_libraries=$kde_x_libraries
 ac_x_includes=$kde_x_includes
 
-_AC_PATH_X_DIRECT
+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
@@ -592,7 +910,7 @@ mips-sgi-irix6*)
     ac_x_includes="."
   fi
   if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib"
+    ac_x_libraries="/usr/lib${kdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -648,11 +966,6 @@ fi
 all_includes="$X_INCLUDES"
 all_libraries="$X_LDFLAGS"
 
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_libraries)
-AC_SUBST(x_includes)
-
 # Check for libraries that X11R6 Xt/Xaw programs need.
 ac_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS $X_LDFLAGS"
@@ -664,13 +977,9 @@ LDFLAGS="$LDFLAGS $X_LDFLAGS"
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
 AC_CHECK_LIB(ICE, IceConnectionNumber,
   [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-AC_SUBST(LIBSM)
 LDFLAGS="$ac_save_LDFLAGS"
 
-AC_SUBST(X_PRE_LIBS)
-
 LIB_X11='-lX11 $(LIBSOCKET)'
-AC_SUBST(LIB_X11)
 
 AC_MSG_CHECKING(for libXext)
 AC_CACHE_VAL(kde_cv_have_libXext,
@@ -692,11 +1001,11 @@ 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)
 
@@ -706,58 +1015,52 @@ can't find it itself, we stop here assuming that make wouldn't find
 them either.])
 fi
 
-AC_MSG_CHECKING(for Xinerama)
-
- AC_ARG_WITH(xinerama,
-  [  --with-xinerama         enable support for Xinerama ],
-  [
-    no_xinerama=no
-  ], [
-    no_xinerama=yes
-  ]
-)
-
-kde_save_LDFLAGS="$LDFLAGS"
-kde_save_CFLAGS="$CFLAGS"
-kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
-
-if test "x$no_xinerama" = "xno"; then
-
-  AC_CACHE_VAL(ac_cv_have_xinerama,
-  [
-	  AC_TRY_LINK([#include <X11/Xlib.h>
-  			#include <X11/extensions/Xinerama.h>],
-	  	  [XineramaIsActive(NULL);],
-		  [ac_cv_have_xinerama="yes"],
-		  [ac_cv_have_xinerama="no"])
-  ])
-else
-  ac_cv_have_xinerama=no;
-fi
-
-AC_MSG_RESULT($ac_cv_have_xinerama)
+LIB_XEXT="-lXext"
+QTE_NORTTI=""
 
-LIBXINERAMA=""
-
-if test "$ac_cv_have_xinerama" = "yes"; then
-  AC_DEFINE(HAVE_XINERAMA, 1, [Define if you want Xinerama support])
-  LIBXINERAMA="-lXinerama"
+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(LIBXINERAMA)
-
-LDFLAGS="$kde_save_LDFLAGS"
-CFLAGS="$kde_save_CFLAGS"
-LIBS="$kde_save_LIBS"
-
-AC_LANG_RESTORE
+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_DEFUN([KDE_PRINT_QT_PROGRAM],
 [
 AC_REQUIRE([KDE_USE_QT])
 cat > conftest.$ac_ext <<EOF
@@ -774,10 +1077,19 @@ EOF
 
 if test $kde_qtsubver -gt 0; then
 cat >> conftest.$ac_ext <<EOF
-#include <qiconview.h>
+#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
@@ -790,83 +1102,107 @@ 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
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
     QString s;
     s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
 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,
+AC_DEFUN([KDE_USE_QT],
 [
-
 if test -z "$1"; then
-  kde_qtver=2
-  kde_qtsubver=1
+  # Current default Qt version: 3.2
+  kde_qtver=3
+  kde_qtsubver=2
 else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9]\+\.\([0-9]\+\).*#\1#'`
-  # following is the check if subversion isn�t found in passed argument
+  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]\+\)\..*#\1#'`
+  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
   if test "$kde_qtver" = "1"; then
     kde_qtsubver=42
-  else
-   # this is the version number fallback to 2.1, unless major version is 1 or 2
-   if test "$kde_qtver" != "2"; then
-    kde_qtver=2
-    kde_qtsubver=1
-   fi
   fi
 fi
 
 if test -z "$2"; then
-  if test $kde_qtver = 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
-  else
+  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
+   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
-   else
+     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
+   fi
 else
-   kde_qt_verstring=$3
+   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"
-else
+fi
+if test $kde_qtver = 1; then
    kde_qt_dirs="$QTDIR /usr/lib/qt"
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_QT_DIRECT,
+AC_DEFUN([KDE_CHECK_QT_DIRECT],
 [
 AC_REQUIRE([KDE_USE_QT])
 AC_MSG_CHECKING([if Qt compiles without flags])
@@ -882,7 +1218,11 @@ 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=
@@ -925,10 +1265,11 @@ 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_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.
@@ -936,98 +1277,129 @@ dnl ------------------------------------------------------------------------
 
 AC_ARG_ENABLE(
   mt,
-  [  --enable-mt             link to threaded Qt (experimental)],
+  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
   kde_use_qt_mt=$enableval,
-  kde_use_qt_mt=no
+  [
+    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 got --enable-qt-mt then adjust some vars for the host.
+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
-
-  case $host in
-  *-*-linux-*)
-    if test "x$GCC" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread"
-      X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-    else
-      AC_MSG_WARN([Compiler is not gcc. MT support disabled.])
-    fi
-    ;;
-  *)
-    AC_MSG_WARN([MT not yet supported on $host - disabled.])
-    ;;
-  esac
-
+  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
-
-  LIBQT_GLOB="libqt.*"
-
+  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
 
-  LIBQT="-lqt"
-  kde_int_qt="-lqt"
+  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
-
-      case $host in
-      *-*-linux-*)
-        if test "x$GCC" = "xyes"; then
-          LIBQT="-lqt-mt"
-          kde_int_qt="-lqt-mt"
-          LIBQT_GLOB="libqt-mt.*"
-          USING_QT_MT="using -mt"
-        fi
-      ;;
-      esac
+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
-
-  kde_qt_was_given=no
-
+  LIBQT_GLOB="lib$qtlib-mt.*"
+  USING_QT_MT="using -mt"
 else
-  kde_int_qt="$LIBQT"
+  LIBQT="-l$qtlib"
 fi
 
-if test $kde_qtver = 2; then
+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,
-    [  --with-qt-dir=DIR       where the root of Qt is installed ],
+    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
     [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib
+       ac_qt_libraries="$withval"/lib${kdelibsuff}
        ac_qt_bindir="$withval"/bin
     ])
 
 AC_ARG_WITH(qt-includes,
-    [  --with-qt-includes=DIR  where the Qt includes are. ],
+    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
     [
        ac_qt_includes="$withval"
     ])
@@ -1035,7 +1407,7 @@ AC_ARG_WITH(qt-includes,
 kde_qt_libs_given=no
 
 AC_ARG_WITH(qt-libraries,
-    [  --with-qt-libraries=DIR where the Qt library is installed.],
+    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
     [  ac_qt_libraries="$withval"
        kde_qt_libs_given=yes
     ])
@@ -1047,12 +1419,12 @@ 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 $x_includes"
+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" = "2"; then
+if test "$kde_qtver" != "1"; then
   kde_qt_header=qstyle.h
 else
   kde_qt_header=qglobal.h
@@ -1063,7 +1435,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib $dir"
+   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
@@ -1077,6 +1449,12 @@ else
     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"
 
@@ -1088,8 +1466,8 @@ ac_ldflags_safe="$LDFLAGS"
 ac_libs_safe="$LIBS"
 
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS"
-LIBS="$LIBS $LIBQT"
+LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
+LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
 
 KDE_PRINT_QT_PROGRAM
 
@@ -1109,6 +1487,7 @@ 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)";
@@ -1116,11 +1495,17 @@ if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
       ac_qt_notfound="(headers)";
     fi
   else
-    ac_qt_notfound="(libraries)";
+    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.])
+For more details about this problem, look at the end of config.log.$missing_qt_mt])
 else
   have_qt="yes"
 fi
@@ -1139,15 +1524,15 @@ else
   qt_includes="$ac_qt_includes"
 fi
 
-if test ! "$kde_qt_libs_given" = "yes"; then
-KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
+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="";
+ QT_INCLUDES=""
 else
  QT_INCLUDES="-I$qt_includes"
  all_includes="$QT_INCLUDES $all_includes"
@@ -1159,27 +1544,93 @@ 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
 
-LIB_QT="$kde_int_qt "'$(LIBPNG) $(LIBJPEG) -lXext $(LIB_X11) $(LIBSM)'
+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_DEFUN([AC_PATH_QT],
 [
 AC_PATH_QT_1_3
 ])
 
-AC_DEFUN(KDE_CHECK_FINAL,
+AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
 [
-  AC_ARG_ENABLE(final, [  --enable-final          build size optimized apps (experimental - needs lots of memory)],
+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)
 
-  KDE_COMPILER_REPO
   if test "x$kde_use_final" = "xyes"; then
       KDE_USE_FINAL_TRUE=""
       KDE_USE_FINAL_FALSE="#"
@@ -1189,10 +1640,15 @@ AC_DEFUN(KDE_CHECK_FINAL,
   fi
   AC_SUBST(KDE_USE_FINAL_TRUE)
   AC_SUBST(KDE_USE_FINAL_FALSE)
+])
 
-  AC_ARG_ENABLE(closure, [  --disable-closure       don't delay template instantiation],
-  	kde_use_closure=$enableval, kde_use_closure=yes)
+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="#"
@@ -1200,9 +1656,44 @@ AC_DEFUN(KDE_CHECK_FINAL,
   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 ------------------------------------------------------------------------
@@ -1211,24 +1702,22 @@ 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_DEFUN([AC_BASE_PATH_KDE],
 [
-AC_PREREQ([2.13])
+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=${prefix}/include
-  ac_kde_includes=$prefix/include
+  kde_includes=${includedir}
+  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
+
+  kde_libraries=${libdir}
+  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
 
-  if test "${exec_prefix}" != NONE; then
-    kde_libraries=${exec_prefix}/lib
-    ac_kde_libraries=$exec_prefix/lib
-  else
-    kde_libraries=${prefix}/lib
-    ac_kde_libraries=$prefix/lib
-  fi
 else
   ac_kde_includes=
   ac_kde_libraries=
@@ -1249,7 +1738,7 @@ 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/kde2/include /opt/kde/include $x_includes $qt_includes"
+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)
@@ -1261,20 +1750,34 @@ 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 /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
+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
-ac_kde_libraries="$kde_libdir"
 
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then
+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 \
@@ -1304,8 +1807,8 @@ if test "$have_kde" != "yes"; then
   AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
  fi
 
- kde_libraries="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
+ kde_libraries="${libdir}"
+ kde_includes="${includedir}"
 
 else
   ac_cv_have_kde="have_kde=yes \
@@ -1324,6 +1827,8 @@ 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 
@@ -1340,14 +1845,21 @@ 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_DEFUN([KDE_CHECK_EXTRA_LIBS],
 [
 AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes, [  --with-extra-includes=DIR
-                          adds non standard include paths],
+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
 )
@@ -1372,7 +1884,7 @@ AC_MSG_RESULT($kde_use_extra_includes)
 
 kde_extra_libs=
 AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs, [  --with-extra-libs=DIR   adds non standard library paths],
+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
 )
@@ -1398,7 +1910,7 @@ AC_MSG_RESULT($kde_use_extra_libs)
 
 ])
 
-AC_DEFUN(KDE_1_CHECK_PATH_HEADERS,
+AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
 [
     AC_MSG_CHECKING([for KDE headers installed])
     AC_LANG_SAVE
@@ -1429,11 +1941,18 @@ int main() {
     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_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
+ ac_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$all_includes $CPPFLAGS"
  if AC_TRY_EVAL(ac_compile); then
    AC_MSG_RESULT(yes)
  else
@@ -1441,11 +1960,12 @@ EOF
 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_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
 AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
@@ -1470,7 +1990,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
 
  LDFLAGS=$kde_ldflags_safe
  LIBS=$kde_libs_safe
- kde_cxxflags_safe="$CXXFLAGS"
+ CXXFLAGS=$kde_cxxflags_safe
 ])
 
 AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
@@ -1481,85 +2001,53 @@ It is a separate package (and CVS module) named kde-qt-addon.])
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_KIMGIO,
-[
-   AC_REQUIRE([AC_BASE_PATH_KDE])
-   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-   AC_REQUIRE([AC_FIND_TIFF])
-   AC_REQUIRE([AC_FIND_JPEG])
-   AC_REQUIRE([AC_FIND_PNG])
-   AC_REQUIRE([KDE_CREATE_LIBS_ALIASES])
-
-   if test "$1" = "existance"; then
-     AC_LANG_SAVE
-     AC_LANG_CPLUSPLUS
-     kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries $LIBJPEG $LIBTIFF $LIBPNG $LIBQT -lm"
-     AC_CHECK_LIB(kimgio, kimgioRegister, [
-      LIBKIMGIO_EXISTS=yes],LIBKIMGIO_EXISTS=no)
-      LIBS="$kde_save_LIBS"
-      AC_LANG_RESTORE
-   else
-      LIBKIMGIO_EXISTS=yes
-   fi
-
-   if test "$LIBKIMGIO_EXISTS" = "yes"; then
-     LIB_KIMGIO='-lkimgio'
-   else
-     LIB_KIMGIO=''
-   fi
-   AC_SUBST(LIB_KIMGIO)
-])
-
-AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
+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 = 2; then
-   LIB_KDECORE='-lkdecore'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFORMULA='-lkformula'
-   AC_SUBST(LIB_KFORMULA)
-   LIB_KIO='-lkio'
-   AC_SUBST(LIB_KIO)
-   LIB_KSYCOCA='-lksycoca'
-   AC_SUBST(LIB_KSYCOCA)
-   LIB_SMB='-lsmb'
-   AC_SUBST(LIB_SMB)
-   LIB_KFILE='-lkfile'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab'
-   AC_SUBST(LIB_KAB)
-   LIB_KHTML='-lkhtml'
-   AC_SUBST(LIB_KHTML)
-   LIB_KSPELL='-lkspell'
-   AC_SUBST(LIB_KSPELL)
-   LIB_KPARTS='-lkparts'
-   AC_SUBST(LIB_KPARTS)
-   LIB_KWRITE='-lkwrite'
-   AC_SUBST(LIB_KWRITE)
+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
-   LIB_KDECORE='-lkdecore -lXext $(LIB_QT)'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui $(LIB_KDECORE)'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFM='-lkfm $(LIB_KDECORE)'
-   AC_SUBST(LIB_KFM)
-   LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)'
-   AC_SUBST(LIB_KAB)
+   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_DEFUN([AC_PATH_KDE],
 [
   AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check, [  --disable-path-check    don't try to find out, where to install],
+  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"
@@ -1580,203 +2068,303 @@ AC_DEFUN(AC_PATH_KDE,
   KDE_CREATE_LIBS_ALIASES
 ])
 
-dnl obsolete
-AC_DEFUN(AC_CHECK_SETENV,
-[
-   AC_OBSOLETE([$0], [; instead use AC_CHECK_FUNCS([setenv unsetenv])])dnl 
-   AC_CHECK_FUNCS([setenv unsetenv])
-])
-
-AC_DEFUN(AC_CHECK_GETDOMAINNAME,
+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 getdomainname)
-AC_CACHE_VAL(ac_cv_func_getdomainname,
+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 "$GCC" = "yes"; then
+if test "$GXX" = "yes"; then
 CXXFLAGS="$CXXFLAGS -pedantic-errors"
 fi
 AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <unistd.h>
+$2
 ],
 [
-char buffer[200];
-getdomainname(buffer, 200);
+$3
 ],
-ac_cv_func_getdomainname=yes,
-ac_cv_func_getdomainname=no)
+kde_cv_func_$1=yes,
+kde_cv_func_$1=no)
 CXXFLAGS="$save_CXXFLAGS"
-LIBS=$kde_safe_LIBS
+LIBS="$kde_safe_LIBS"
 AC_LANG_RESTORE
 ])
-AC_MSG_RESULT($ac_cv_func_getdomainname)
 
-AC_MSG_CHECKING([if getdomainname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_getdomainname,
+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
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  ac_cv_proto_getdomainname=no
-else
   kde_safe_libs=$LIBS
   LIBS="$LIBS $X_EXTRA_LIBS"
   AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
+$2
 
-extern "C" int getdomainname (char *, int);
+extern "C" $4;
 ],
 [
-char buffer[200];
-getdomainname(buffer, 200);
+$3
 ],
-  ac_cv_func_getdomainname=yes
-  ac_cv_proto_getdomainname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR([getdomainname unavailable]))
-fi
+[ 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($ac_cv_proto_getdomainname)
+AC_MSG_RESULT($kde_cv_proto_$1)
 
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME, 1, [Define if you have getdomainname])
+if test "x$kde_cv_func_$1" = xyes; then
+  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
+  $6
 fi
-if eval "test \"`echo $ac_cv_proto_getdomainname`\" = no"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME_PROTO, 1,
-  [Define if you have getdomainname prototype])
+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_GETHOSTNAME,
+AC_DEFUN([AC_CHECK_UNSETENV],
 [
+	KDE_CHECK_FUNC_EXT(unsetenv, [
+#include <stdlib.h>
+], 
+		[unsetenv("VAR");],
+	        [void unsetenv (const char *)],
+		[UNSETENV])
+])
 
-AC_MSG_CHECKING([for gethostname])
-AC_CACHE_VAL(ac_cv_func_gethostname,
+AC_DEFUN([AC_CHECK_GETDOMAINNAME],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_LINK([
+	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);
-],
-ac_cv_func_gethostname=yes,
-ac_cv_func_gethostname=no)
-CXXFLAGS="$save_CXXFLAGS"
-AC_LANG_RESTORE
+], 	
+	        [int gethostname (char *, unsigned int)],
+		[GETHOSTNAME])
 ])
-AC_MSG_RESULT($ac_cv_func_gethostname)
 
-AC_MSG_CHECKING([if gethostname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_gethostname,
+AC_DEFUN([AC_CHECK_USLEEP],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  ac_cv_proto_gethostname=no
-else
-  AC_TRY_LINK([
-#include <stdlib.h>
+	KDE_CHECK_FUNC_EXT(usleep, [
 #include <unistd.h>
+], 
+		[
+usleep(200);
+], 	
+	        [int usleep (unsigned int)],
+		[USLEEP])
+])
 
-extern "C" int gethostname (char *, int);
-],
+
+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];
-gethostname(buffer, 200);
+initgroups(buffer, 27);
 ],
-  ac_cv_func_gethostname=yes
-  ac_cv_proto_gethostname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR(gethostname unavailable))
-fi
-AC_LANG_RESTORE
+	[int initgroups(const char *, gid_t)],
+	[INITGROUPS])
 ])
-AC_MSG_RESULT($ac_cv_proto_gethostname)
 
-if eval "test \"`echo $ac_cv_proto_gethostname`\" = no"; then
-  AC_DEFINE(HAVE_GETHOSTNAME_PROTO, 1,
-  [Define if you have gethostname prototype])
-fi
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  AC_DEFINE(HAVE_GETHOSTNAME, 1, [Define if you have gethostname])
-fi
+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_USLEEP,
+AC_DEFUN([AC_CHECK_MKDTEMP],
 [
-AC_MSG_CHECKING([for usleep])
-AC_CACHE_VAL(ac_cv_func_usleep,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
+	KDE_CHECK_FUNC_EXT(mkdtemp, [
 #include <stdlib.h>
 #include <unistd.h>
 ],
-[
-usleep(200);
+	[
+mkdtemp("/tmp/aaaXXXXXX");
 ],
-ac_cv_func_usleep=yes,
-ac_cv_func_usleep=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_usleep)
-if eval "test \"`echo $ac_cv_func_usleep`\" = yes"; then
-  AC_DEFINE(HAVE_USLEEP, 1, [Define if you have the usleep function])
-fi
+	[char *mkdtemp(char *)],
+	[MKDTEMP])
 ])
 
-AC_DEFUN(AC_CHECK_RANDOM,
+
+AC_DEFUN([AC_CHECK_RES_INIT],
 [
-AC_MSG_CHECKING([for random])
-AC_CACHE_VAL(ac_cv_func_random,
+  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],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
+	KDE_CHECK_FUNC_EXT(strlcpy, [
+#include <string.h>
 ],
-[
-random();
+[ char buf[20];
+  strlcpy(buf, "KDE function test", sizeof(buf));
 ],
-ac_cv_func_random=yes,
-ac_cv_func_random=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
+ 	[unsigned long strlcpy(char*, const char*, unsigned long)],
+	[STRLCPY])
 ])
-AC_MSG_RESULT($ac_cv_func_random)
-if eval "test \"`echo $ac_cv_func_random`\" = yes"; then
-  AC_DEFINE(HAVE_RANDOM, 1, [Define if you have random])
-fi
+
+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_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
@@ -1802,12 +2390,11 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_FIND_JPEG_HELPER,
+AC_DEFUN([KDE_FIND_JPEG_HELPER],
 [
 AC_MSG_CHECKING([for libjpeg$2])
 AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
 [
-AC_LANG_C
 ac_save_LIBS="$LIBS"
 LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
 ac_save_CFLAGS="$CFLAGS"
@@ -1845,7 +2432,7 @@ fi
 
 ])
 
-AC_DEFUN(AC_FIND_JPEG,
+AC_DEFUN([AC_FIND_JPEG],
 [
 dnl first look for libraries
 KDE_FIND_JPEG_HELPER(6b, 6b,
@@ -1858,7 +2445,7 @@ KDE_FIND_JPEG_HELPER(6b, 6b,
 
 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="/usr/include /usr/local/include $kde_extra_includes"
+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=
 
@@ -1885,15 +2472,61 @@ Disabling JPEG support.
 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_DEFUN([AC_FIND_ZLIB],
 [
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_MSG_CHECKING([for libz])
 AC_CACHE_VAL(ac_cv_lib_z,
 [
-AC_LANG_C
 kde_save_LIBS="$LIBS"
 LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
 kde_save_CFLAGS="$CFLAGS"
@@ -1902,7 +2535,14 @@ AC_TRY_LINK(dnl
 [
 #include<zlib.h>
 ],
-            [return (zlibVersion() == ZLIB_VERSION); ],
+[
+  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"
@@ -1911,16 +2551,19 @@ CFLAGS="$kde_save_CFLAGS"
 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_SUBST(LIBZ)
   AC_MSG_RESULT($ac_cv_lib_z)
 else
-  AC_MSG_ERROR(not found. Check your installation and look into config.log)
+  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=""
-  AC_SUBST(LIBZ)
 fi
+AC_SUBST(LIBZ)
 ])
 
-AC_DEFUN(KDE_TRY_TIFFLIB,
+AC_DEFUN([KDE_TRY_TIFFLIB],
 [
 AC_MSG_CHECKING([for libtiff $1])
 
@@ -1929,7 +2572,11 @@ 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"
 
@@ -1962,7 +2609,7 @@ fi
 
 ])
 
-AC_DEFUN(AC_FIND_TIFF,
+AC_DEFUN([AC_FIND_TIFF],
 [
 AC_REQUIRE([K_PATH_X])
 AC_REQUIRE([AC_FIND_ZLIB])
@@ -1976,7 +2623,7 @@ AC_SUBST(LIBTIFF)
 ])
 
 
-AC_DEFUN(AC_FIND_PNG,
+AC_DEFUN([AC_FIND_PNG],
 [
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_REQUIRE([AC_FIND_ZLIB])
@@ -1984,10 +2631,14 @@ 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_LANG_C
+
 AC_TRY_LINK(dnl
     [
     #include<png.h>
@@ -2015,12 +2666,49 @@ else
 fi
 ])
 
-AC_DEFUN(AC_CHECK_BOOL,
+
+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_DEFUN([AC_CHECK_GNU_EXTENSIONS],
 [
 AC_MSG_CHECKING(if you need GNU extensions)
 AC_CACHE_VAL(ac_cv_gnu_extensions,
@@ -2048,21 +2736,19 @@ if test "$ac_cv_gnu_extensions" = "yes"; then
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_COMPILER_FLAG,
+AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
 [
-dnl AC_REQUIRE([AC_CHECK_COMPILERS]) <- breaks with autoconf 2.50
-AC_MSG_CHECKING(whether $CXX supports -$1)
-kde_cache=`echo $1 | sed 'y%.=/+-%___p_%'`
+AC_MSG_CHECKING([whether $CXX supports -$1])
+kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
 AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
 [
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -$1 -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -$1 -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
+  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)
@@ -2078,7 +2764,7 @@ 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,
+AC_DEFUN([AC_REMOVE_FORBIDDEN],
 [ __val=$$1
   __forbid=" $2 "
   if test -n "$__val"; then
@@ -2099,33 +2785,50 @@ AC_DEFUN(AC_REMOVE_FORBIDDEN,
 ])
 
 dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN(AC_VALIDIFY_CXXFLAGS,
+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_DEFUN([AC_CHECK_COMPILERS],
 [
-  AC_ARG_ENABLE(debug,[  --enable-debug          enables debug symbols [default=no]],
+  AC_ARG_ENABLE(debug,
+	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
-   if test $enableval = "no"; dnl
-     then
-       kde_use_debug_code="no"
-       kde_use_debug_define=yes
-     else
-       kde_use_debug_code="yes"
-       kde_use_debug_define=no
-   fi
+    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,[  --disable-debug         disables debug output and debug symbols [default=no]],[],[])
-
-  AC_ARG_ENABLE(strict,[  --enable-strict         compiles with strict compiler options (may not work!)],
+  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"
@@ -2134,7 +2837,21 @@ AC_DEFUN(AC_CHECK_COMPILERS,
     fi
    ], [kde_use_strict_options="no"])
 
-  AC_ARG_ENABLE(profile,[  --enable-profile        creates profiling infos [default=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"]
   )
@@ -2144,14 +2861,15 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CC 
 
+  AC_PROG_CPP
+
   if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CFLAGS="-g -O2 $CFLAGS"
-      case $host in
-        *-*-linux-gnu)	
-          CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-        ;;
-      esac
+    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
@@ -2161,6 +2879,7 @@ AC_DEFUN(AC_CHECK_COMPILERS,
     CFLAGS="-DNDEBUG $CFLAGS"
   fi
 
+
   case "$host" in
   *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
   *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
@@ -2174,34 +2893,33 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CXX
 
-  if test "$GXX" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $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"])
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      case $host in  dnl
-      *-*-linux-gnu)
-        CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS"
-        ;;
-      esac
-
-      if test "$kde_use_strict_options" = "yes"; then
-        CXXFLAGS="-Wcast-qual -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
+  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"])
 
-      if test "$kde_very_strict" = "yes"; then
-        CXXFLAGS="-Wold-style-cast -Wredundant-decls -Wconversion $CXXFLAGS"
-      fi
+      dnl convenience compiler flags
+      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
+      AC_SUBST(WOVERLOADED_VIRTUAL)
     else
-      CXXFLAGS="-O2 $CXXFLAGS"
+      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 $CXXFLAGS"
+    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
   fi  
 
   if test "$kde_use_profiling" = "yes"; then
@@ -2211,10 +2929,72 @@ AC_DEFUN(AC_CHECK_COMPILERS,
       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
     
-  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(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
+  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=
@@ -2238,96 +3018,85 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CXXCPP
 
-  # the following is to allow programs, that are known to
-  # have problems when compiled with -O2
-  if test -n "$CXXFLAGS"; then
-      kde_safe_IFS=$IFS
-      IFS=" "
-      NOOPT_CXXFLAGS=""
-      for i in $CXXFLAGS; do
-        case $i in
-          -O*)
-                ;;
-          *)
-                NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS $i"
-                ;;
-        esac
-      done
-      IFS=$kde_safe_IFS
+  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]), [])
-
-  KDE_CXXFLAGS=
-  AC_SUBST(KDE_CXXFLAGS)
 ])
 
-AC_DEFUN(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_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_LANG_SAVE
-AC_LANG_C
 AC_OBJEXT
 AC_EXEEXT
-AC_LANG_RESTORE
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
 
 LIBTOOL_SHELL="/bin/sh ./libtool"
 #  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
+KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-AC_ARG_ENABLE(objprelink, [  --enable-objprelink     prelink apps using objprelink (experimental [only tested on linux/386])],
-       kde_use_objprelink=$enableval, kde_use_objprelink=no)
-  if test "x$kde_use_objprelink" = "xyes"; then 
+# 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')
+])
 
-      KDE_FIND_PATH(objprelink, OBJPRELINK, [], [kde_use_objprelink=no])   
-     
-      if test "x$kde_use_objprelink" = "xyes"; then
-      AC_MSG_CHECKING([Patching libtool to run objprelink.])
-      mv libtool libtool.orig
-      cat > libtool <<\EOF
-#! /bin/sh
-for n ; do case $n in
-  *.o)  test -r $n && echo objprelink $n && objprelink $n ;;
-  *.lo) m=`basename $n .lo`".o" && test -r $m && echo objprelink $m && objprelink $m 
-        m=".libs/$m" && test -r $m && echo objprelink $m && objprelink $m ;;
-esac; done
-EOF
-      cat >> libtool libtool.orig
-      rm libtool.orig
-      chmod a+x libtool
-      AC_MSG_RESULT(done)
-	fi
-  fi
+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_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
-  AC_CHECK_SIZEOF(char, 1)dnl
 ])dnl
 
-AC_DEFUN(KDE_DO_IT_ALL,
+AC_DEFUN([KDE_DO_IT_ALL],
 [
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -2340,11 +3109,11 @@ AM_KDE_WITH_NLS
 AC_PATH_KDE
 ])
 
-AC_DEFUN(AC_CHECK_RPATH,
+AC_DEFUN([AC_CHECK_RPATH],
 [
 AC_MSG_CHECKING(for rpath)
 AC_ARG_ENABLE(rpath,
-      [  --disable-rpath         do not use the rpath feature of ld],
+      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
@@ -2356,7 +3125,8 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
   fi
   dnl $x_libraries is set to /usr/lib in case
   if test -n "$X_LDFLAGS"; then
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
+    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)"
@@ -2364,11 +3134,12 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 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_DEFUN([AC_CHECK_SOCKLEN_T], [
   AC_MSG_CHECKING(for socklen_t)
   AC_CACHE_VAL(ac_cv_socklen_t, [
     AC_LANG_SAVE
@@ -2420,7 +3191,7 @@ dnl PARTICULAR PURPOSE.
 dnl >
 dnl for this file it is relicensed under LGPL
 
-AC_DEFUN(AM_KDE_WITH_NLS,
+AC_DEFUN([AM_KDE_WITH_NLS],
   [
     dnl If we use NLS figure out what method
 
@@ -2463,7 +3234,7 @@ AC_DEFUN(AM_KDE_WITH_NLS,
 
 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,
+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])
@@ -2505,7 +3276,7 @@ AC_SUBST($1)dnl
 
 # serial 1
 
-AC_DEFUN(AM_LC_MESSAGES,
+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],
@@ -2551,7 +3322,7 @@ AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
 # serial 1
 # Stephan Kulow: I put a KDE in it to avoid name conflicts
 
-AC_DEFUN(AM_KDE_GNU_GETTEXT,
+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
@@ -2560,15 +3331,15 @@ AC_DEFUN(AM_KDE_GNU_GETTEXT,
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
    AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+   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="-Wmissing-prototypes -Werror"
+   CXXFLAGS="-Werror"
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS
    AC_TRY_COMPILE([
@@ -2613,14 +3384,14 @@ __argz_count __argz_stringify __argz_next])
 
   ])
 
-AC_DEFUN(AC_HAVE_XPM,
+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, [  --without-xpm           disable color pixmap XPM tests],
+ 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
@@ -2628,10 +3399,13 @@ AC_DEFUN(AC_HAVE_XPM,
    AC_MSG_CHECKING(for XPM)
    AC_CACHE_VAL(ac_cv_have_xpm,
    [
-    AC_LANG_C
     ac_save_ldflags="$LDFLAGS"
     ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
+    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>],[],
@@ -2665,7 +3439,7 @@ AC_DEFUN(AC_HAVE_XPM,
  AC_SUBST(XPMLIB)
 ])
 
-AC_DEFUN(AC_HAVE_DPMS,
+AC_DEFUN([AC_HAVE_DPMS],
  [AC_REQUIRE_CPP()dnl
   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 
@@ -2673,7 +3447,7 @@ AC_DEFUN(AC_HAVE_DPMS,
  test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
  DPMS_LIB=
 
- AC_ARG_WITH(dpms, [  --without-dpms          disable DPMS power saving],
+ 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
@@ -2683,41 +3457,45 @@ AC_DEFUN(AC_HAVE_DPMS,
    dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
    AC_CACHE_VAL(ac_cv_have_dpms,
    [
-    AC_LANG_C
-    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"
+    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
@@ -2744,46 +3522,69 @@ AC_DEFUN(AC_HAVE_DPMS,
     $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_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, [  --without-gl            disable 3D GL modes],
+ AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
 	gl_test=$withval, gl_test="yes")
- if test "x$gl_test" = xno; then
+ 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_C
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
     ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET"
-    CFLAGS="$CFLAGS $X_INCLUDES"
+    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>           
+#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 -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET"
-      CFLAGS="$ac_save_cflags $X_INCLUDES"
+      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"
-    CFLAGS="$ac_save_cflags"
+    CXXFLAGS="$ac_save_cxxflags"
    ])dnl
 
   if test "$ac_cv_have_gl" = "no"; then
@@ -2795,15 +3596,15 @@ AC_DEFUN(AC_HAVE_GL,
     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='-lMesaGL -lMesaGLU $(LIB_X11)'
+          GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)'
        else
-          GLLIB='-lGL -lGLU $(LIB_X11)'
+          GLLIB='-lGLU -lGL $(LIB_X11)'
        fi
     else
        if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)'
+          GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)'
        else
-          GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
+          GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
        fi
     fi
     if test "$GL_INCLUDE" = ""; then
@@ -2822,63 +3623,74 @@ AC_DEFUN(AC_HAVE_GL,
 
  dnl shadow password and PAM magic - maintained by ossi@kde.org
 
-AC_DEFUN(KDE_PAM, [
+AC_DEFUN([KDE_PAM], [
   AC_REQUIRE([KDE_CHECK_LIBDL])
 
+  want_pam=
   AC_ARG_WITH(pam,
-    [  --with-pam[=ARG]        enable support for PAM: ARG=[yes|no|service name]],
+    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
     [ if test "x$withval" = "xyes"; then
-        use_pam=yes
+        want_pam=yes
         pam_service=kde
       elif test "x$withval" = "xno"; then
-        use_pam=no
+        want_pam=no
       else
-        use_pam=yes
+        want_pam=yes
         pam_service=$withval
       fi
-      ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-    ], [
-      AC_CACHE_VAL(ac_cv_path_pam,
-        [ use_pam=no
-          AC_CHECK_LIB(pam, pam_start,
-            [ AC_CHECK_HEADER(security/pam_appl.h, 
-                [ use_pam=yes
-                  pam_service=kde ]) 
-            ], , $LIBDL)
-          ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-        ])
-    ])
-  eval "$ac_cv_path_pam"
+    ], [ 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
 
-  AC_MSG_CHECKING(for PAM)
-  if test "x$use_pam" = xno; then
-    AC_MSG_RESULT(no)
-    PAMLIBS=""
-  else
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-    PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
+      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], security/pam_appl.h,
-      [ AC_EGREP_HEADER([const struct pam_message], security/pam_appl.h,
-                        [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])])
+      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_DEFUN([DEF_PAM_SERVICE], [
   AC_ARG_WITH($1-pam,
-    [  --with-$1-pam=[val]    override PAM service from --with-pam for $2],
+    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"
+        $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.])
@@ -2895,7 +3707,7 @@ You may want to enforce it by using --with-pam.])
     AC_SUBST($3_PAM_SERVICE)
 ])
 
-AC_DEFUN(KDE_SHADOWPASSWD, [
+AC_DEFUN([KDE_SHADOWPASSWD], [
   AC_REQUIRE([KDE_PAM])
 
   AC_CHECK_LIB(shadow, getspent,
@@ -2918,7 +3730,7 @@ AC_DEFUN(KDE_SHADOWPASSWD, [
   AC_MSG_CHECKING([for shadow passwords])
 
   AC_ARG_WITH(shadow,
-    [  --with-shadow		  If you want shadow password support ],
+    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
     [ if test "x$withval" != "xno"; then
         use_shadow=yes
       else
@@ -2952,7 +3764,7 @@ AC_DEFUN(KDE_SHADOWPASSWD, [
 
 ])
 
-AC_DEFUN(KDE_PASSWDLIBS, [
+AC_DEFUN([KDE_PASSWDLIBS], [
   AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
   AC_REQUIRE([KDE_PAM])
   AC_REQUIRE([KDE_SHADOWPASSWD])
@@ -2963,10 +3775,22 @@ AC_DEFUN(KDE_PASSWDLIBS, [
     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_DEFUN([KDE_CHECK_LIBDL],
 [
 AC_CHECK_LIB(dl, dlopen, [
 LIBDL="-ldl"
@@ -2981,7 +3805,7 @@ ac_cv_have_shload=yes
 AC_SUBST(LIBDL)
 ])
 
-AC_DEFUN(KDE_CHECK_DLOPEN,
+AC_DEFUN([KDE_CHECK_DLOPEN],
 [
 KDE_CHECK_LIBDL
 AC_CHECK_HEADERS(dlfcn.h dl.h)
@@ -2996,7 +3820,7 @@ fi
 dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
 dnl (MM)
 AC_ARG_ENABLE(dlopen,
-[  --disable-dlopen        link statically [default=no]] ,
+AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
 enable_dlopen=$enableval,
 enable_dlopen=yes)
 
@@ -3021,7 +3845,7 @@ fi
 
 ])
 
-AC_DEFUN(KDE_CHECK_DYNAMIC_LOADING,
+AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
 [
 KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
 KDE_PROG_LIBTOOL
@@ -3041,7 +3865,7 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_ADD_INCLUDES,
+AC_DEFUN([KDE_ADD_INCLUDES],
 [
 if test -z "$1"; then
   test_include="Pix.h"
@@ -3078,209 +3902,53 @@ fi
 ])
 ])
 
-
-AC_DEFUN(KDE_CHECK_MICO,
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_MISC_TESTS])
-AC_MSG_CHECKING(for MICO)
-
-if test -z "$MICODIR"; then
-    kde_micodir=/usr/local
- else
-    kde_micodir="$MICODIR"
-fi
-
-AC_ARG_WITH(micodir,
-  [  --with-micodir=micodir  where mico is installed ],
-  kde_micodir=$withval,
-  kde_micodir=$kde_micodir
-)
-
-AC_CACHE_VAL(kde_cv_mico_incdir,
+AC_DEFUN([KDE_CHECK_LIBPTHREAD],
 [
-  mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes"
-AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir)
-
-])
-kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'`
+  LIBPTHREAD=""
 
-if test ! -r  $kde_micodir/include/CORBA.h; then
-  AC_MSG_ERROR([No CORBA.h found, specify another micodir])
-fi
-
-AC_MSG_RESULT($kde_micodir)
-
-MICO_INCLUDES=-I$kde_micodir/include
-AC_SUBST(MICO_INCLUDES)
-MICO_LDFLAGS=-L$kde_micodir/lib
-AC_SUBST(MICO_LDFLAGS)
-micodir=$kde_micodir
-AC_SUBST(micodir)
-
-AC_MSG_CHECKING([for MICO version])
-AC_CACHE_VAL(kde_cv_mico_version,
-[
-AC_LANG_C
-cat >conftest.$ac_ext <<EOF
-#include <stdio.h>
-#include <mico/version.h>
-int main() {
-
-   printf("MICO_VERSION=%s\n",MICO_VERSION);
-   return (0);
-}
-EOF
-ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest'
-if AC_TRY_EVAL(ac_compile); then
-  if eval `./conftest 2>&5`; then
-    kde_cv_mico_version=$MICO_VERSION
-  else
-    AC_MSG_ERROR([your system is not able to execute a small application to
-    find MICO version! Check $kde_micodir/include/mico/version.h])
+  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
-else
-  AC_MSG_ERROR([your system is not able to compile a small application to
-  find MICO version! Check $kde_micodir/include/mico/version.h])
-fi
-])
-
-dnl installed MICO version
-mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "x$1" = "x"; then
- req_version="2.3.0"
-else
- req_version=$1
-fi
-
-dnl required MICO version
-req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "$mico_v_maj" -lt "$req_v_maj" || \
-   ( test "$mico_v_maj" -eq "$req_v_maj" && \
-        test "$mico_v_mid" -lt "$req_v_mid" ) || \
-   ( test "$mico_v_mid" -eq "$req_v_mid" && \
-        test "$mico_v_min" -lt "$req_v_min" )
-
-then
-  AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \
-at least is required. You should upgrade MICO.])
-else
-  AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)])
-fi
-
-LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL"
-AC_SUBST(LIBMICO)
-if test -z "$IDL"; then
-  IDL='$(kde_bindir)/cuteidl'
-fi
-AC_SUBST(IDL)
-IDL_DEPENDENCIES='$(kde_includes)/CUTE.h'
-AC_SUBST(IDL_DEPENDENCIES)
-
-idldir="\$(includedir)/idl"
-AC_SUBST(idldir)
-
-])
-
-AC_DEFUN(KDE_CHECK_MINI_STL,
-[
-AC_REQUIRE([KDE_CHECK_MICO])
-
-AC_MSG_CHECKING(if we use mico's mini-STL)
-AC_CACHE_VAL(kde_cv_have_mini_stl,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_cxxflags="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $MICO_INCLUDES"
-AC_TRY_COMPILE(
-[
-#include <mico/config.h>
-],
-[
-#ifdef HAVE_MINI_STL
-#error "nothing"
-#endif
-],
-kde_cv_have_mini_stl=no,
-kde_cv_have_mini_stl=yes)
-CXXFLAGS="$kde_save_cxxflags"
-AC_LANG_RESTORE
-])
-
-if test "x$kde_cv_have_mini_stl" = "xyes"; then
-   AC_MSG_RESULT(yes)
-   $1
-else
-   AC_MSG_RESULT(no)
-   $2
-fi
-])
-
-])
 
+  if test -z "$LIBPTHREAD"; then
+    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
+  fi
 
-AC_DEFUN(KDE_CHECK_LIBPTHREAD,
-[
-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-AC_SUBST(LIBPTHREAD)
+  AC_SUBST(LIBPTHREAD)
 ])
 
-AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
+AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
 [
-    AC_ARG_ENABLE(kernel-threads, [  --enable-kernel-threads Enable the use of the LinuxThreads port on FreeBSD/i386 only.],
-	kde_use_kernthreads=$enableval, kde_use_kernthreads=no)
-
-    if test "$kde_use_kernthreads" = "yes"; then
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_CFLAGS="$CXXFLAGS"
-      CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
-      CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
-      AC_CHECK_HEADERS(pthread/linuxthreads/pthread.h)
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      CFLAGS="$ac_save_CFLAGS"
-      if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
-        kde_use_kernthreads=no
-      else
-        dnl Add proper -I and -l statements
-        AC_CHECK_LIB(lthread, pthread_join, [LIBPTHREAD="-llthread -llgcc_r"]) dnl for FreeBSD
-        if test "x$LIBPTHREAD" = "x"; then
-          kde_use_kernthreads=no
-        else
-          USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
-        fi
-      fi
-    else 
       USE_THREADS=""
       if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-pthread"] )
+        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
       fi
-    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"
-                echo "Setting Solaris pthread compilation options"
     		;;
         freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                echo "Setting FreeBSD pthread compilation options"
+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
                 ;;
         aix*)
                 CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
                 LIBPTHREAD="$LIBPTHREAD -lc_r"
-                echo "Setting AIX pthread compilation options"
                 ;;
         linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                USE_THREADS="$USE_THREADS -DPIC -fPIC"
-                echo "Setting Linux pthread compilation options"
+                if test "$CXX" = "KCC"; then
+                  CXXFLAGS="$CXXFLAGS --thread_safe"
+		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
+                fi
                 ;;
 	*)
 		;;
@@ -3289,25 +3957,28 @@ AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
     AC_SUBST(LIBPTHREAD)
 ])
 
-AC_DEFUN(KDE_CHECK_THREADING,
+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
-    kde_check_threading_default=no
+    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, [  --disable-threading     disables threading even if libpthread found ],
+  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,
+AC_DEFUN([KDE_TRY_LINK_PYTHON],
 [
 if test "$kde_python_link_found" = no; then
 
@@ -3319,8 +3990,6 @@ fi
 
 AC_CACHE_VAL(kde_cv_try_link_python_$1,
 [
-AC_LANG_SAVE
-AC_LANG_C
 kde_save_cflags="$CFLAGS"
 CFLAGS="$CFLAGS $PYTHONINC"
 kde_save_libs="$LIBS"
@@ -3353,13 +4022,12 @@ else
   AC_MSG_RESULT(no)
   $4
 fi
-AC_LANG_RESTORE
 
 fi
 
 ])
 
-AC_DEFUN(KDE_CHECK_PYTHON_DIR,
+AC_DEFUN([KDE_CHECK_PYTHON_DIR],
 [
 AC_MSG_CHECKING([for Python directory])
  
@@ -3373,7 +4041,7 @@ AC_CACHE_VAL(kde_cv_pythondir,
 ])
  
 AC_ARG_WITH(pythondir,
-[  --with-pythondir=pythondir   use python installed in pythondir ],
+AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
 [
   ac_python_dir=$withval
 ], ac_python_dir=$kde_cv_pythondir
@@ -3382,7 +4050,7 @@ AC_ARG_WITH(pythondir,
 AC_MSG_RESULT($ac_python_dir)
 ])
 
-AC_DEFUN(KDE_CHECK_PYTHON_INTERN,
+AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
 [
 AC_REQUIRE([KDE_CHECK_LIBDL])
 AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
@@ -3408,13 +4076,16 @@ fi
 
 PYTHONINC=-I$python_incdir
 
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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
+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
-    python_libdir=no
+    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
 
@@ -3424,7 +4095,6 @@ if test -z "$LIBPYTHON"; then
   LIBPYTHON=-lpython$version
 fi
 
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
 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
@@ -3447,16 +4117,18 @@ else
   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.
-    Pleae use \"make LIBPYTHON='-lpython$version -lotherlib'\" to fix this
+    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"
@@ -3470,17 +4142,27 @@ fi
 ])
 
 
-AC_DEFUN(KDE_CHECK_PYTHON,
+AC_DEFUN([KDE_CHECK_PYTHON],
 [
-  KDE_CHECK_PYTHON_INTERN("2.1", [KDE_CHECK_PYTHON_INTERN("2.0",
-        [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
-  ])
+  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_SGI,
+AC_DEFUN([KDE_CHECK_STL],
 [
-    AC_MSG_CHECKING([if STL implementation is SGI like])
-    AC_CACHE_VAL(kde_cv_stl_type_sgi,
+    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>
@@ -3489,60 +4171,26 @@ using namespace std;
   string astring="Hallo Welt.";
   astring.erase(0, 6); // now astring is "Welt"
   return 0;
-], kde_cv_stl_type_sgi=yes,
-   kde_cv_stl_type_sgi=no)
+], kde_cv_stl_works=yes,
+   kde_cv_stl_works=no)
 ])
 
-   AC_MSG_RESULT($kde_cv_stl_type_sgi)
+   AC_MSG_RESULT($kde_cv_stl_works)
 
-   if test "$kde_cv_stl_type_sgi" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   fi
-])
-
-AC_DEFUN(KDE_CHECK_STL_HP,
-[
-    AC_MSG_CHECKING([if STL implementation is HP like])
-    AC_CACHE_VAL(kde_cv_stl_type_hp,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hello World";
-  astring.remove(0, 6); // now astring is "World"
-  return 0;
-], kde_cv_stl_type_hp=yes,
-   kde_cv_stl_type_hp=no)
-])
-   AC_MSG_RESULT($kde_cv_stl_type_hp)
-
-   if test "$kde_cv_stl_type_hp" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
+   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
-])
 
-AC_DEFUN(KDE_CHECK_STL,
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-    KDE_CHECK_STL_SGI
-
-    if test "$kde_cv_stl_type_sgi" = "no"; then
-       KDE_CHECK_STL_HP
-
-       if test "$kde_cv_stl_type_hp" = "no"; then
-         AC_MSG_ERROR("no known STL type found")
-       fi
-    fi
-
-    CXXFLAGS="$ac_save_CXXFLAGS"
-    AC_LANG_RESTORE
+   CXXFLAGS="$ac_save_CXXFLAGS"
+   AC_LANG_RESTORE
 ])
 
-AC_DEFUN(AC_FIND_QIMGIO,
+AC_DEFUN([AC_FIND_QIMGIO],
    [AC_REQUIRE([AC_FIND_JPEG])
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_MSG_CHECKING([for qimgio])
@@ -3581,28 +4229,7 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_ANSI,
-[
-])
-
-AC_DEFUN(KDE_CHECK_INSURE,
-[
-  AC_ARG_ENABLE(insure, [  --enable-insure             use insure++ for debugging [default=no]],
-  [
-  if test $enableval = "no"; dnl
-	then ac_use_insure="no"
-	else ac_use_insure="yes"
-   fi
-  ], [ac_use_insure="no"])
-
-  AC_MSG_CHECKING(if we will use Insure++ to debug)
-  AC_MSG_RESULT($ac_use_insure)
-  if test "$ac_use_insure" = "yes"; dnl
-       then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "????
-   fi
-])
-
-AC_DEFUN(AM_DISABLE_LIBRARIES,
+AC_DEFUN([AM_DISABLE_LIBRARIES],
 [
     AC_PROVIDE([AM_ENABLE_STATIC])
     AC_PROVIDE([AM_ENABLE_SHARED])
@@ -3611,7 +4238,7 @@ AC_DEFUN(AM_DISABLE_LIBRARIES,
 ])
 
 
-AC_DEFUN(AC_CHECK_UTMP_FILE,
+AC_DEFUN([AC_CHECK_UTMP_FILE],
 [
     AC_MSG_CHECKING([for utmp file])
 
@@ -3644,7 +4271,7 @@ AC_DEFUN(AC_CHECK_UTMP_FILE,
 ])
 
 
-AC_DEFUN(KDE_CREATE_SUBDIRSLIST,
+AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
 [
 
 DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
@@ -3659,9 +4286,10 @@ if test ! -s $srcdir/subdirs; then
   done
 fi
 
+ac_topsubdirs=
 if test -s $srcdir/inst-apps; then
   ac_topsubdirs="`cat $srcdir/inst-apps`"
-else
+elif test -s $srcdir/subdirs; then
   ac_topsubdirs="`cat $srcdir/subdirs`"
 fi
 
@@ -3678,15 +4306,19 @@ for i in $ac_topsubdirs; do
     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_DEFUN([KDE_CHECK_NAMESPACES],
 [
 AC_MSG_CHECKING(whether C++ compiler supports namespaces)
 AC_LANG_SAVE
@@ -3712,22 +4344,15 @@ AC_MSG_RESULT(no)
 AC_LANG_RESTORE
 ])
 
-AC_DEFUN(KDE_CHECK_NEWLIBS,
-[
-
-])
-
 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_DEFUN([AC_CHECK_S_ISSOCK],
 [
 AC_MSG_CHECKING(for S_ISSOCK)
 AC_CACHE_VAL(ac_cv_have_s_issock,
 [
-AC_LANG_SAVE
-AC_LANG_C
 AC_TRY_LINK(
 [
 #include <sys/stat.h>
@@ -3738,24 +4363,31 @@ int b = S_ISSOCK( buff.st_mode );
 ],
 ac_cv_have_s_issock=yes,
 ac_cv_have_s_issock=no)
-AC_LANG_RESTORE
 ])
 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_DEFUN([AC_CHECK_KDEMAXPATHLEN],
 [
 AC_MSG_CHECKING(for MAXPATHLEN)
 AC_CACHE_VAL(ac_cv_maxpathlen,
 [
-AC_LANG_C
 cat > conftest.$ac_ext <<EOF
 #ifdef STDC_HEADERS
 # include <stdlib.h>
@@ -3785,67 +4417,37 @@ AC_MSG_RESULT($ac_cv_maxpathlen)
 AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
 ])
 
-dnl -------------------------------------------------------------------------
-dnl See if the compiler supports a template repository         bero@redhat.de
-dnl -------------------------------------------------------------------------
-AC_DEFUN(KDE_COMPILER_REPO,
-[
-  REPO=""
-  NOREPO=""
-
-  KDE_CHECK_COMPILER_FLAG(frepo,
-   [
-     REPO="-frepo"
-     NOREPO="-fno-repo"
-   ])
-
-  if test -z "$REPO"; then
-  KDE_CHECK_COMPILER_FLAG(instances=explicit,
-  [
-     REPO="-instances=explicit"
-     NOREPO="-instances=extern"
-  ])
-  fi
-
-  if test -n "$REPO"; then
-     AC_DEFINE_UNQUOTED(HAVE_TEMPLATE_REPOSITORY, 1,
-		[C++ compiler supports template repository])
-     $1
-  fi
-
-  AC_SUBST(REPO)
-  AC_SUBST(NOREPO)
-])
-
-AC_DEFUN(KDE_CHECK_HEADER,
+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)
+   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
    CPPFLAGS=$kde_safe_cppflags
    AC_LANG_RESTORE
 ])
 
-AC_DEFUN(KDE_CHECK_QWSPRITEFIELD,
+AC_DEFUN([KDE_CHECK_HEADERS],
 [
-  KDE_CHECK_HEADER(QwSpriteField.h, ,
-  [
-    AC_MSG_WARN([you don't have QwSpriteField.h somewhere. Please install
-       QwSpriteField out of kdesupport.])
-      $1
-  ])
+   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,
+AC_DEFUN([KDE_FAST_CONFIGURE],
 [
   dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, [  --disable-fast-perl     disable fast Makefile generation (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,
+AC_DEFUN([KDE_CONF_FILES],
 [
   val=
   if test -f $srcdir/configure.files ; then
@@ -3860,7 +4462,7 @@ AC_DEFUN(KDE_CONF_FILES,
   AC_SUBST(CONF_FILES)
 ])dnl
 
-AC_DEFUN(KDE_SET_PREFIX,
+AC_DEFUN([KDE_SET_PREFIX],
 [
   unset CDPATH
   dnl make $KDEDIR the default for the installation
@@ -3868,8 +4470,11 @@ AC_DEFUN(KDE_SET_PREFIX,
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
-    ac_configure_args="$ac_configure_args --prefix $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
 ])
@@ -3940,7 +4545,7 @@ pushdef([AC_PROG_INSTALL],
   fi
 ])dnl
 
-AC_DEFUN(KDE_LANG_CPLUSPLUS,
+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])
@@ -3951,7 +4556,7 @@ pushdef([AC_LANG_CPLUSPLUS],
 KDE_LANG_CPLUSPLUS
 ])
 
-AC_DEFUN(KDE_CHECK_LONG_LONG,
+AC_DEFUN([KDE_CHECK_LONG_LONG],
 [
 AC_MSG_CHECKING(for long long)
 AC_CACHE_VAL(kde_cv_c_long_long,
@@ -3963,6 +4568,7 @@ AC_CACHE_VAL(kde_cv_c_long_long,
   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
@@ -3970,176 +4576,782 @@ if test "$kde_cv_c_long_long" = yes; then
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_LIB,
+AC_DEFUN([KDE_CHECK_LIB],
 [
+     kde_save_LDFLAGS="$LDFLAGS"
+     dnl AC_CHECK_LIB modifies LIBS, so save it here
      kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries"
+     LDFLAGS="$LDFLAGS $all_libraries"
      case $host_os in
-      aix*) LIBS="-brtl $LIBS"
-	test "$GCC" = yes && LIBS="-Wl,$LIBS"
+      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_CHECK_INITGROUPS,
-[ 
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS(initgroups)
-  if test "x$ac_cv_func_initgroups" = "xyes"; then
-    case $host_os in
-      aix*) AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-            AC_MSG_CHECKING([for initgroups prototype])
-            AC_CACHE_VAL(kde_cv_check_initgroups_proto,
-            [ AC_TRY_COMPILE(
-              [ #include <grp.h>
-              ],
-              [ char buffer[10];
-                gid_t id;
-                int x = initgroups(buffer,id);
-              ],
-              kde_cv_check_initgroups_proto=yes,
-              kde_cv_check_initgroups_proto=no)
-            ])
-            AC_MSG_RESULT($kde_cv_check_initgroups_proto)
-            AC_LANG_RESTORE
-            ;;
-      *)
-            kde_cv_check_initgroups_proto=yes
-            ;;
-    esac
-  else
-    kde_cv_check_initgroups_proto=no
-  fi
-  if test "x$kde_cv_check_initgroups_proto" = "xyes"; then
-    kde_check_initgroups_proto=1
-  else
-    kde_check_initgroups_proto=0
-  fi
-  AC_DEFINE_UNQUOTED(HAVE_INITGROUPS_PROTO,$kde_check_initgroups_proto,
-           [initgroups may exist but not its prototype (e.g. AIX<4.3.3:8)])
+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
 ])
 
-
-AC_DEFUN(KDE_CHECK_JAVA_DIR,
+dnl KDE_CHEC_JAVA_DIR(onlyjre)
+AC_DEFUN([KDE_CHECK_JAVA_DIR],
 [
-AC_MSG_CHECKING([for Java directory])
 
 AC_ARG_WITH(java,
-[  --with-java=javadir     use java installed in javadir, --without-java disables ],
+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_cv_java_bindir=no
-   kde_cv_java_includedir=no
-   kde_cv_java_libjvmdir=no
-   kde_cv_java_libhpidir=no
+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 -> look in $PATH
-    AC_CACHE_VAL(kde_cv_java_bindir,
-    [
-      dnl First look for javac in $PATH. If not found we'll look at the option.
-      KDE_FIND_PATH(javac, JAVAC, [], [])
+  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
-          kde_cv_java_bindir=`echo $JAVAC | sed -e 's,/javac$,/,'`
           dnl this substitution might not work - well, we test for jni.h below
-          kde_cv_java_includedir=`echo $kde_cv_java_bindir | sed -e 's,bin/$,include/,'`
+          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
       else
-          kde_cv_java_bindir=no
+          kde_java_includedir=no
       fi
-    ])
   else
     dnl config option set
-    kde_cv_java_bindir=$ac_java_dir/bin
-    kde_cv_java_includedir=$ac_java_dir/include
+    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 Look for libjvm.so
-kde_cv_java_libjvmdir=`find $kde_cv_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-dnl Look for libhpi.so and avoid green threads
-kde_cv_java_libhpidir=`find $kde_cv_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,'`
+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 At this point kde_cv_java_bindir and kde_cv_java_includedir are either set or "no"
-if test ! "x$kde_cv_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
 
-  if test ! -x "$kde_cv_java_bindir/javac"; then
-    AC_MSG_ERROR([javac not found under $kde_cv_java_bindir - it seems you passed a wrong --with-java.])
+    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_cv_java_bindir/javah"; then
-    AC_MSG_ERROR([javah not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
+
+  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_cv_java_bindir/jar"; then
-    AC_MSG_ERROR([jar not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
+
+  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
-  if test ! -r "$kde_cv_java_includedir/jni.h"; then
-    AC_MSG_ERROR([jni.h not found under $kde_cv_java_includedir. Use --with-java or --without-java.])
+
+  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 ! -r "$kde_cv_java_libjvmdir/libjvm.so"; then
-    AC_MSG_ERROR([libjvm.so not found under $kde_cv_java_libjvmdir. Use --without-java.])
+
+  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
-  if test ! -r "$kde_cv_java_libhpidir/libhpi.so"; then
-    AC_MSG_ERROR([libhpi.so not found under $kde_cv_java_libhpidir. Use --without-java.])
+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
 
-  jni_includes="-I$kde_cv_java_includedir"
-  dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-  dnl and under linux here..
-  test -d "$kde_cv_java_includedir/linux" && jni_includes="$jni_includes -I$kde_cv_java_includedir/linux"
-  test -d "$kde_cv_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_cv_java_includedir/genunix"
+  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
 
-  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
-	    ],[ 
-	    ],[ AC_MSG_ERROR([Incorrect version of $kde_cv_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 ])
-	    ])
+  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"
 
-  CXXFLAGS="$ac_cxxflags_safe"    
   AC_LANG_RESTORE
 
-  dnl All tests ok, inform and subst the variables
-  AC_MSG_RESULT([javac/javah/jar in $kde_cv_java_bindir, jni.h in $kde_cv_java_includedir])
+  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
 
-  JAVAC=$kde_cv_java_bindir/javac
-  AC_SUBST(JAVAC)
-  JAVAH=$kde_cv_java_bindir/javah
-  AC_SUBST(JAVAH)
-  JAR=$kde_cv_java_bindir/jar
-  AC_SUBST(JAR)
-  AC_SUBST(jni_includes)
-  JVMLIBS="-L$kde_cv_java_libjvmdir -ljvm -L$kde_cv_java_libhpidir -lhpi"
-  AC_SUBST(JVMLIBS)
 fi
+AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
 ])
-## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
+
+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
@@ -4163,7 +5375,21 @@ fi
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 46 AC_PROG_LIBTOOL
+# 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
@@ -4171,6 +5397,11 @@ 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.
@@ -4179,55 +5410,43 @@ 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_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
 
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
 AC_SUBST(LIBTOOL)dnl
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
 
+# AC_LIBTOOL_SETUP
+# ----------------
 AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
+[AC_PREREQ(2.50)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
@@ -4237,6 +5456,7 @@ 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!
@@ -4244,6 +5464,95 @@ 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*)
@@ -4253,38 +5562,271 @@ file_magic*)
   ;;
 esac
 
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
+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
 
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+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"
@@ -4296,6 +5838,51 @@ case $host in
       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*
   ;;
@@ -4305,185 +5892,1347 @@ case $host in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
+    [AC_LANG_PUSH(C)
      AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+     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
   ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+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)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
   ])
 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*
 ])
 
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+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"
+])
 
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+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
+    ;;
 
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
+  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
-  done
-  IFS="$ac_save_ifs"
+
+    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'
   ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
 
-# 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)])
+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
+  ;;
 
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
 *)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
+  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="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
+  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_DISABLE_STATIC - set the default static flag to --disable-static
+
+# 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_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
 
 
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
+# AC_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,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
+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_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_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
+# AC_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)])
+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_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognise shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
+[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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+*)
+  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"
@@ -4493,7 +7242,7 @@ dnl not every word.  This closes a longstanding sh security hole.
 	  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
+	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
 	    cat <<EOF 1>&2
@@ -4514,8 +7263,8 @@ EOF
       break
     fi
   done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
 esac])
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
@@ -4524,35 +7273,41 @@ if test -n "$MAGIC_CMD"; then
 else
   AC_MSG_RESULT(no)
 fi
-])
+])# AC_PATH_TOOL_PREFIX
 
 
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognise a shared library
 AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+[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)
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
   else
     MAGIC_CMD=:
   fi
 fi
-])
+])# AC_PATH_MAGIC
 
 
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
 AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+[AC_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 GCC])
+  AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -4562,12 +7317,12 @@ if test "$GCC" = yes; then
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+    [[\\/]]* | ?:[[\\/]]*)
+      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%/%"`
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -4587,22 +7342,26 @@ else
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
 	test "$with_gnu_ld" != no && break
-      else
+	;;
+      *)
 	test "$with_gnu_ld" != yes && break
-      fi
+	;;
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
@@ -4614,32 +7373,50 @@ else
 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_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[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.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
-else
+  ;;
+*)
   lt_cv_prog_gnu_ld=no
-fi])
+  ;;
+esac])
 with_gnu_ld=$lt_cv_prog_gnu_ld
-])
+])# AC_PROG_LD_GNU
 
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+
+# 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'])
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
 reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
+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
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
+[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=
@@ -4650,13 +7427,13 @@ lt_cv_deplibs_check_method='unknown'
 # `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
+# '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
-aix*)
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4665,36 +7442,39 @@ beos*)
   ;;
 
 bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
+  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*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+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'
+  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* )
+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_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.*`
       ;;
@@ -4708,15 +7488,27 @@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20*|hpux11*)
-  lt_cv_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
+hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+  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*)
+irix5* | irix6* | nonstopux*)
   case $host_os in
-  irix5*)
+  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"
     ;;
@@ -4728,7 +7520,7 @@ irix5* | irix6*)
     *) libmagic=never-match;;
     esac
     # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
     ;;
   esac
   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
@@ -4736,47 +7528,46 @@ irix5* | irix6*)
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | m68k* | arm* | mips* | hppa* | sh* )
+  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 )'] ;;
+    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='file_magic NetBSD/[a-z0-9]* demand paged shared library']
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
   fi
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
   ;;
 
-openbsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
-    i*86 )
-      changequote(,)dnl
-      lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
-      changequote([, ])dnl
-      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
+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
   ;;
 
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  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*)
@@ -4797,83 +7588,113 @@ solaris*)
 
 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
     ;;
-  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*`
+  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 path to a BSD-compatible name lister
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
 AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
       # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
 	lt_cv_path_NM="$tmp_nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
+	  break
+	  ;;
+	*)
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
+	  ;;
+	esac
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
 NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
+])# AC_PROG_NM
 
-# AC_CHECK_LIBM - check for math library
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
 AC_DEFUN([AC_CHECK_LIBM],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
+*-*-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, main, LIBM="$LIBM -lm")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
   ;;
 esac
-])
+])# AC_CHECK_LIBM
 
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
+
+# 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.
@@ -4885,23 +7706,27 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
   LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL 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.
+  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, main,
+  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])
@@ -4912,85 +7737,3391 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   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
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
-    INCLTDL=
+    LTDLINCL=
   fi
-])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
 
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
 
-AC_DEFUN([_AC_LIBTOOL_CXX],
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
 AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
 
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
+# 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_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+# 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])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
+	 [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"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
+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"
-CFLAGS="$lt_save_CFLAGS"
+])# 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
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
+# 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'
 
-dnl old names
+    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($@)])
@@ -4999,16 +11130,83 @@ AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
 AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
 AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
+# 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 <jansorg@gmx.de>
+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 ----------------------------------------------------------------------
@@ -5022,7 +11220,7 @@ dnl AC_MSG_CHECKING([for a Sword installation])
 
 dnl The option for the configure script
 AC_ARG_WITH(sword-dir,
-[  --with-sword-dir=DIR     Patch where Sword is being installed (default=/usr) ],
+[  --with-sword-dir=DIR     Path where Sword is being installed (default=/usr) ],
 [
   ac_sword_dir=$withval
 ],ac_sword_dir=/usr
@@ -5039,20 +11237,20 @@ 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 "$ac_static_sword" = "YES"; then
+if test "x$ac_static_sword" = "xYES"; then
 	SEARCH_LIBS="libsword.a";
 else
-	SEARCH_LIBS="libsword.a libsword.so";
+	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 "$ac_cv_sword_libdir" = "NO"; then
+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 "$ac_static_sword" = "YES"; then
+if test "x$ac_static_sword" = "xYES"; then
 	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
 else
 	LIB_SWORD="-lsword";
@@ -5062,22 +11260,20 @@ AC_SUBST(SWORD_LIBRARY_PATH)
 AC_SUBST(LIB_SWORD)
 all_libraries="$all_libraries -L$ac_cv_sword_libdir"
 
-if test "$ac_static_sword" = "YES"; then
+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 "$ac_cv_sword_incdir" = "NO"; then
+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 !
 ])
@@ -5091,8 +11287,11 @@ AC_MSG_RESULT([$ac_cv_sword_incdir])
 
 
 
-dnl -- check if Sword matches the minimum version --
-AC_MSG_CHECKING([if you have Sword $1 or later])
+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,
 [
@@ -5113,38 +11312,28 @@ LIBRARY_PATH=
 export LIBRARY_PATH
 
 cat > conftest.$ac_ext <<EOF
-#include <iostream.h>
+#include <iostream>
 #include <swversion.h>
 
+#ifdef SWORD_NAMESPACE_START
+using namespace sword;
+#endif
+
 int main(int argc, char* argv[]) {
-	if (argc != 2) {
-		cout << SWVersion::currentVersion << endl;
-	}
-	else if (argc == 2) 
-	{
-		if (SWVersion(&argv[[1]]) < SWVersion::currentVersion || SWVersion(&argv[[1]]) == SWVersion::currentVersion)
-		{
-			cout << 0 << endl;
-			return 0;
-		}
-		else	
-		{
-			cout << 1 << endl;
-			return 1; //version not recent enough
-		}
-	}
+	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`
-		eval sword_test_returncode=`./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
 
@@ -5159,16 +11348,87 @@ 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
 
-right_version="ok";
-if test $sword_test_returncode = 1;  then
-	right_version="wrong version";
+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;
-	
-AC_MSG_RESULT([$ac_cv_installed_sword_version])
-if test $right_version != "ok"; then
-        AC_MSG_ERROR([Your Sword installation is not recent enoought! Please
-upgrade to version $1!]);
+
+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;
 
 ])
@@ -5277,7 +11537,7 @@ fi
 if test "$ac_rpm_prefix" = "auto"; then
 AC_CACHE_VAL(RPM_PREFIX, [
 if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde2"
+	RPM_PREFIX="/opt/kde3"
 elif test "$DISTRIBUTION" = "Mandrake"; then
 	RPM_PREFIX="/usr"	
 elif test "$DISTRIBUTION" = "Red Hat"; then
@@ -5328,3 +11588,40 @@ 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
index 89fc4f8..b06fc21 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,14 +1,15 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+# generated automatically by aclocal 1.7.6 -*- Autoconf -*-
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# 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.
 
-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.
+# 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
@@ -32,28 +33,142 @@ 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. If you decide that you
-dnl really want to modify it, contact coolo@kde.org mentioning that you have
-dnl and that the modified file should be committed to every module.
+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.
 
-dnl ------------------------------------------------------------------------
-dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
-dnl thanks to Raja R Harinath.
-dnl ------------------------------------------------------------------------
-dnl
-ifdef([_AC_PATH_X_DIRECT],[],
-   [AC_DEFUN([_AC_PATH_X_DIRECT],[AC_PATH_X_DIRECT])])
-ifdef([_AC_PATH_X_XMKMF],[],
-   [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])])
+# 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,
+AC_DEFUN([AC_FIND_FILE],
 [
 $3=NO
 for i in $2;
@@ -72,7 +187,7 @@ done
 
 dnl KDE_FIND_PATH(programm-name, variable-name, list of directories,
 dnl	if-not-found, test-parameter)
-AC_DEFUN(KDE_FIND_PATH,
+AC_DEFUN([KDE_FIND_PATH],
 [
    AC_MSG_CHECKING([for $1])
    if test -n "$$2"; then
@@ -125,7 +240,7 @@ AC_DEFUN(KDE_FIND_PATH,
    fi
 ])
 
-AC_DEFUN(KDE_MOC_ERROR_MESSAGE,
+AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
 [
     AC_MSG_ERROR([No Qt meta object compiler (moc) found!
 Please check whether you installed Qt correctly.
@@ -137,7 +252,7 @@ configure.
 ])
 ])
 
-AC_DEFUN(KDE_UIC_ERROR_MESSAGE,
+AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
 [
     AC_MSG_WARN([No Qt ui compiler (uic) found!
 Please check whether you installed Qt correctly.
@@ -149,13 +264,45 @@ 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_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"
@@ -167,10 +314,24 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC,
 
    KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
    if test -z "$UIC_NOT_NEEDED"; then
-     KDE_FIND_PATH(uic, UIC, [$qt_bindirs], [UIC=""])
-     if test -z "$UIC" ; 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: "
@@ -178,9 +339,16 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC,
 
    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,
+AC_DEFUN([KDE_1_CHECK_PATHS],
 [
   KDE_1_CHECK_PATH_HEADERS
 
@@ -228,7 +396,7 @@ KDE_SET_PATHS($kde_result)
 
 ])
 
-AC_DEFUN(KDE_SET_PATHS,
+AC_DEFUN([KDE_SET_PATHS],
 [
   kde_cv_all_paths="kde_have_all_paths=\"yes\" \
 	kde_htmldir=\"$kde_htmldir\" \
@@ -239,6 +407,7 @@ AC_DEFUN(KDE_SET_PATHS,
 	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\" \
@@ -247,60 +416,87 @@ AC_DEFUN(KDE_SET_PATHS,
 	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,
+AC_DEFUN([KDE_SET_DEFAULT_PATHS],
 [
 if test "$1" = "default"; then
 
   if test -z "$kde_htmldir"; then
-    kde_htmldir='\${prefix}/share/doc/HTML'
+    kde_htmldir='\${datadir}/doc/HTML'
   fi
   if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
+    kde_appsdir='\${datadir}/applnk'
   fi
   if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
+    kde_icondir='\${datadir}/icons'
   fi
   if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
+    kde_sounddir='\${datadir}/sounds'
   fi
   if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
+    kde_datadir='\${datadir}/apps'
   fi
   if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
+    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='\${prefix}/share/config'
+    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='\${prefix}/share/mimelnk'
+    kde_mimedir='\${datadir}/mimelnk'
   fi
   if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
+    kde_toolbardir='\${datadir}/toolbar'
   fi
   if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
+    kde_wallpaperdir='\${datadir}/wallpapers'
   fi
   if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
+    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='\${prefix}/share/services'
+    kde_servicesdir='\${datadir}/services'
   fi
   if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
+    kde_servicetypesdir='\${datadir}/servicetypes'
   fi
   if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
+    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)
@@ -317,31 +513,49 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_PATHS_FOR_COMPLETENESS,
+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 "$kde_have_all_paths" != "yes"; then
+   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_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_SUBST_PROGRAMS,
+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/kde2/bin /usr/kde/bin /usr/local/kde/bin"
+        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=:
@@ -353,13 +567,30 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
+        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/kde2/share /opt/kde/share $prefix/share"
+ 	    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
@@ -370,6 +601,13 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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)
@@ -378,6 +616,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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`
@@ -396,7 +635,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         AC_SUBST(kde_libs_htmldir)
 ])dnl
 
-AC_DEFUN(AC_CREATE_KFSSTND,
+AC_DEFUN([AC_CREATE_KFSSTND],
 [
 AC_REQUIRE([AC_CHECK_RPATH])
 
@@ -414,10 +653,13 @@ 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_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
@@ -441,7 +683,7 @@ KDE_SUBST_PROGRAMS
 
 ])
 
-AC_DEFUN(AC_SUBST_KFSSTND,
+AC_DEFUN([AC_SUBST_KFSSTND],
 [
 AC_SUBST(kde_htmldir)
 AC_SUBST(kde_appsdir)
@@ -450,14 +692,22 @@ 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
@@ -470,9 +720,8 @@ dnl AC_SUBST(kde_cgidir)
 dnl AC_SUBST(kde_toolbardir)
 ])
 
-AC_DEFUN(KDE_MISC_TESTS,
+AC_DEFUN([KDE_MISC_TESTS],
 [
-   AC_LANG_C
    dnl Checks for libraries.
    AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
    AC_SUBST(LIBUTIL)
@@ -491,7 +740,6 @@ support])
       AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
    fi
    AC_CHECK_SOCKLEN_T
-   AC_LANG_C
    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,
@@ -516,27 +764,23 @@ support])
    AC_CHECK_FUNC(shmat, ,
      AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
    
-   # Solaris 2.6 and others need -lresolv for res_init
-   AC_CHECK_FUNCS(res_init, , [
-     kde_libs_safe="$LIBS"
-     LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-     AC_TRY_LINK(
-[
-#include <resolv.h>
-],
-[ 
-res_init(); 
-],
-        LIBRESOLV="-lresolv"
-        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-        AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-     )
-     LIBS=$kde_libs_safe
+   # 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(LIBRESOLV)
    AC_SUBST(X_EXTRA_LIBS)
    AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
    AC_SUBST(LIBUCB)
@@ -552,6 +796,58 @@ res_init();
 
    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 ------------------------------------------------------------------------
@@ -559,13 +855,36 @@ 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_DEFUN([K_PATH_X],
 [
-AC_REQUIRE([AC_PROG_CPP])dnl
 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_LANG_SAVE
-AC_LANG_C
+
 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
@@ -583,7 +902,7 @@ fi
 ac_x_libraries=$kde_x_libraries
 ac_x_includes=$kde_x_includes
 
-_AC_PATH_X_DIRECT
+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
@@ -603,7 +922,7 @@ mips-sgi-irix6*)
     ac_x_includes="."
   fi
   if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib"
+    ac_x_libraries="/usr/lib${kdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -659,11 +978,6 @@ fi
 all_includes="$X_INCLUDES"
 all_libraries="$X_LDFLAGS"
 
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_libraries)
-AC_SUBST(x_includes)
-
 # Check for libraries that X11R6 Xt/Xaw programs need.
 ac_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS $X_LDFLAGS"
@@ -675,13 +989,9 @@ LDFLAGS="$LDFLAGS $X_LDFLAGS"
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
 AC_CHECK_LIB(ICE, IceConnectionNumber,
   [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-AC_SUBST(LIBSM)
 LDFLAGS="$ac_save_LDFLAGS"
 
-AC_SUBST(X_PRE_LIBS)
-
 LIB_X11='-lX11 $(LIBSOCKET)'
-AC_SUBST(LIB_X11)
 
 AC_MSG_CHECKING(for libXext)
 AC_CACHE_VAL(kde_cv_have_libXext,
@@ -703,11 +1013,11 @@ 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)
 
@@ -717,58 +1027,52 @@ can't find it itself, we stop here assuming that make wouldn't find
 them either.])
 fi
 
-AC_MSG_CHECKING(for Xinerama)
-
- AC_ARG_WITH(xinerama,
-  [  --with-xinerama         enable support for Xinerama ],
-  [
-    no_xinerama=no
-  ], [
-    no_xinerama=yes
-  ]
-)
-
-kde_save_LDFLAGS="$LDFLAGS"
-kde_save_CFLAGS="$CFLAGS"
-kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
-
-if test "x$no_xinerama" = "xno"; then
-
-  AC_CACHE_VAL(ac_cv_have_xinerama,
-  [
-	  AC_TRY_LINK([#include <X11/Xlib.h>
-  			#include <X11/extensions/Xinerama.h>],
-	  	  [XineramaIsActive(NULL);],
-		  [ac_cv_have_xinerama="yes"],
-		  [ac_cv_have_xinerama="no"])
-  ])
-else
-  ac_cv_have_xinerama=no;
-fi
-
-AC_MSG_RESULT($ac_cv_have_xinerama)
+LIB_XEXT="-lXext"
+QTE_NORTTI=""
 
-LIBXINERAMA=""
-
-if test "$ac_cv_have_xinerama" = "yes"; then
-  AC_DEFINE(HAVE_XINERAMA, 1, [Define if you want Xinerama support])
-  LIBXINERAMA="-lXinerama"
+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(LIBXINERAMA)
-
-LDFLAGS="$kde_save_LDFLAGS"
-CFLAGS="$kde_save_CFLAGS"
-LIBS="$kde_save_LIBS"
-
-AC_LANG_RESTORE
+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_DEFUN([KDE_PRINT_QT_PROGRAM],
 [
 AC_REQUIRE([KDE_USE_QT])
 cat > conftest.$ac_ext <<EOF
@@ -785,10 +1089,19 @@ EOF
 
 if test $kde_qtsubver -gt 0; then
 cat >> conftest.$ac_ext <<EOF
-#include <qiconview.h>
+#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
@@ -801,83 +1114,107 @@ 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
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
     QString s;
     s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
 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,
+AC_DEFUN([KDE_USE_QT],
 [
-
 if test -z "$1"; then
-  kde_qtver=2
-  kde_qtsubver=1
+  # Current default Qt version: 3.2
+  kde_qtver=3
+  kde_qtsubver=2
 else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9]\+\.\([0-9]\+\).*#\1#'`
-  # following is the check if subversion isn�t found in passed argument
+  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]\+\)\..*#\1#'`
+  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
   if test "$kde_qtver" = "1"; then
     kde_qtsubver=42
-  else
-   # this is the version number fallback to 2.1, unless major version is 1 or 2
-   if test "$kde_qtver" != "2"; then
-    kde_qtver=2
-    kde_qtsubver=1
-   fi
   fi
 fi
 
 if test -z "$2"; then
-  if test $kde_qtver = 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
-  else
+  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
+   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
-   else
+     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
+   fi
 else
-   kde_qt_verstring=$3
+   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"
-else
+fi
+if test $kde_qtver = 1; then
    kde_qt_dirs="$QTDIR /usr/lib/qt"
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_QT_DIRECT,
+AC_DEFUN([KDE_CHECK_QT_DIRECT],
 [
 AC_REQUIRE([KDE_USE_QT])
 AC_MSG_CHECKING([if Qt compiles without flags])
@@ -893,7 +1230,11 @@ 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=
@@ -936,10 +1277,11 @@ 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_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.
@@ -947,98 +1289,129 @@ dnl ------------------------------------------------------------------------
 
 AC_ARG_ENABLE(
   mt,
-  [  --enable-mt             link to threaded Qt (experimental)],
+  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
   kde_use_qt_mt=$enableval,
-  kde_use_qt_mt=no
+  [
+    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 got --enable-qt-mt then adjust some vars for the host.
+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
-
-  case $host in
-  *-*-linux-*)
-    if test "x$GCC" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread"
-      X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-    else
-      AC_MSG_WARN([Compiler is not gcc. MT support disabled.])
-    fi
-    ;;
-  *)
-    AC_MSG_WARN([MT not yet supported on $host - disabled.])
-    ;;
-  esac
-
+  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
-
-  LIBQT_GLOB="libqt.*"
-
+  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
 
-  LIBQT="-lqt"
-  kde_int_qt="-lqt"
+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
-
-      case $host in
-      *-*-linux-*)
-        if test "x$GCC" = "xyes"; then
-          LIBQT="-lqt-mt"
-          kde_int_qt="-lqt-mt"
-          LIBQT_GLOB="libqt-mt.*"
-          USING_QT_MT="using -mt"
-        fi
-      ;;
-      esac
+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
-
-  kde_qt_was_given=no
-
+  LIBQT_GLOB="lib$qtlib-mt.*"
+  USING_QT_MT="using -mt"
 else
-  kde_int_qt="$LIBQT"
+  LIBQT="-l$qtlib"
 fi
 
-if test $kde_qtver = 2; then
+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,
-    [  --with-qt-dir=DIR       where the root of Qt is installed ],
+    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
     [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib
+       ac_qt_libraries="$withval"/lib${kdelibsuff}
        ac_qt_bindir="$withval"/bin
     ])
 
 AC_ARG_WITH(qt-includes,
-    [  --with-qt-includes=DIR  where the Qt includes are. ],
+    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
     [
        ac_qt_includes="$withval"
     ])
@@ -1046,7 +1419,7 @@ AC_ARG_WITH(qt-includes,
 kde_qt_libs_given=no
 
 AC_ARG_WITH(qt-libraries,
-    [  --with-qt-libraries=DIR where the Qt library is installed.],
+    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
     [  ac_qt_libraries="$withval"
        kde_qt_libs_given=yes
     ])
@@ -1058,12 +1431,12 @@ 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 $x_includes"
+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" = "2"; then
+if test "$kde_qtver" != "1"; then
   kde_qt_header=qstyle.h
 else
   kde_qt_header=qglobal.h
@@ -1074,7 +1447,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib $dir"
+   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
@@ -1088,6 +1461,12 @@ else
     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"
 
@@ -1099,8 +1478,8 @@ ac_ldflags_safe="$LDFLAGS"
 ac_libs_safe="$LIBS"
 
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS"
-LIBS="$LIBS $LIBQT"
+LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
+LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
 
 KDE_PRINT_QT_PROGRAM
 
@@ -1120,6 +1499,7 @@ 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)";
@@ -1127,11 +1507,17 @@ if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
       ac_qt_notfound="(headers)";
     fi
   else
-    ac_qt_notfound="(libraries)";
+    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.])
+For more details about this problem, look at the end of config.log.$missing_qt_mt])
 else
   have_qt="yes"
 fi
@@ -1150,15 +1536,15 @@ else
   qt_includes="$ac_qt_includes"
 fi
 
-if test ! "$kde_qt_libs_given" = "yes"; then
-KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
+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="";
+ QT_INCLUDES=""
 else
  QT_INCLUDES="-I$qt_includes"
  all_includes="$QT_INCLUDES $all_includes"
@@ -1170,27 +1556,93 @@ 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
 
-LIB_QT="$kde_int_qt "'$(LIBPNG) $(LIBJPEG) -lXext $(LIB_X11) $(LIBSM)'
+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_DEFUN([AC_PATH_QT],
 [
 AC_PATH_QT_1_3
 ])
 
-AC_DEFUN(KDE_CHECK_FINAL,
+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, [  --enable-final          build size optimized apps (experimental - needs lots of memory)],
+  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)
 
-  KDE_COMPILER_REPO
   if test "x$kde_use_final" = "xyes"; then
       KDE_USE_FINAL_TRUE=""
       KDE_USE_FINAL_FALSE="#"
@@ -1200,10 +1652,15 @@ AC_DEFUN(KDE_CHECK_FINAL,
   fi
   AC_SUBST(KDE_USE_FINAL_TRUE)
   AC_SUBST(KDE_USE_FINAL_FALSE)
+])
 
-  AC_ARG_ENABLE(closure, [  --disable-closure       don't delay template instantiation],
-  	kde_use_closure=$enableval, kde_use_closure=yes)
+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="#"
@@ -1211,9 +1668,44 @@ AC_DEFUN(KDE_CHECK_FINAL,
   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 ------------------------------------------------------------------------
@@ -1222,24 +1714,22 @@ 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_DEFUN([AC_BASE_PATH_KDE],
 [
-AC_PREREQ([2.13])
+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=${prefix}/include
-  ac_kde_includes=$prefix/include
+  kde_includes=${includedir}
+  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
+
+  kde_libraries=${libdir}
+  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
 
-  if test "${exec_prefix}" != NONE; then
-    kde_libraries=${exec_prefix}/lib
-    ac_kde_libraries=$exec_prefix/lib
-  else
-    kde_libraries=${prefix}/lib
-    ac_kde_libraries=$prefix/lib
-  fi
 else
   ac_kde_includes=
   ac_kde_libraries=
@@ -1260,7 +1750,7 @@ 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/kde2/include /opt/kde/include $x_includes $qt_includes"
+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)
@@ -1272,20 +1762,34 @@ 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 /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
+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
-ac_kde_libraries="$kde_libdir"
 
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then
+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 \
@@ -1315,8 +1819,8 @@ if test "$have_kde" != "yes"; then
   AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
  fi
 
- kde_libraries="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
+ kde_libraries="${libdir}"
+ kde_includes="${includedir}"
 
 else
   ac_cv_have_kde="have_kde=yes \
@@ -1335,6 +1839,8 @@ 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 
@@ -1351,14 +1857,21 @@ 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_DEFUN([KDE_CHECK_EXTRA_LIBS],
 [
 AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes, [  --with-extra-includes=DIR
-                          adds non standard include paths],
+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
 )
@@ -1383,7 +1896,7 @@ AC_MSG_RESULT($kde_use_extra_includes)
 
 kde_extra_libs=
 AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs, [  --with-extra-libs=DIR   adds non standard library paths],
+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
 )
@@ -1409,7 +1922,7 @@ AC_MSG_RESULT($kde_use_extra_libs)
 
 ])
 
-AC_DEFUN(KDE_1_CHECK_PATH_HEADERS,
+AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
 [
     AC_MSG_CHECKING([for KDE headers installed])
     AC_LANG_SAVE
@@ -1440,11 +1953,18 @@ int main() {
     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_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
+ ac_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$all_includes $CPPFLAGS"
  if AC_TRY_EVAL(ac_compile); then
    AC_MSG_RESULT(yes)
  else
@@ -1452,11 +1972,12 @@ EOF
 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_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
 AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
@@ -1481,7 +2002,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
 
  LDFLAGS=$kde_ldflags_safe
  LIBS=$kde_libs_safe
- kde_cxxflags_safe="$CXXFLAGS"
+ CXXFLAGS=$kde_cxxflags_safe
 ])
 
 AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
@@ -1492,85 +2013,53 @@ It is a separate package (and CVS module) named kde-qt-addon.])
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_KIMGIO,
-[
-   AC_REQUIRE([AC_BASE_PATH_KDE])
-   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-   AC_REQUIRE([AC_FIND_TIFF])
-   AC_REQUIRE([AC_FIND_JPEG])
-   AC_REQUIRE([AC_FIND_PNG])
-   AC_REQUIRE([KDE_CREATE_LIBS_ALIASES])
-
-   if test "$1" = "existance"; then
-     AC_LANG_SAVE
-     AC_LANG_CPLUSPLUS
-     kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries $LIBJPEG $LIBTIFF $LIBPNG $LIBQT -lm"
-     AC_CHECK_LIB(kimgio, kimgioRegister, [
-      LIBKIMGIO_EXISTS=yes],LIBKIMGIO_EXISTS=no)
-      LIBS="$kde_save_LIBS"
-      AC_LANG_RESTORE
-   else
-      LIBKIMGIO_EXISTS=yes
-   fi
-
-   if test "$LIBKIMGIO_EXISTS" = "yes"; then
-     LIB_KIMGIO='-lkimgio'
-   else
-     LIB_KIMGIO=''
-   fi
-   AC_SUBST(LIB_KIMGIO)
-])
-
-AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
+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 = 2; then
-   LIB_KDECORE='-lkdecore'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFORMULA='-lkformula'
-   AC_SUBST(LIB_KFORMULA)
-   LIB_KIO='-lkio'
-   AC_SUBST(LIB_KIO)
-   LIB_KSYCOCA='-lksycoca'
-   AC_SUBST(LIB_KSYCOCA)
-   LIB_SMB='-lsmb'
-   AC_SUBST(LIB_SMB)
-   LIB_KFILE='-lkfile'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab'
-   AC_SUBST(LIB_KAB)
-   LIB_KHTML='-lkhtml'
-   AC_SUBST(LIB_KHTML)
-   LIB_KSPELL='-lkspell'
-   AC_SUBST(LIB_KSPELL)
-   LIB_KPARTS='-lkparts'
-   AC_SUBST(LIB_KPARTS)
-   LIB_KWRITE='-lkwrite'
-   AC_SUBST(LIB_KWRITE)
+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
-   LIB_KDECORE='-lkdecore -lXext $(LIB_QT)'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui $(LIB_KDECORE)'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFM='-lkfm $(LIB_KDECORE)'
-   AC_SUBST(LIB_KFM)
-   LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)'
-   AC_SUBST(LIB_KAB)
+   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_DEFUN([AC_PATH_KDE],
 [
   AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check, [  --disable-path-check    don't try to find out, where to install],
+  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"
@@ -1591,203 +2080,303 @@ AC_DEFUN(AC_PATH_KDE,
   KDE_CREATE_LIBS_ALIASES
 ])
 
-dnl obsolete
-AC_DEFUN(AC_CHECK_SETENV,
+dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
+AC_DEFUN([KDE_CHECK_FUNC_EXT],
 [
-   AC_OBSOLETE([$0], [; instead use AC_CHECK_FUNCS([setenv unsetenv])])dnl 
-   AC_CHECK_FUNCS([setenv unsetenv])
-])
-
-AC_DEFUN(AC_CHECK_GETDOMAINNAME,
-[
-AC_MSG_CHECKING(for getdomainname)
-AC_CACHE_VAL(ac_cv_func_getdomainname,
+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 "$GCC" = "yes"; then
+if test "$GXX" = "yes"; then
 CXXFLAGS="$CXXFLAGS -pedantic-errors"
 fi
 AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <unistd.h>
+$2
 ],
 [
-char buffer[200];
-getdomainname(buffer, 200);
+$3
 ],
-ac_cv_func_getdomainname=yes,
-ac_cv_func_getdomainname=no)
+kde_cv_func_$1=yes,
+kde_cv_func_$1=no)
 CXXFLAGS="$save_CXXFLAGS"
-LIBS=$kde_safe_LIBS
+LIBS="$kde_safe_LIBS"
 AC_LANG_RESTORE
 ])
-AC_MSG_RESULT($ac_cv_func_getdomainname)
 
-AC_MSG_CHECKING([if getdomainname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_getdomainname,
+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
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  ac_cv_proto_getdomainname=no
-else
   kde_safe_libs=$LIBS
   LIBS="$LIBS $X_EXTRA_LIBS"
   AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
+$2
 
-extern "C" int getdomainname (char *, int);
+extern "C" $4;
 ],
 [
-char buffer[200];
-getdomainname(buffer, 200);
+$3
 ],
-  ac_cv_func_getdomainname=yes
-  ac_cv_proto_getdomainname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR([getdomainname unavailable]))
-fi
+[ 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($ac_cv_proto_getdomainname)
+AC_MSG_RESULT($kde_cv_proto_$1)
 
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME, 1, [Define if you have getdomainname])
+if test "x$kde_cv_func_$1" = xyes; then
+  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
+  $6
 fi
-if eval "test \"`echo $ac_cv_proto_getdomainname`\" = no"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME_PROTO, 1,
-  [Define if you have getdomainname prototype])
+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_GETHOSTNAME,
+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_MSG_CHECKING([for gethostname])
-AC_CACHE_VAL(ac_cv_func_gethostname,
+AC_DEFUN([AC_CHECK_UNSETENV],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_LINK([
+	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);
-],
-ac_cv_func_gethostname=yes,
-ac_cv_func_gethostname=no)
-CXXFLAGS="$save_CXXFLAGS"
-AC_LANG_RESTORE
+], 	
+	        [int gethostname (char *, unsigned int)],
+		[GETHOSTNAME])
 ])
-AC_MSG_RESULT($ac_cv_func_gethostname)
 
-AC_MSG_CHECKING([if gethostname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_gethostname,
+AC_DEFUN([AC_CHECK_USLEEP],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  ac_cv_proto_gethostname=no
-else
-  AC_TRY_LINK([
-#include <stdlib.h>
+	KDE_CHECK_FUNC_EXT(usleep, [
 #include <unistd.h>
+], 
+		[
+usleep(200);
+], 	
+	        [int usleep (unsigned int)],
+		[USLEEP])
+])
 
-extern "C" int gethostname (char *, int);
-],
+
+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];
-gethostname(buffer, 200);
+initgroups(buffer, 27);
 ],
-  ac_cv_func_gethostname=yes
-  ac_cv_proto_gethostname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR(gethostname unavailable))
-fi
-AC_LANG_RESTORE
+	[int initgroups(const char *, gid_t)],
+	[INITGROUPS])
 ])
-AC_MSG_RESULT($ac_cv_proto_gethostname)
 
-if eval "test \"`echo $ac_cv_proto_gethostname`\" = no"; then
-  AC_DEFINE(HAVE_GETHOSTNAME_PROTO, 1,
-  [Define if you have gethostname prototype])
-fi
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  AC_DEFINE(HAVE_GETHOSTNAME, 1, [Define if you have gethostname])
-fi
+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_USLEEP,
-[
-AC_MSG_CHECKING([for usleep])
-AC_CACHE_VAL(ac_cv_func_usleep,
+AC_DEFUN([AC_CHECK_MKDTEMP],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
+	KDE_CHECK_FUNC_EXT(mkdtemp, [
 #include <stdlib.h>
 #include <unistd.h>
 ],
-[
-usleep(200);
+	[
+mkdtemp("/tmp/aaaXXXXXX");
 ],
-ac_cv_func_usleep=yes,
-ac_cv_func_usleep=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_usleep)
-if eval "test \"`echo $ac_cv_func_usleep`\" = yes"; then
-  AC_DEFINE(HAVE_USLEEP, 1, [Define if you have the usleep function])
-fi
+	[char *mkdtemp(char *)],
+	[MKDTEMP])
 ])
 
-AC_DEFUN(AC_CHECK_RANDOM,
+
+AC_DEFUN([AC_CHECK_RES_INIT],
 [
-AC_MSG_CHECKING([for random])
-AC_CACHE_VAL(ac_cv_func_random,
+  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],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
+	KDE_CHECK_FUNC_EXT(strlcpy, [
+#include <string.h>
 ],
-[
-random();
+[ char buf[20];
+  strlcpy(buf, "KDE function test", sizeof(buf));
 ],
-ac_cv_func_random=yes,
-ac_cv_func_random=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
+ 	[unsigned long strlcpy(char*, const char*, unsigned long)],
+	[STRLCPY])
 ])
-AC_MSG_RESULT($ac_cv_func_random)
-if eval "test \"`echo $ac_cv_func_random`\" = yes"; then
-  AC_DEFINE(HAVE_RANDOM, 1, [Define if you have random])
-fi
+
+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_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
@@ -1813,12 +2402,11 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_FIND_JPEG_HELPER,
+AC_DEFUN([KDE_FIND_JPEG_HELPER],
 [
 AC_MSG_CHECKING([for libjpeg$2])
 AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
 [
-AC_LANG_C
 ac_save_LIBS="$LIBS"
 LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
 ac_save_CFLAGS="$CFLAGS"
@@ -1856,7 +2444,7 @@ fi
 
 ])
 
-AC_DEFUN(AC_FIND_JPEG,
+AC_DEFUN([AC_FIND_JPEG],
 [
 dnl first look for libraries
 KDE_FIND_JPEG_HELPER(6b, 6b,
@@ -1869,7 +2457,7 @@ KDE_FIND_JPEG_HELPER(6b, 6b,
 
 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="/usr/include /usr/local/include $kde_extra_includes"
+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=
 
@@ -1896,15 +2484,61 @@ Disabling JPEG support.
 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_DEFUN([AC_FIND_ZLIB],
 [
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_MSG_CHECKING([for libz])
 AC_CACHE_VAL(ac_cv_lib_z,
 [
-AC_LANG_C
 kde_save_LIBS="$LIBS"
 LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
 kde_save_CFLAGS="$CFLAGS"
@@ -1913,7 +2547,14 @@ AC_TRY_LINK(dnl
 [
 #include<zlib.h>
 ],
-            [return (zlibVersion() == ZLIB_VERSION); ],
+[
+  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"
@@ -1922,16 +2563,19 @@ CFLAGS="$kde_save_CFLAGS"
 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_SUBST(LIBZ)
   AC_MSG_RESULT($ac_cv_lib_z)
 else
-  AC_MSG_ERROR(not found. Check your installation and look into config.log)
+  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=""
-  AC_SUBST(LIBZ)
 fi
+AC_SUBST(LIBZ)
 ])
 
-AC_DEFUN(KDE_TRY_TIFFLIB,
+AC_DEFUN([KDE_TRY_TIFFLIB],
 [
 AC_MSG_CHECKING([for libtiff $1])
 
@@ -1940,7 +2584,11 @@ 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"
 
@@ -1973,7 +2621,7 @@ fi
 
 ])
 
-AC_DEFUN(AC_FIND_TIFF,
+AC_DEFUN([AC_FIND_TIFF],
 [
 AC_REQUIRE([K_PATH_X])
 AC_REQUIRE([AC_FIND_ZLIB])
@@ -1987,7 +2635,7 @@ AC_SUBST(LIBTIFF)
 ])
 
 
-AC_DEFUN(AC_FIND_PNG,
+AC_DEFUN([AC_FIND_PNG],
 [
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_REQUIRE([AC_FIND_ZLIB])
@@ -1995,10 +2643,14 @@ 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_LANG_C
+
 AC_TRY_LINK(dnl
     [
     #include<png.h>
@@ -2026,12 +2678,49 @@ else
 fi
 ])
 
-AC_DEFUN(AC_CHECK_BOOL,
+
+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_DEFUN([AC_CHECK_GNU_EXTENSIONS],
 [
 AC_MSG_CHECKING(if you need GNU extensions)
 AC_CACHE_VAL(ac_cv_gnu_extensions,
@@ -2059,21 +2748,19 @@ if test "$ac_cv_gnu_extensions" = "yes"; then
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_COMPILER_FLAG,
+AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
 [
-dnl AC_REQUIRE([AC_CHECK_COMPILERS]) <- breaks with autoconf 2.50
-AC_MSG_CHECKING(whether $CXX supports -$1)
-kde_cache=`echo $1 | sed 'y%.=/+-%___p_%'`
+AC_MSG_CHECKING([whether $CXX supports -$1])
+kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
 AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
 [
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -$1 -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -$1 -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
+  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)
@@ -2089,7 +2776,7 @@ 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,
+AC_DEFUN([AC_REMOVE_FORBIDDEN],
 [ __val=$$1
   __forbid=" $2 "
   if test -n "$__val"; then
@@ -2110,33 +2797,50 @@ AC_DEFUN(AC_REMOVE_FORBIDDEN,
 ])
 
 dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN(AC_VALIDIFY_CXXFLAGS,
+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_DEFUN([AC_CHECK_COMPILERS],
 [
-  AC_ARG_ENABLE(debug,[  --enable-debug          enables debug symbols [default=no]],
+  AC_ARG_ENABLE(debug,
+	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
-   if test $enableval = "no"; dnl
-     then
-       kde_use_debug_code="no"
-       kde_use_debug_define=yes
-     else
-       kde_use_debug_code="yes"
-       kde_use_debug_define=no
-   fi
+    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,[  --disable-debug         disables debug output and debug symbols [default=no]],[],[])
-
-  AC_ARG_ENABLE(strict,[  --enable-strict         compiles with strict compiler options (may not work!)],
+  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"
@@ -2145,7 +2849,21 @@ AC_DEFUN(AC_CHECK_COMPILERS,
     fi
    ], [kde_use_strict_options="no"])
 
-  AC_ARG_ENABLE(profile,[  --enable-profile        creates profiling infos [default=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"]
   )
@@ -2155,14 +2873,15 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CC 
 
+  AC_PROG_CPP
+
   if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CFLAGS="-g -O2 $CFLAGS"
-      case $host in
-        *-*-linux-gnu)	
-          CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-        ;;
-      esac
+    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
@@ -2172,6 +2891,7 @@ AC_DEFUN(AC_CHECK_COMPILERS,
     CFLAGS="-DNDEBUG $CFLAGS"
   fi
 
+
   case "$host" in
   *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
   *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
@@ -2185,34 +2905,33 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CXX
 
-  if test "$GXX" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $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"])
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      case $host in  dnl
-      *-*-linux-gnu)
-        CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS"
-        ;;
-      esac
-
-      if test "$kde_use_strict_options" = "yes"; then
-        CXXFLAGS="-Wcast-qual -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
+  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"])
 
-      if test "$kde_very_strict" = "yes"; then
-        CXXFLAGS="-Wold-style-cast -Wredundant-decls -Wconversion $CXXFLAGS"
-      fi
+      dnl convenience compiler flags
+      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
+      AC_SUBST(WOVERLOADED_VIRTUAL)
     else
-      CXXFLAGS="-O2 $CXXFLAGS"
+      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 $CXXFLAGS"
+    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
   fi  
 
   if test "$kde_use_profiling" = "yes"; then
@@ -2222,10 +2941,72 @@ AC_DEFUN(AC_CHECK_COMPILERS,
       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
     
-  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(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
+  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=
@@ -2249,96 +3030,85 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CXXCPP
 
-  # the following is to allow programs, that are known to
-  # have problems when compiled with -O2
-  if test -n "$CXXFLAGS"; then
-      kde_safe_IFS=$IFS
-      IFS=" "
-      NOOPT_CXXFLAGS=""
-      for i in $CXXFLAGS; do
-        case $i in
-          -O*)
-                ;;
-          *)
-                NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS $i"
-                ;;
-        esac
-      done
-      IFS=$kde_safe_IFS
+  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]), [])
-
-  KDE_CXXFLAGS=
-  AC_SUBST(KDE_CXXFLAGS)
 ])
 
-AC_DEFUN(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_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_LANG_SAVE
-AC_LANG_C
 AC_OBJEXT
 AC_EXEEXT
-AC_LANG_RESTORE
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
 
 LIBTOOL_SHELL="/bin/sh ./libtool"
 #  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
+KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-AC_ARG_ENABLE(objprelink, [  --enable-objprelink     prelink apps using objprelink (experimental [only tested on linux/386])],
-       kde_use_objprelink=$enableval, kde_use_objprelink=no)
-  if test "x$kde_use_objprelink" = "xyes"; then 
+# 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')
+])
 
-      KDE_FIND_PATH(objprelink, OBJPRELINK, [], [kde_use_objprelink=no])   
-     
-      if test "x$kde_use_objprelink" = "xyes"; then
-      AC_MSG_CHECKING([Patching libtool to run objprelink.])
-      mv libtool libtool.orig
-      cat > libtool <<\EOF
-#! /bin/sh
-for n ; do case $n in
-  *.o)  test -r $n && echo objprelink $n && objprelink $n ;;
-  *.lo) m=`basename $n .lo`".o" && test -r $m && echo objprelink $m && objprelink $m 
-        m=".libs/$m" && test -r $m && echo objprelink $m && objprelink $m ;;
-esac; done
-EOF
-      cat >> libtool libtool.orig
-      rm libtool.orig
-      chmod a+x libtool
-      AC_MSG_RESULT(done)
-	fi
-  fi
+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_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
-  AC_CHECK_SIZEOF(char, 1)dnl
 ])dnl
 
-AC_DEFUN(KDE_DO_IT_ALL,
+AC_DEFUN([KDE_DO_IT_ALL],
 [
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -2351,11 +3121,11 @@ AM_KDE_WITH_NLS
 AC_PATH_KDE
 ])
 
-AC_DEFUN(AC_CHECK_RPATH,
+AC_DEFUN([AC_CHECK_RPATH],
 [
 AC_MSG_CHECKING(for rpath)
 AC_ARG_ENABLE(rpath,
-      [  --disable-rpath         do not use the rpath feature of ld],
+      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
@@ -2367,7 +3137,8 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
   fi
   dnl $x_libraries is set to /usr/lib in case
   if test -n "$X_LDFLAGS"; then
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
+    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)"
@@ -2375,11 +3146,12 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 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_DEFUN([AC_CHECK_SOCKLEN_T], [
   AC_MSG_CHECKING(for socklen_t)
   AC_CACHE_VAL(ac_cv_socklen_t, [
     AC_LANG_SAVE
@@ -2431,7 +3203,7 @@ dnl PARTICULAR PURPOSE.
 dnl >
 dnl for this file it is relicensed under LGPL
 
-AC_DEFUN(AM_KDE_WITH_NLS,
+AC_DEFUN([AM_KDE_WITH_NLS],
   [
     dnl If we use NLS figure out what method
 
@@ -2474,7 +3246,7 @@ AC_DEFUN(AM_KDE_WITH_NLS,
 
 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,
+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])
@@ -2516,7 +3288,7 @@ AC_SUBST($1)dnl
 
 # serial 1
 
-AC_DEFUN(AM_LC_MESSAGES,
+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],
@@ -2562,7 +3334,7 @@ AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
 # serial 1
 # Stephan Kulow: I put a KDE in it to avoid name conflicts
 
-AC_DEFUN(AM_KDE_GNU_GETTEXT,
+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
@@ -2571,15 +3343,15 @@ AC_DEFUN(AM_KDE_GNU_GETTEXT,
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
    AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+   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="-Wmissing-prototypes -Werror"
+   CXXFLAGS="-Werror"
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS
    AC_TRY_COMPILE([
@@ -2624,14 +3396,14 @@ __argz_count __argz_stringify __argz_next])
 
   ])
 
-AC_DEFUN(AC_HAVE_XPM,
+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, [  --without-xpm           disable color pixmap XPM tests],
+ 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
@@ -2639,10 +3411,13 @@ AC_DEFUN(AC_HAVE_XPM,
    AC_MSG_CHECKING(for XPM)
    AC_CACHE_VAL(ac_cv_have_xpm,
    [
-    AC_LANG_C
     ac_save_ldflags="$LDFLAGS"
     ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
+    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>],[],
@@ -2676,7 +3451,7 @@ AC_DEFUN(AC_HAVE_XPM,
  AC_SUBST(XPMLIB)
 ])
 
-AC_DEFUN(AC_HAVE_DPMS,
+AC_DEFUN([AC_HAVE_DPMS],
  [AC_REQUIRE_CPP()dnl
   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 
@@ -2684,7 +3459,7 @@ AC_DEFUN(AC_HAVE_DPMS,
  test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
  DPMS_LIB=
 
- AC_ARG_WITH(dpms, [  --without-dpms          disable DPMS power saving],
+ 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
@@ -2694,41 +3469,45 @@ AC_DEFUN(AC_HAVE_DPMS,
    dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
    AC_CACHE_VAL(ac_cv_have_dpms,
    [
-    AC_LANG_C
-    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"
+    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
@@ -2755,46 +3534,69 @@ AC_DEFUN(AC_HAVE_DPMS,
     $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_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, [  --without-gl            disable 3D GL modes],
+ AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
 	gl_test=$withval, gl_test="yes")
- if test "x$gl_test" = xno; then
+ 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_C
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
     ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET"
-    CFLAGS="$CFLAGS $X_INCLUDES"
+    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>           
+#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 -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET"
-      CFLAGS="$ac_save_cflags $X_INCLUDES"
+      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"
-    CFLAGS="$ac_save_cflags"
+    CXXFLAGS="$ac_save_cxxflags"
    ])dnl
 
   if test "$ac_cv_have_gl" = "no"; then
@@ -2806,15 +3608,15 @@ AC_DEFUN(AC_HAVE_GL,
     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='-lMesaGL -lMesaGLU $(LIB_X11)'
+          GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)'
        else
-          GLLIB='-lGL -lGLU $(LIB_X11)'
+          GLLIB='-lGLU -lGL $(LIB_X11)'
        fi
     else
        if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)'
+          GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)'
        else
-          GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
+          GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
        fi
     fi
     if test "$GL_INCLUDE" = ""; then
@@ -2833,63 +3635,74 @@ AC_DEFUN(AC_HAVE_GL,
 
  dnl shadow password and PAM magic - maintained by ossi@kde.org
 
-AC_DEFUN(KDE_PAM, [
+AC_DEFUN([KDE_PAM], [
   AC_REQUIRE([KDE_CHECK_LIBDL])
 
+  want_pam=
   AC_ARG_WITH(pam,
-    [  --with-pam[=ARG]        enable support for PAM: ARG=[yes|no|service name]],
+    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
     [ if test "x$withval" = "xyes"; then
-        use_pam=yes
+        want_pam=yes
         pam_service=kde
       elif test "x$withval" = "xno"; then
-        use_pam=no
+        want_pam=no
       else
-        use_pam=yes
+        want_pam=yes
         pam_service=$withval
       fi
-      ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-    ], [
-      AC_CACHE_VAL(ac_cv_path_pam,
-        [ use_pam=no
-          AC_CHECK_LIB(pam, pam_start,
-            [ AC_CHECK_HEADER(security/pam_appl.h, 
-                [ use_pam=yes
-                  pam_service=kde ]) 
-            ], , $LIBDL)
-          ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-        ])
-    ])
-  eval "$ac_cv_path_pam"
+    ], [ 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
 
-  AC_MSG_CHECKING(for PAM)
-  if test "x$use_pam" = xno; then
-    AC_MSG_RESULT(no)
-    PAMLIBS=""
-  else
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-    PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
+      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], security/pam_appl.h,
-      [ AC_EGREP_HEADER([const struct pam_message], security/pam_appl.h,
-                        [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])])
+      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_DEFUN([DEF_PAM_SERVICE], [
   AC_ARG_WITH($1-pam,
-    [  --with-$1-pam=[val]    override PAM service from --with-pam for $2],
+    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"
+        $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.])
@@ -2906,7 +3719,7 @@ You may want to enforce it by using --with-pam.])
     AC_SUBST($3_PAM_SERVICE)
 ])
 
-AC_DEFUN(KDE_SHADOWPASSWD, [
+AC_DEFUN([KDE_SHADOWPASSWD], [
   AC_REQUIRE([KDE_PAM])
 
   AC_CHECK_LIB(shadow, getspent,
@@ -2929,7 +3742,7 @@ AC_DEFUN(KDE_SHADOWPASSWD, [
   AC_MSG_CHECKING([for shadow passwords])
 
   AC_ARG_WITH(shadow,
-    [  --with-shadow		  If you want shadow password support ],
+    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
     [ if test "x$withval" != "xno"; then
         use_shadow=yes
       else
@@ -2963,7 +3776,7 @@ AC_DEFUN(KDE_SHADOWPASSWD, [
 
 ])
 
-AC_DEFUN(KDE_PASSWDLIBS, [
+AC_DEFUN([KDE_PASSWDLIBS], [
   AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
   AC_REQUIRE([KDE_PAM])
   AC_REQUIRE([KDE_SHADOWPASSWD])
@@ -2974,10 +3787,22 @@ AC_DEFUN(KDE_PASSWDLIBS, [
     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_DEFUN([KDE_CHECK_LIBDL],
 [
 AC_CHECK_LIB(dl, dlopen, [
 LIBDL="-ldl"
@@ -2992,7 +3817,7 @@ ac_cv_have_shload=yes
 AC_SUBST(LIBDL)
 ])
 
-AC_DEFUN(KDE_CHECK_DLOPEN,
+AC_DEFUN([KDE_CHECK_DLOPEN],
 [
 KDE_CHECK_LIBDL
 AC_CHECK_HEADERS(dlfcn.h dl.h)
@@ -3007,7 +3832,7 @@ fi
 dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
 dnl (MM)
 AC_ARG_ENABLE(dlopen,
-[  --disable-dlopen        link statically [default=no]] ,
+AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
 enable_dlopen=$enableval,
 enable_dlopen=yes)
 
@@ -3032,7 +3857,7 @@ fi
 
 ])
 
-AC_DEFUN(KDE_CHECK_DYNAMIC_LOADING,
+AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
 [
 KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
 KDE_PROG_LIBTOOL
@@ -3052,7 +3877,7 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_ADD_INCLUDES,
+AC_DEFUN([KDE_ADD_INCLUDES],
 [
 if test -z "$1"; then
   test_include="Pix.h"
@@ -3089,209 +3914,53 @@ fi
 ])
 ])
 
-
-AC_DEFUN(KDE_CHECK_MICO,
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_MISC_TESTS])
-AC_MSG_CHECKING(for MICO)
-
-if test -z "$MICODIR"; then
-    kde_micodir=/usr/local
- else
-    kde_micodir="$MICODIR"
-fi
-
-AC_ARG_WITH(micodir,
-  [  --with-micodir=micodir  where mico is installed ],
-  kde_micodir=$withval,
-  kde_micodir=$kde_micodir
-)
-
-AC_CACHE_VAL(kde_cv_mico_incdir,
-[
-  mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes"
-AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir)
-
-])
-kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'`
-
-if test ! -r  $kde_micodir/include/CORBA.h; then
-  AC_MSG_ERROR([No CORBA.h found, specify another micodir])
-fi
-
-AC_MSG_RESULT($kde_micodir)
-
-MICO_INCLUDES=-I$kde_micodir/include
-AC_SUBST(MICO_INCLUDES)
-MICO_LDFLAGS=-L$kde_micodir/lib
-AC_SUBST(MICO_LDFLAGS)
-micodir=$kde_micodir
-AC_SUBST(micodir)
-
-AC_MSG_CHECKING([for MICO version])
-AC_CACHE_VAL(kde_cv_mico_version,
+AC_DEFUN([KDE_CHECK_LIBPTHREAD],
 [
-AC_LANG_C
-cat >conftest.$ac_ext <<EOF
-#include <stdio.h>
-#include <mico/version.h>
-int main() {
+  LIBPTHREAD=""
 
-   printf("MICO_VERSION=%s\n",MICO_VERSION);
-   return (0);
-}
-EOF
-ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest'
-if AC_TRY_EVAL(ac_compile); then
-  if eval `./conftest 2>&5`; then
-    kde_cv_mico_version=$MICO_VERSION
-  else
-    AC_MSG_ERROR([your system is not able to execute a small application to
-    find MICO version! Check $kde_micodir/include/mico/version.h])
+  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
-else
-  AC_MSG_ERROR([your system is not able to compile a small application to
-  find MICO version! Check $kde_micodir/include/mico/version.h])
-fi
-])
-
-dnl installed MICO version
-mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "x$1" = "x"; then
- req_version="2.3.0"
-else
- req_version=$1
-fi
-
-dnl required MICO version
-req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "$mico_v_maj" -lt "$req_v_maj" || \
-   ( test "$mico_v_maj" -eq "$req_v_maj" && \
-        test "$mico_v_mid" -lt "$req_v_mid" ) || \
-   ( test "$mico_v_mid" -eq "$req_v_mid" && \
-        test "$mico_v_min" -lt "$req_v_min" )
-
-then
-  AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \
-at least is required. You should upgrade MICO.])
-else
-  AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)])
-fi
-
-LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL"
-AC_SUBST(LIBMICO)
-if test -z "$IDL"; then
-  IDL='$(kde_bindir)/cuteidl'
-fi
-AC_SUBST(IDL)
-IDL_DEPENDENCIES='$(kde_includes)/CUTE.h'
-AC_SUBST(IDL_DEPENDENCIES)
-
-idldir="\$(includedir)/idl"
-AC_SUBST(idldir)
-
-])
-
-AC_DEFUN(KDE_CHECK_MINI_STL,
-[
-AC_REQUIRE([KDE_CHECK_MICO])
-
-AC_MSG_CHECKING(if we use mico's mini-STL)
-AC_CACHE_VAL(kde_cv_have_mini_stl,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_cxxflags="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $MICO_INCLUDES"
-AC_TRY_COMPILE(
-[
-#include <mico/config.h>
-],
-[
-#ifdef HAVE_MINI_STL
-#error "nothing"
-#endif
-],
-kde_cv_have_mini_stl=no,
-kde_cv_have_mini_stl=yes)
-CXXFLAGS="$kde_save_cxxflags"
-AC_LANG_RESTORE
-])
-
-if test "x$kde_cv_have_mini_stl" = "xyes"; then
-   AC_MSG_RESULT(yes)
-   $1
-else
-   AC_MSG_RESULT(no)
-   $2
-fi
-])
-
-])
 
+  if test -z "$LIBPTHREAD"; then
+    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
+  fi
 
-AC_DEFUN(KDE_CHECK_LIBPTHREAD,
-[
-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-AC_SUBST(LIBPTHREAD)
+  AC_SUBST(LIBPTHREAD)
 ])
 
-AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
+AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
 [
-    AC_ARG_ENABLE(kernel-threads, [  --enable-kernel-threads Enable the use of the LinuxThreads port on FreeBSD/i386 only.],
-	kde_use_kernthreads=$enableval, kde_use_kernthreads=no)
-
-    if test "$kde_use_kernthreads" = "yes"; then
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_CFLAGS="$CXXFLAGS"
-      CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
-      CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
-      AC_CHECK_HEADERS(pthread/linuxthreads/pthread.h)
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      CFLAGS="$ac_save_CFLAGS"
-      if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
-        kde_use_kernthreads=no
-      else
-        dnl Add proper -I and -l statements
-        AC_CHECK_LIB(lthread, pthread_join, [LIBPTHREAD="-llthread -llgcc_r"]) dnl for FreeBSD
-        if test "x$LIBPTHREAD" = "x"; then
-          kde_use_kernthreads=no
-        else
-          USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
-        fi
-      fi
-    else 
       USE_THREADS=""
       if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-pthread"] )
+        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
       fi
-    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"
-                echo "Setting Solaris pthread compilation options"
     		;;
         freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                echo "Setting FreeBSD pthread compilation options"
+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
                 ;;
         aix*)
                 CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
                 LIBPTHREAD="$LIBPTHREAD -lc_r"
-                echo "Setting AIX pthread compilation options"
                 ;;
         linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                USE_THREADS="$USE_THREADS -DPIC -fPIC"
-                echo "Setting Linux pthread compilation options"
+                if test "$CXX" = "KCC"; then
+                  CXXFLAGS="$CXXFLAGS --thread_safe"
+		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
+                fi
                 ;;
 	*)
 		;;
@@ -3300,25 +3969,28 @@ AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
     AC_SUBST(LIBPTHREAD)
 ])
 
-AC_DEFUN(KDE_CHECK_THREADING,
+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
-    kde_check_threading_default=no
+    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, [  --disable-threading     disables threading even if libpthread found ],
+  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,
+AC_DEFUN([KDE_TRY_LINK_PYTHON],
 [
 if test "$kde_python_link_found" = no; then
 
@@ -3330,8 +4002,6 @@ fi
 
 AC_CACHE_VAL(kde_cv_try_link_python_$1,
 [
-AC_LANG_SAVE
-AC_LANG_C
 kde_save_cflags="$CFLAGS"
 CFLAGS="$CFLAGS $PYTHONINC"
 kde_save_libs="$LIBS"
@@ -3364,13 +4034,12 @@ else
   AC_MSG_RESULT(no)
   $4
 fi
-AC_LANG_RESTORE
 
 fi
 
 ])
 
-AC_DEFUN(KDE_CHECK_PYTHON_DIR,
+AC_DEFUN([KDE_CHECK_PYTHON_DIR],
 [
 AC_MSG_CHECKING([for Python directory])
  
@@ -3384,7 +4053,7 @@ AC_CACHE_VAL(kde_cv_pythondir,
 ])
  
 AC_ARG_WITH(pythondir,
-[  --with-pythondir=pythondir   use python installed in pythondir ],
+AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
 [
   ac_python_dir=$withval
 ], ac_python_dir=$kde_cv_pythondir
@@ -3393,7 +4062,7 @@ AC_ARG_WITH(pythondir,
 AC_MSG_RESULT($ac_python_dir)
 ])
 
-AC_DEFUN(KDE_CHECK_PYTHON_INTERN,
+AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
 [
 AC_REQUIRE([KDE_CHECK_LIBDL])
 AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
@@ -3419,13 +4088,16 @@ fi
 
 PYTHONINC=-I$python_incdir
 
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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
+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
-    python_libdir=no
+    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
 
@@ -3435,7 +4107,6 @@ if test -z "$LIBPYTHON"; then
   LIBPYTHON=-lpython$version
 fi
 
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
 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
@@ -3458,16 +4129,18 @@ else
   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.
-    Pleae use \"make LIBPYTHON='-lpython$version -lotherlib'\" to fix this
+    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"
@@ -3481,17 +4154,27 @@ fi
 ])
 
 
-AC_DEFUN(KDE_CHECK_PYTHON,
+AC_DEFUN([KDE_CHECK_PYTHON],
 [
-  KDE_CHECK_PYTHON_INTERN("2.1", [KDE_CHECK_PYTHON_INTERN("2.0",
-        [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
-  ])
+  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_SGI,
+AC_DEFUN([KDE_CHECK_STL],
 [
-    AC_MSG_CHECKING([if STL implementation is SGI like])
-    AC_CACHE_VAL(kde_cv_stl_type_sgi,
+    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>
@@ -3500,60 +4183,26 @@ using namespace std;
   string astring="Hallo Welt.";
   astring.erase(0, 6); // now astring is "Welt"
   return 0;
-], kde_cv_stl_type_sgi=yes,
-   kde_cv_stl_type_sgi=no)
-])
-
-   AC_MSG_RESULT($kde_cv_stl_type_sgi)
-
-   if test "$kde_cv_stl_type_sgi" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   fi
+], kde_cv_stl_works=yes,
+   kde_cv_stl_works=no)
 ])
 
-AC_DEFUN(KDE_CHECK_STL_HP,
-[
-    AC_MSG_CHECKING([if STL implementation is HP like])
-    AC_CACHE_VAL(kde_cv_stl_type_hp,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hello World";
-  astring.remove(0, 6); // now astring is "World"
-  return 0;
-], kde_cv_stl_type_hp=yes,
-   kde_cv_stl_type_hp=no)
-])
-   AC_MSG_RESULT($kde_cv_stl_type_hp)
+   AC_MSG_RESULT($kde_cv_stl_works)
 
-   if test "$kde_cv_stl_type_hp" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
+   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
-])
-
-AC_DEFUN(KDE_CHECK_STL,
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-    KDE_CHECK_STL_SGI
-
-    if test "$kde_cv_stl_type_sgi" = "no"; then
-       KDE_CHECK_STL_HP
-
-       if test "$kde_cv_stl_type_hp" = "no"; then
-         AC_MSG_ERROR("no known STL type found")
-       fi
-    fi
 
-    CXXFLAGS="$ac_save_CXXFLAGS"
-    AC_LANG_RESTORE
+   CXXFLAGS="$ac_save_CXXFLAGS"
+   AC_LANG_RESTORE
 ])
 
-AC_DEFUN(AC_FIND_QIMGIO,
+AC_DEFUN([AC_FIND_QIMGIO],
    [AC_REQUIRE([AC_FIND_JPEG])
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_MSG_CHECKING([for qimgio])
@@ -3592,28 +4241,7 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_ANSI,
-[
-])
-
-AC_DEFUN(KDE_CHECK_INSURE,
-[
-  AC_ARG_ENABLE(insure, [  --enable-insure             use insure++ for debugging [default=no]],
-  [
-  if test $enableval = "no"; dnl
-	then ac_use_insure="no"
-	else ac_use_insure="yes"
-   fi
-  ], [ac_use_insure="no"])
-
-  AC_MSG_CHECKING(if we will use Insure++ to debug)
-  AC_MSG_RESULT($ac_use_insure)
-  if test "$ac_use_insure" = "yes"; dnl
-       then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "????
-   fi
-])
-
-AC_DEFUN(AM_DISABLE_LIBRARIES,
+AC_DEFUN([AM_DISABLE_LIBRARIES],
 [
     AC_PROVIDE([AM_ENABLE_STATIC])
     AC_PROVIDE([AM_ENABLE_SHARED])
@@ -3622,7 +4250,7 @@ AC_DEFUN(AM_DISABLE_LIBRARIES,
 ])
 
 
-AC_DEFUN(AC_CHECK_UTMP_FILE,
+AC_DEFUN([AC_CHECK_UTMP_FILE],
 [
     AC_MSG_CHECKING([for utmp file])
 
@@ -3655,7 +4283,7 @@ AC_DEFUN(AC_CHECK_UTMP_FILE,
 ])
 
 
-AC_DEFUN(KDE_CREATE_SUBDIRSLIST,
+AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
 [
 
 DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
@@ -3670,9 +4298,10 @@ if test ! -s $srcdir/subdirs; then
   done
 fi
 
+ac_topsubdirs=
 if test -s $srcdir/inst-apps; then
   ac_topsubdirs="`cat $srcdir/inst-apps`"
-else
+elif test -s $srcdir/subdirs; then
   ac_topsubdirs="`cat $srcdir/subdirs`"
 fi
 
@@ -3689,15 +4318,19 @@ for i in $ac_topsubdirs; do
     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_DEFUN([KDE_CHECK_NAMESPACES],
 [
 AC_MSG_CHECKING(whether C++ compiler supports namespaces)
 AC_LANG_SAVE
@@ -3723,22 +4356,15 @@ AC_MSG_RESULT(no)
 AC_LANG_RESTORE
 ])
 
-AC_DEFUN(KDE_CHECK_NEWLIBS,
-[
-
-])
-
 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_DEFUN([AC_CHECK_S_ISSOCK],
 [
 AC_MSG_CHECKING(for S_ISSOCK)
 AC_CACHE_VAL(ac_cv_have_s_issock,
 [
-AC_LANG_SAVE
-AC_LANG_C
 AC_TRY_LINK(
 [
 #include <sys/stat.h>
@@ -3749,24 +4375,31 @@ int b = S_ISSOCK( buff.st_mode );
 ],
 ac_cv_have_s_issock=yes,
 ac_cv_have_s_issock=no)
-AC_LANG_RESTORE
 ])
 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_DEFUN([AC_CHECK_KDEMAXPATHLEN],
 [
 AC_MSG_CHECKING(for MAXPATHLEN)
 AC_CACHE_VAL(ac_cv_maxpathlen,
 [
-AC_LANG_C
 cat > conftest.$ac_ext <<EOF
 #ifdef STDC_HEADERS
 # include <stdlib.h>
@@ -3796,67 +4429,37 @@ AC_MSG_RESULT($ac_cv_maxpathlen)
 AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
 ])
 
-dnl -------------------------------------------------------------------------
-dnl See if the compiler supports a template repository         bero@redhat.de
-dnl -------------------------------------------------------------------------
-AC_DEFUN(KDE_COMPILER_REPO,
-[
-  REPO=""
-  NOREPO=""
-
-  KDE_CHECK_COMPILER_FLAG(frepo,
-   [
-     REPO="-frepo"
-     NOREPO="-fno-repo"
-   ])
-
-  if test -z "$REPO"; then
-  KDE_CHECK_COMPILER_FLAG(instances=explicit,
-  [
-     REPO="-instances=explicit"
-     NOREPO="-instances=extern"
-  ])
-  fi
-
-  if test -n "$REPO"; then
-     AC_DEFINE_UNQUOTED(HAVE_TEMPLATE_REPOSITORY, 1,
-		[C++ compiler supports template repository])
-     $1
-  fi
-
-  AC_SUBST(REPO)
-  AC_SUBST(NOREPO)
-])
-
-AC_DEFUN(KDE_CHECK_HEADER,
+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)
+   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
    CPPFLAGS=$kde_safe_cppflags
    AC_LANG_RESTORE
 ])
 
-AC_DEFUN(KDE_CHECK_QWSPRITEFIELD,
+AC_DEFUN([KDE_CHECK_HEADERS],
 [
-  KDE_CHECK_HEADER(QwSpriteField.h, ,
-  [
-    AC_MSG_WARN([you don't have QwSpriteField.h somewhere. Please install
-       QwSpriteField out of kdesupport.])
-      $1
-  ])
+   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,
+AC_DEFUN([KDE_FAST_CONFIGURE],
 [
   dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, [  --disable-fast-perl     disable fast Makefile generation (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,
+AC_DEFUN([KDE_CONF_FILES],
 [
   val=
   if test -f $srcdir/configure.files ; then
@@ -3871,7 +4474,7 @@ AC_DEFUN(KDE_CONF_FILES,
   AC_SUBST(CONF_FILES)
 ])dnl
 
-AC_DEFUN(KDE_SET_PREFIX,
+AC_DEFUN([KDE_SET_PREFIX],
 [
   unset CDPATH
   dnl make $KDEDIR the default for the installation
@@ -3879,8 +4482,11 @@ AC_DEFUN(KDE_SET_PREFIX,
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
-    ac_configure_args="$ac_configure_args --prefix $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
 ])
@@ -3951,7 +4557,7 @@ pushdef([AC_PROG_INSTALL],
   fi
 ])dnl
 
-AC_DEFUN(KDE_LANG_CPLUSPLUS,
+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])
@@ -3962,7 +4568,7 @@ pushdef([AC_LANG_CPLUSPLUS],
 KDE_LANG_CPLUSPLUS
 ])
 
-AC_DEFUN(KDE_CHECK_LONG_LONG,
+AC_DEFUN([KDE_CHECK_LONG_LONG],
 [
 AC_MSG_CHECKING(for long long)
 AC_CACHE_VAL(kde_cv_c_long_long,
@@ -3974,6 +4580,7 @@ AC_CACHE_VAL(kde_cv_c_long_long,
   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
@@ -3981,177 +4588,798 @@ if test "$kde_cv_c_long_long" = yes; then
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_LIB,
+AC_DEFUN([KDE_CHECK_LIB],
 [
+     kde_save_LDFLAGS="$LDFLAGS"
+     dnl AC_CHECK_LIB modifies LIBS, so save it here
      kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries"
+     LDFLAGS="$LDFLAGS $all_libraries"
      case $host_os in
-      aix*) LIBS="-brtl $LIBS"
-	test "$GCC" = yes && LIBS="-Wl,$LIBS"
+      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_CHECK_INITGROUPS,
-[ 
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS(initgroups)
-  if test "x$ac_cv_func_initgroups" = "xyes"; then
-    case $host_os in
-      aix*) AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-            AC_MSG_CHECKING([for initgroups prototype])
-            AC_CACHE_VAL(kde_cv_check_initgroups_proto,
-            [ AC_TRY_COMPILE(
-              [ #include <grp.h>
-              ],
-              [ char buffer[10];
-                gid_t id;
-                int x = initgroups(buffer,id);
-              ],
-              kde_cv_check_initgroups_proto=yes,
-              kde_cv_check_initgroups_proto=no)
-            ])
-            AC_MSG_RESULT($kde_cv_check_initgroups_proto)
-            AC_LANG_RESTORE
-            ;;
-      *)
-            kde_cv_check_initgroups_proto=yes
-            ;;
-    esac
-  else
-    kde_cv_check_initgroups_proto=no
-  fi
-  if test "x$kde_cv_check_initgroups_proto" = "xyes"; then
-    kde_check_initgroups_proto=1
-  else
-    kde_check_initgroups_proto=0
-  fi
-  AC_DEFINE_UNQUOTED(HAVE_INITGROUPS_PROTO,$kde_check_initgroups_proto,
-           [initgroups may exist but not its prototype (e.g. AIX<4.3.3:8)])
+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
 ])
 
-
-AC_DEFUN(KDE_CHECK_JAVA_DIR,
+dnl KDE_CHEC_JAVA_DIR(onlyjre)
+AC_DEFUN([KDE_CHECK_JAVA_DIR],
 [
-AC_MSG_CHECKING([for Java directory])
 
 AC_ARG_WITH(java,
-[  --with-java=javadir     use java installed in javadir, --without-java disables ],
+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_cv_java_bindir=no
-   kde_cv_java_includedir=no
-   kde_cv_java_libjvmdir=no
-   kde_cv_java_libhpidir=no
+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 -> look in $PATH
-    AC_CACHE_VAL(kde_cv_java_bindir,
-    [
-      dnl First look for javac in $PATH. If not found we'll look at the option.
-      KDE_FIND_PATH(javac, JAVAC, [], [])
+  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
-          kde_cv_java_bindir=`echo $JAVAC | sed -e 's,/javac$,/,'`
           dnl this substitution might not work - well, we test for jni.h below
-          kde_cv_java_includedir=`echo $kde_cv_java_bindir | sed -e 's,bin/$,include/,'`
+          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
       else
-          kde_cv_java_bindir=no
+          kde_java_includedir=no
       fi
-    ])
   else
     dnl config option set
-    kde_cv_java_bindir=$ac_java_dir/bin
-    kde_cv_java_includedir=$ac_java_dir/include
+    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 Look for libjvm.so
-kde_cv_java_libjvmdir=`find $kde_cv_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-dnl Look for libhpi.so and avoid green threads
-kde_cv_java_libhpidir=`find $kde_cv_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,'`
+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 At this point kde_cv_java_bindir and kde_cv_java_includedir are either set or "no"
-if test ! "x$kde_cv_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_cv_java_bindir/javac"; then
-    AC_MSG_ERROR([javac not found under $kde_cv_java_bindir - it seems you passed a wrong --with-java.])
+  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_cv_java_bindir/javah"; then
-    AC_MSG_ERROR([javah not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
+
+  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 ! -x "$kde_cv_java_bindir/jar"; then
-    AC_MSG_ERROR([jar not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
+
+  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
-  if test ! -r "$kde_cv_java_includedir/jni.h"; then
-    AC_MSG_ERROR([jni.h not found under $kde_cv_java_includedir. Use --with-java or --without-java.])
+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
-  if test ! -r "$kde_cv_java_libjvmdir/libjvm.so"; then
-    AC_MSG_ERROR([libjvm.so not found under $kde_cv_java_libjvmdir. Use --without-java.])
+
+  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
-  if test ! -r "$kde_cv_java_libhpidir/libhpi.so"; then
-    AC_MSG_ERROR([libhpi.so not found under $kde_cv_java_libhpidir. Use --without-java.])
+
+  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
 
-  jni_includes="-I$kde_cv_java_includedir"
-  dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-  dnl and under linux here..
-  test -d "$kde_cv_java_includedir/linux" && jni_includes="$jni_includes -I$kde_cv_java_includedir/linux"
-  test -d "$kde_cv_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_cv_java_includedir/genunix"
+  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
 
-  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
-	    ],[ 
-	    ],[ AC_MSG_ERROR([Incorrect version of $kde_cv_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 ])
-	    ])
+  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"
 
-  CXXFLAGS="$ac_cxxflags_safe"    
   AC_LANG_RESTORE
 
-  dnl All tests ok, inform and subst the variables
-  AC_MSG_RESULT([javac/javah/jar in $kde_cv_java_bindir, jni.h in $kde_cv_java_includedir])
+  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])
 
-  JAVAC=$kde_cv_java_bindir/javac
-  AC_SUBST(JAVAC)
-  JAVAH=$kde_cv_java_bindir/javah
-  AC_SUBST(JAVAH)
-  JAR=$kde_cv_java_bindir/jar
-  AC_SUBST(JAR)
-  AC_SUBST(jni_includes)
-  JVMLIBS="-L$kde_cv_java_libjvmdir -ljvm -L$kde_cv_java_libhpidir -lhpi"
-  AC_SUBST(JVMLIBS)
+  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 46 AC_PROG_LIBTOOL
+# 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
@@ -4159,6 +5387,11 @@ 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.
@@ -4167,55 +5400,43 @@ 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_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
 
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
 AC_SUBST(LIBTOOL)dnl
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
 
+# AC_LIBTOOL_SETUP
+# ----------------
 AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
+[AC_PREREQ(2.50)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
@@ -4225,6 +5446,7 @@ 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!
@@ -4232,6 +5454,95 @@ 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*)
@@ -4241,38 +5552,271 @@ file_magic*)
   ;;
 esac
 
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
+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
 
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+
+# _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"
@@ -4284,6 +5828,51 @@ case $host in
       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*
   ;;
@@ -4293,185 +5882,1347 @@ case $host in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
+    [AC_LANG_PUSH(C)
      AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+     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
   ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+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)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
   ])
 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"
 ])
 
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+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
+    ;;
 
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+  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;
+    ;;
 
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
+  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
-  done
-  IFS="$ac_save_ifs"
+
+    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
   ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
 
-# 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)])
+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
+  ;;
 
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
 *)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
+  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="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
+  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_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_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
 
 
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
+# AC_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,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
+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_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_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
+
+# AC_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)])
+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_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognise shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
+[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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+*)
+  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"
@@ -4481,7 +7232,7 @@ dnl not every word.  This closes a longstanding sh security hole.
 	  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
+	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
 	    cat <<EOF 1>&2
@@ -4502,8 +7253,8 @@ EOF
       break
     fi
   done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
 esac])
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
@@ -4512,35 +7263,41 @@ if test -n "$MAGIC_CMD"; then
 else
   AC_MSG_RESULT(no)
 fi
-])
+])# AC_PATH_TOOL_PREFIX
 
 
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognise a shared library
 AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+[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)
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
   else
     MAGIC_CMD=:
   fi
 fi
-])
+])# AC_PATH_MAGIC
 
 
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
 AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+[AC_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 GCC])
+  AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -4550,12 +7307,12 @@ if test "$GCC" = yes; then
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+    [[\\/]]* | ?:[[\\/]]*)
+      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%/%"`
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -4575,22 +7332,26 @@ else
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
 	test "$with_gnu_ld" != no && break
-      else
+	;;
+      *)
 	test "$with_gnu_ld" != yes && break
-      fi
+	;;
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
@@ -4602,32 +7363,50 @@ else
 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_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[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.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
-else
+  ;;
+*)
   lt_cv_prog_gnu_ld=no
-fi])
+  ;;
+esac])
 with_gnu_ld=$lt_cv_prog_gnu_ld
-])
+])# AC_PROG_LD_GNU
 
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+
+# 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'])
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
 reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
+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
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
+[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=
@@ -4638,13 +7417,13 @@ lt_cv_deplibs_check_method='unknown'
 # `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
+# '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
-aix*)
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4653,36 +7432,39 @@ beos*)
   ;;
 
 bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
+  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*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+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'
+  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* )
+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_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.*`
       ;;
@@ -4696,15 +7478,27 @@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20*|hpux11*)
-  lt_cv_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
+hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+  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*)
+irix5* | irix6* | nonstopux*)
   case $host_os in
-  irix5*)
+  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"
     ;;
@@ -4716,7 +7510,7 @@ irix5* | irix6*)
     *) libmagic=never-match;;
     esac
     # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
     ;;
   esac
   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
@@ -4724,47 +7518,46 @@ irix5* | irix6*)
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | m68k* | arm* | mips* | hppa* | sh* )
+  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 )'] ;;
+    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='file_magic NetBSD/[a-z0-9]* demand paged shared library']
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
   fi
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
   ;;
 
-openbsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
-    i*86 )
-      changequote(,)dnl
-      lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
-      changequote([, ])dnl
-      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
+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
   ;;
 
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  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*)
@@ -4785,83 +7578,113 @@ solaris*)
 
 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
     ;;
-  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*`
+  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 path to a BSD-compatible name lister
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
 AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
       # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
 	lt_cv_path_NM="$tmp_nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
+	  break
+	  ;;
+	*)
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
+	  ;;
+	esac
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
 NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
+])# AC_PROG_NM
+
 
-# AC_CHECK_LIBM - check for math library
+# AC_CHECK_LIBM
+# -------------
+# check for math library
 AC_DEFUN([AC_CHECK_LIBM],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
+*-*-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, main, LIBM="$LIBM -lm")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
   ;;
 esac
-])
+])# AC_CHECK_LIBM
 
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
+
+# 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.
@@ -4873,23 +7696,27 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
   LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL 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.
+  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, main,
+  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])
@@ -4900,85 +7727,3379 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   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
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
-    INCLTDL=
+    LTDLINCL=
   fi
-])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
 
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
 
-AC_DEFUN([_AC_LIBTOOL_CXX],
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
 AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
+_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
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
 
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
 
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_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])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
+	 [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"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
+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"
-CFLAGS="$lt_save_CFLAGS"
+])# 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
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
+# 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'
 
-dnl old names
+# 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($@)])
@@ -4987,15 +11108,80 @@ AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
 AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
 AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
+# 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)
 ])
-dnl This file was created by Joachim Ansorg <jansorg@gmx.de>
+
+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 ----------------------------------------------------------------------
@@ -5009,7 +11195,7 @@ dnl AC_MSG_CHECKING([for a Sword installation])
 
 dnl The option for the configure script
 AC_ARG_WITH(sword-dir,
-[  --with-sword-dir=DIR     Patch where Sword is being installed (default=/usr) ],
+[  --with-sword-dir=DIR     Path where Sword is being installed (default=/usr) ],
 [
   ac_sword_dir=$withval
 ],ac_sword_dir=/usr
@@ -5026,20 +11212,20 @@ 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 "$ac_static_sword" = "YES"; then
+if test "x$ac_static_sword" = "xYES"; then
 	SEARCH_LIBS="libsword.a";
 else
-	SEARCH_LIBS="libsword.a libsword.so";
+	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 "$ac_cv_sword_libdir" = "NO"; then
+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 "$ac_static_sword" = "YES"; then
+if test "x$ac_static_sword" = "xYES"; then
 	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
 else
 	LIB_SWORD="-lsword";
@@ -5049,22 +11235,20 @@ AC_SUBST(SWORD_LIBRARY_PATH)
 AC_SUBST(LIB_SWORD)
 all_libraries="$all_libraries -L$ac_cv_sword_libdir"
 
-if test "$ac_static_sword" = "YES"; then
+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 "$ac_cv_sword_incdir" = "NO"; then
+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 !
 ])
@@ -5078,8 +11262,11 @@ AC_MSG_RESULT([$ac_cv_sword_incdir])
 
 
 
-dnl -- check if Sword matches the minimum version --
-AC_MSG_CHECKING([if you have Sword $1 or later])
+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,
 [
@@ -5100,38 +11287,28 @@ LIBRARY_PATH=
 export LIBRARY_PATH
 
 cat > conftest.$ac_ext <<EOF
-#include <iostream.h>
+#include <iostream>
 #include <swversion.h>
 
+#ifdef SWORD_NAMESPACE_START
+using namespace sword;
+#endif
+
 int main(int argc, char* argv[]) {
-	if (argc != 2) {
-		cout << SWVersion::currentVersion << endl;
-	}
-	else if (argc == 2) 
-	{
-		if (SWVersion(&argv[[1]]) < SWVersion::currentVersion || SWVersion(&argv[[1]]) == SWVersion::currentVersion)
-		{
-			cout << 0 << endl;
-			return 0;
-		}
-		else	
-		{
-			cout << 1 << endl;
-			return 1; //version not recent enough
-		}
-	}
+	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`
-		eval sword_test_returncode=`./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
 
@@ -5146,16 +11323,87 @@ 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
 
-right_version="ok";
-if test $sword_test_returncode = 1;  then
-	right_version="wrong version";
+
+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;
-	
-AC_MSG_RESULT([$ac_cv_installed_sword_version])
-if test $right_version != "ok"; then
-        AC_MSG_ERROR([Your Sword installation is not recent enoought! Please
-upgrade to version $1!]);
+
+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;
 
 ])
@@ -5263,7 +11511,7 @@ fi
 if test "$ac_rpm_prefix" = "auto"; then
 AC_CACHE_VAL(RPM_PREFIX, [
 if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde2"
+	RPM_PREFIX="/opt/kde3"
 elif test "$DISTRIBUTION" = "Mandrake"; then
 	RPM_PREFIX="/usr"	
 elif test "$DISTRIBUTION" = "Red Hat"; then
@@ -5315,61 +11563,329 @@ AC_MSG_RESULT([$RPM_GROUP])
 ])
 
 
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
 
-# serial 1
 
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+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
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+# 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.
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+# 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 > conftestfile
+echo timestamp > conftest.file
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
+      set X `ls -t $srcdir/configure conftest.file`
    fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
 
       # If neither matched, then we have a broken ls.  This can happen
       # if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -5379,7 +11895,7 @@ if (
 alias in your environment])
    fi
 
-   test "[$]2" = conftestfile
+   test "$[2]" = conftest.file
    )
 then
    # Ok.
@@ -5388,54 +11904,606 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-rm -f conftest*
 AC_MSG_RESULT(yes)])
 
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
+#  -*- 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
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
-AC_SUBST($1)])
+])
 
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
+# 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
 
-# serial 1
+# 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.
 
-AC_DEFUN(AM_MAINTAINER_MODE,
+# 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,
@@ -5443,23 +12511,12 @@ AC_DEFUN(AM_MAINTAINER_MODE,
                           (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)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
   AC_SUBST(MAINT)dnl
 ]
 )
 
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
diff --git a/admin/ChangeLog b/admin/ChangeLog
deleted file mode 100644
index 20e979b..0000000
--- a/admin/ChangeLog
+++ /dev/null
@@ -1,748 +0,0 @@
-2000-11-30  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: Added kde_moduledir which points to $prefix/lib/kde2/
-
-2000-07-24  Alex Zepeda  <jazepeda@pacbell.net>
-
-	* acinclude.m4.in: Remove the test for malloc.h
-
-2000-04-05  Michael Matz  <matz@ifh.de>
-
-        * config.pl : added kludge for compiling regexp's even if
-	perl < 5.005 is installed
-	* conf.change.pl : added support for autoconf 2.14.1
-
-2000-03-27  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in, Makefile.common: changed inst-apps semantics
-	If present, only the subdirs it lists will be configured and compiled.
-	If absent, then subdirs is used (and inst-apps isn't generated anymore)
-
-2000-03-22  David Faure  <faure@kde.org>
-
-	* am_edit: Added support for KDE_ICON = AUTO
-
-2000-03-18  David Faure  <faure@kde.org>
-
-	* Makefile.common: Rewrote the list-of-Makefiles generation to make it
-	simpler and nicer, using create_makefiles' way of doing it.
-	Added support for COMPILE_LAST and COMPILE_FIRST in toplevel Makefile.am
-
-2000-01-05  David Faure  <faure@kde.org>
-
-	* Makefile.common: hacked around autoconf bug (setting INSTALL to ".."
-	when calling a subconfigure and INSTALL is already set).
-
-1999-12-15  Waldo Bastian  <bastian@kde.org>
-
-        * acinclude.m4.in: Test whether Qt compiles AND LINKS without flags.
-
-1999-06-24  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: generate correct Makefile entries for kde-i18n toplevel directories
-	* am_edit:
-
-1999-06-14  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: remove idl generated files on make clean
-
-1999-06-09  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: skipping programs with variables in sources for final
-
-1999-06-07  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: added support for idl files
-
-1999-06-02  Stephan Kulow  <coolo@kde.org>
-
-	* Makefile.common: preserve comments in .pot files to make it
-		possible for programmers and translators to comment them
-
-1999-06-02  Simon Hausmann <hausmann@kde.org>
-
-        * acinclude.m4.in: added kde_servicetypesdir
-
-1999-06-02  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: removed LIB_KFM and LIB_KDEUTIL aliases
-
-1999-05-28  Simon Hausmann <hausmann@kde.org>
-
-	* acinclude.m4.in: added kde_servicesdir
-
-1999-05-27  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: lots of changes for better support of --enable-final
-
-1999-05-22  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added support for --with-dmalloc
-
-1999-05-19  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added support for --enable-final
-
-	* am_edit: added support for --enable-final
-	
-1999-05-06  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: change the meaning of --disable-debug
-
-1999-05-04  Helge Deller <deller@gmx.de>
-
-	* acinclude.m4.in: the test for the X-includes/directories failed,
-	when compile & link work without special directories (as on HP-UX).
-
-1999-04-20  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: adding DESTDIR replacement for rm and uninstall-local
-	too. Seems very useless, but makes testing for uninstall easier
-
-1999-04-01  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: Added -lkfile to $(LIB_KIO)
-
-1999-03-30  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: Added AC_CHECK_KDEMAXPATHLEN, which defines KDEMAXPATHLEN.
-
-1999-03-29  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added LIB_X11 to XPMLIB and GLLIB, because
-	on SCO, they need it _after_ themselves.
-
-1999-03-28  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added LIB_KFM to LIB_KAB alias
-
-1999-03-26  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: made LIB_KFILE use LIB_KIO instead of LIB_KFM
-	added LIB_KFORMULA
-
-1999-03-20  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: check for libXext - for Russel :)
-
-1999-03-16  Stephan Kulow  <coolo@kde.org>
-
-	* acinclud3.m4.in: extend the MICO test with a list of possible
-	places where to find CORBA.h
-
-1999-03-15  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: move $QTINC and $QTLIB in search path
-
-1999-03-14  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: install-root is obsolute. Use DESTDIR always
-
-1999-03-03  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixing a bug, that $QTDIR was taken before --with-qt*
-	* acinclude.m4.in: added KDE_USE_QT, that you can choose if to
-	use QT 2.0 or KDE 1.0
-	
-	* Makefile.common: added target package-merge
-
-	* am_edit: many fixes to the POFILES handeling of am_edit
-
-1999-03-02  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: first look at libjpeg6b (from kdesupport) then
-	for libjpeg
-
-	* config.*, libtool.*: update to the latest FSF tools
-
-1999-02-23  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: error when Sparc CC is used. Better use it in
-	configure and tell him the story then letting him find it while
-	compiling
-
-	* acinclude.m4.in: adding KDE_CHECK_EXTRA_LIBS to all possible tests,
-	so that --with-extra-includes is used when needed.
-
-	* acinclude.m4.in: configure looks for giflib30, so it should say so
-
-	* acinclude.m4.in: don't overwrite x include parameters. Patch by
-	Ari Lemmke <ari.lemmke@regex.fi> (bug report 741)
-	
-1999-02-20  Stephan Kulow <coolo@kde.org>
-
-	* acinclude.m4.in: fixing KDE_CHECK_PATHS for rechecking. In case
-	of defaults (kdelibs) configure didn't cache the results
-
-1999-02-18  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added AC_CHECK_S_ISSOCK, to fix #706.
-
-1999-02-17  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added AC_CHECK_RANDOM, just like
-	AC_CHECK_USLEEP, to enable the fake if necessary.
-
-1999-02-13  Kurt Granroth <granroth@kde.org>
-
-        * acinclude.m4.in: look for QT-2.0
-
-1999-02-05  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: in macro KDE_FIND_PATH treat user given dirs
-	and $PATH dirs the same. Added seperate test for to find binary
-	($5) to replace findperl
-
-1999-01-28  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added patch by jbb to be a little bit more precise about
-	the number of sourcefiles that include the moc file if it's != 1.
-	Besides that automoc will fail with exit code, so the Makefile.cvs
-	process does stop in case a problem accoured.
-
-	* automoc: don't hardcode header suffix, but allow *.h, *.hh and *.H
-	
-1999-01-27  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: try qobjcoll.h and qapplication.h before saying
-	OK to qt headers. (I could kill SuSE for splitting into qt-dev
-	and qt-compat)
-
-1991-01-23  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added fixes by JB <jb.nz@writeme.com>
-
-1999-01-21  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added --help and --path (for use in dist-hook)
-
-1999-01-20  Alex Zepeda  <garbanzo@hooked.net>
-	
-	* ltconfig: added entries for FreeBSD 4.x
-
-1999-01-19  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added a distclean-metasources target which deletes all
-	moc files and let distclean depend on it
-
-1999-01-18  Stephan Kulow  <coolo@kde.org>
-
-        * automoc: several fixes (ignore comment lines + join lines
-         with \ )
-	
-	* automoc: support META_INCLUDES in case the header files are
-	not in the same dir as the sources.
-
-1999-01-17  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: several fixes.
-
-1999-01-16  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added support for included MOC files.
-
-	* acinclude.m4.in: use srcdir for the subdirs stuff as well
-
-	* automoc: added better command line parsing and some preparation
-	for handling "normal" moc files
-
-	* acinclude.m4.in: added aliases for libkio and libkdeutil
-
-1999-01-15  Harri Porten  <porten@kde.org>
-
-	* automoc: Carved in stone syntax for Makefile.in:
-	{program}_METASOURCES = USE_AUTOMOC [{suffix}]
-
-1999-01-15  Stephan Kulow  <coolo@kde.org>
-
-	* Makefile.common: set top_srcdir to .
-
-1999-01-14  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't use config.h.bot any longer
-
-1999-01-08  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added KDE_CHECK_NEWLIBS
-
-	* acinclude.m4.in: test for Qt even if both --with-qt-headers and
-	--with-qt-libraries are given. They may be wrong.
-	
-1999-01-06  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: change the MOC test so it can be used for other
-	tools as well
-
-1998-12-28  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: look for QT-1.42 since kpanel needs it
-
-1998-12-27  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added /usr/lib for libpython test
-	
-	* acinclude.m4.in: take my email address out of it and added a
-	reference to www.kde.org/faq
-
-	* acinclude.m4.in: use Qt >= 1.4
-
-	* acinclude.m4.in: added KDE_CHECK_NAMESPACES
-	
-1998-12-18  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: test for directories to exist before saying yes
-	to compilation :)
-
-1998-12-14  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added CPLUSPLUS for the kimgio test. It's
-	only important for shaman right now, but at least there it is :)
-
-1998-12-12  Stephan Kulow  <coolo@kde.org>
-
-	* Makefile.cvs: added common Makefile.cvs
-
-	* acinclude.m4.in: Thomas.Schwarz@pro-sieben.de reported a very ugly
-	bug in AC_PROG_CXXCPP, so I added my own version
-	
-	* acinclude.m4.in: added KDE_CREATE_SUBDIRS_LIST to simplify
-	most toplevel configures
-
-1998-12-11  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added call to AC_PROG_CXXCPP. Not really sure why
-	it never caused problems
-
-	* acinclude.m4.in: moved LIBTIFF alias
-
-	* acinclude.m4.in: only test for the existance of libkimgio if the
-	user wants to. For 99% of the applications it doesn't matter if
-	configure can find libkimgio :)
-	
-1998-12-10  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: some changes to the python check to handle $LIBDL
-
-1998-12-09  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: make Alex's tiff test a real one
-	
-	* acinclude.m4.in: fix the LIB_TIFF alias to really expand
-
-1998-12-08  Alex Zepeda  <garbanzo@hooked.net>
-
-	* acinclude.m4.in: Fix tiff test to use libtiff34 if it exists.
-	This is what the FreeBSD port installs to for whatever reason.
-
-	* acinclude.m4.in: s/kde/KDE/ (at least in some of the
-	descriptions, obviously no variable names were touched.
-
-1998-12-08  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: moved the LIB_QT alias to the Qt check
-	
-	* acinclude.m4.in: unset KDEDIR before running conftest
-	
-	* acinclude.m4.in: fixed mean typo
-	
-	* acinclude.m4.in: added the copyright header for the gettext
-	tests, so that people know we're legal ;)
-
-	* acinclude.m4.in: set language to C++ before testing QIMGIO	
-
-1998-12-07  Alex Zepeda  <garbanzo@hooked.net>
-
-	* acinclude.m4.in: Fix PNG test to use correct ANSI C code, and
-	not trip up gcc.
-
-1998-12-07  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't hardcode -ldl
-	
-	* acinclude.m4.in: move the LIB_X11 alias to the X test to make it
-	useful for kdesupport as well
-	
-	* acinclude.m4.in: give the word CHECK_KIMGIO a meaning in really
-	checking for it
-
-	* acinclude.m4.in: simple fix to prevent kimgio test from compiling
-	KDE application in kdelibs
-
-1998-12-05  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: let KDE_CHECK_KIMGIO depend on AC_PATH_KDE,
-	otherwise most tests fail. It didn't mean anything to 90% of the
-	packages since they test for KDE before kimgio, but for shaman
-	it does
-
-	* ltconfig: the real fix for the Solaris && gcc problem.
-	Thanks Kurt for reporting it and Alexandre for fixing it :)
-
-1998-12-04  Stephan Kulow  <coolo@kde.org>
-
-	* libtool.*: update again
-
-	* acinclude.m4.in: changed the function to test for libnsl to
-	inet_ntoa since UnixWare 7's version did not have gethostbyname,
-	but needs libnsl
-
-1998-12-02  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixed the MOC test (again) to use the PATH variable
-	correctly (with the correct seperator)
-
-	* config.guess: update from the soon to be released autoconf-2.13
-
-1998-12-01  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixes for the MOC test. Use PATH now when found
-
-1998-11-30  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: extended the MOC test. It checks now for the
-	first line of the output of "moc --help" and looks for Qt in it.
-
-1998-11-27  Stephan Kulow  <coolo@kde.org>
-
-	* ltconfig: another libtool update. Fixes an ugly bug on Solaris,
-	when GNU ld is in path before Solaris ld, but gcc uses the later
-
-1998-11-26  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: made the Qt test more advance to check for qt
-	1.41 - I still need to make it better, but there shouldn't be too
-	many qt releases in a row, would there? ;)
-
-	* ltconfig: libtool update with better BSD/OS support
-
-1998-11-22  Stephan Kulow  <coolo@kde.org>
-
-	* ltconfig: cool - libtool uses g++ now to link libraries on Solaris.
-	This means, static objects become usuable on that plattforms (some
-	others as well).
-
-1998-11-20  Stephan Kulow  <coolo@kde.org>
-
-	* ltmain.sh: updated libtool from their CVS - fixes bugs we haven't
-	found and adds some more features, that we do not need ;-)
-
-1998-11-19  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added AC_CHECK_UTMP_FILE, taken from kdebase
-
-1998-11-16  Harri Porten  <porten@kde.org>
-
-	* automoc: take care of "ar" object files, too.
-
-1998-11-16  Stephan Kulow  <coolo@kde.org>
-
-	* libtool.m4.in: revised my --silent patch. The solution
-	Alexandre suggested is much better.
-
-1998-11-15  Stephan Kulow  <coolo@kde.org>
-
-	* ltconfig.in: done some tweakings to support -export-dynamic
-	with egcs
-
-	* config.sub: wow - BeOS support :)
-
-1998-11-14  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't use rpath for test program, if rpath is
-	disabled for applications
-
-	* ltconfig: patched libtool to make it silent without making
-	ltconfig silent
-
-	* acinclude.m4.in: make libtool silent again
-
-	* libtool.m4.in: update to libtool-981114 (untested stuff, but
-	we have to test it to make it tested - sounds that logical? :-)
-
-	* libtool.m4.in: moved the self stricked libtool tests to "our"
-	file.
-
-	* acinclude.m4.in: moved ChangeLog of kdebase which I used to
-	maintain acinclude.m4.in logs to kde-common/admin. Hopefully I
-	will maintain it more often from now on :)
-
-1998-07-27  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixed some things in the MOC test
-
-	* acinclude.m4.in: fixed this damn msgfmt test
-
-1998-06-02  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: ignore msgfmt, if not GNU gettext
-
-1998-05-28  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixed KDE_CHECK_STL. Checks for HP and SGI type
-
-	* acinclude.m4.in: embraced every variable with "" to make
-	it consistent
-
-	* acinclude.m4.in: various fixes for the koffice checks
-	(mico, ministl and python)
-
-1998-05-16  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't use KDE_CHECK_QT_DIRECT, when
-	--with-qt-libs are given
-
-1998-04-21  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: cool, I found the trick to suppress the ls
-	errors
-
-1998-04-20  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: rewrote the qt checking test, since it
-	didn't work under FreeBSD, since it relied on the .so link.
-	The new version is a little bit buggy, but I need some testing
-	to make it perfect
-
-	* acinclude.m4.in: fixed the side effects of the PAM test
-
-1998-04-18  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: hopefully fixed the PAM test (I rewrote it)
-
-1998-04-16  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: extended the getsockname test inspired
-	by a patch by Martin Baulig
-
-	* configure.in: added test for utmp file
-
-	* acinclude.m4.in: made --without-pam default
-	
-
-1998-04-06  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't test compiling, linking, running in
-	one step. This proved to be too dangerous for my mail box.
-	
-1998-03-21  Stephan Kulow  <coolo@kde.org>
-
-	* libtool.m4.in: created some new macros to work around this
-	ugly (because long) help of configure --enable-shared/static
-
-1998-03-05  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: set language to C++ before trying the ksize_t
-	test
-
-	* configure.in: sorted the Makefile entries alphabeticly (and all
-	together: we love xemacs! we love xemacs! ;)
-	
-	* configure.in: added sk
-
-	* acinclude.m4.in: substitute x_libraries to fix the empty -rpath
-	
-1998-03-03  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: add a rpath for every shared library, that is
-	linked too (especially X11 libraries)
-	
-Tue Feb 24 22:04:59 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added kde_sounddir and set kde_minidir to
-	kde_icondir/mini to break not too much
-
-Sun Feb 15 18:25:50 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: added bugfix by Bob Miller <kbob@engr.sgi.com>
-	(correct reset of IFS)
-	
-Wed Feb 11 00:53:11 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: made shadow under Linux default, since the
-	binaries will work also under non-shadow systems. The only problem
-	left is PAM, so I disabled shadow in case, PAM is present
-
-Tue Feb 10 16:46:32 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: added test for nice to find out, if the option
-	-nice works for the screensavers
-
-	* acinclude.m4.in: port to LynxOS. For this I moved all library
-	search routines in KDE_MISC_TESTS, so I don't need to write this
-	in every package
-
-	* README: some grammar fixes
-
-	* acinclude.m4.in: search for the libs in the exec_prefix, when
-	it's present
-	
-Sun Feb  8 14:07:23 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: updated all packages
-
-	* libtool.m4.in: applied patch for libtool.m4.in to show the
-	correct default for shared and static
-	
-
-Sat Feb  7 10:56:00 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: good news - KDE is relocatable again.
-
-	* libtool.m4.in: updated to latest libtool 1.0i
-
-Fri Feb  6 21:26:51 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added a AC_PROVIDE for AC_PROG_CC and
-	AC_PROG_CPP to KDE_CHECK_COMPILERS
-
-Thu Feb  5 16:27:47 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: put $QTDIR/bin before /usr/bin in the path to
-	look for moc. I don't know why, but I got a report, that configure
-	found /usr/bin/moc under Solaris
-
-Fri Jan 30 15:47:50 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: export LIBRARY_PATH after reset to the saved
-	value
-	
-	* acinclude.m4.in: unset the LIBRARY_PATH to get a relieable
-	result when trying to find, if Qt compiles without -L
-
-Sat Jan 24 00:45:52 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixed another bug in AC_PATH_KDE
-
-Thu Jan 22 14:46:15 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: fixed an ugly bug in AC_BASE_PATH_KDE
-
-	* kappfinder/kappfinder.in: let kappfinder create by configure to
-	allow the use of the kde_ paths
-
-Wed Jan 21 22:19:35 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: - added a install_root prefix to all paths, if
-	set, to enable package managers to move the whole installation at once
-	- added --with-install-root to set the install_root prefix
-
-Tue Jan 20 22:41:04 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: added NOOPT_CXXFLAGS to allow kioslave to be
-	compiled without -O2
-
-Mon Jan 19 21:55:21 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: some little fixes for the Makefiles
-
-	* acinclude.m4.in: --prefix will no longer override the search for
-	libraries. If they are present somewhere, they are used (through
-	the methodes in KApplication)
-
-Mon Jan 12 00:30:36 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in fixed an ugly bug, that accoured, when
-	qt_libraries is not set (empty/equals X11/not necessary)
-	
-	* acinclude.m4.in moved the remove of the files after the error
-	detection
-	
-
-Sun Jan 11 17:27:53 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in added a new macro KDE_CHECK_QT_DIRECT to unset
-	the Qt library path, if a Qt program compiles without them
-		
-	* acinclude.m4.in added a return value in the CREATE_KFSSTND
-	macro. Perhaps this has caused the problems
-
-Sat Jan 10 17:40:44 1998  Stephan Kulow  <coolo@kde.org>
-
-	* ChangeLog started to maintain a ChangeLog file again
-	* acinclude.m4.in the AC_CREATE_KFSSTND to get better debug output
-	to find the problem
-	
-
-Old logs, Stephan Kulow made:
-	
-0.1 : first steps with libkde
-0.2 : first release with libkde, khtmlw, kdehelp, acli, kwm, kpanel
-0.3 : added kfm and bugfixes
-0.4 : updated khtmlw, kdehelp, kwm, changed install in all subdirs
-0.5 : support libtool (chooseable shared libs)
-0.6 : split libkde in kdecore and kdeui
-0.6.1 : Bugfixes
-0.7 : added code from Janos Farkas (configure)
-    : added @{kde,qt}_{includes,libraries}@
-0.7.1: Bugfixes
-0.7.2: Bugfixes
-0.7.3: added @all_includes@ and @all_libraries@
-       replaced all incompatible flags like $(CC) and -DHAVE_UNISTD_H
-0.7.4: changed support for libkde (back in it's own)
-       added kpat
-       updated kpanel, kwm, kghostview
-0.8: removed a bug in kghostview
-	lifted installation process of several apps
-	splitt kdebase into kdelibs and kdeapps	
-	updated khtmlw, kfm and kdehelp
-	added kcalc and kpaint
-	updated kdisplay
-	added kscreensaver
-	added --enable-kscreensaver
-	added --enable-debug (and @CXXFLAGS@ to all Makefile.ins)
-	updated kwm to 0.4.7
-	added make uninstall to every app
-	added kvt
-	added khexdit
-	added .kdelnk for kmines, kedit, ktetris
-	put kwm, kfind's .kdelnk in the right directories
-	replaced --enable-kscreensaver by --disable-kscreensaver
-	updated kpanel to 0.15
-	some bugfixes (thanks Marco)
-	some bugfixes (thanks Martin)
-	changed acinclude.m4, because aclocal won't
-	updated kwm to 0.4.8 (patched it again for Qt-1.2)
-	updated kvt to 0.13 (patch from Matthias)
-	patched kvt and kwm
-	updated kwm to 0.5.0
-	updated kvt for 0.14 (again and again :-)
-	updated kview to 0.10
-	updated kfm to 0.6.3
- 	patched kscreensaver for FreeBSD (thanks Marc)
-0.9: updated kdisplay to 0.5.3
-	added klogout
-	patches from Matthias
-	updated kfm to 0.6.4
-	updated kghostview to 0.4
-	added QTINC and QTLIB
-	updated kdehelp to 0.4.11
-	patched kfm to support ktoolbar
-	updated kedit to kedit+
-	added kfontmanager 0.2.1
-0.9.1: changed kpaint's make style
-	bugfixing
-	updated kmines to 0.6.5
-	updated ktetris to 0.2.4
-	changed to Makefiles to depend on Makefile.in
-	changed the Makefiles to let install depend on all
-	added kjots-0.2.2
-	updated kjots-0.2.3
-	updated kfm to 0.6.6
-	updated kjots-0.2.4
-	updated kpaint-0.2
-	updated kedit to 0.5
-	updated kfontmanager to 0.2.2
-	updated kfm to 0.6.7
-	updated ktetris to 0.2.5
-	updated kjots to 0.2.5
-0.10: added HAVE_SQRTL
-	added HAVE_CRYPT_H
-	updated kfind
-	updated kfm to kfm-0.8.1
-	re-introduced automake to kdebase
-	bugfixes for the configure.in
-	added XPM, GL and PAM tests to configure
-	added morph3d to kscreensavers
-	updated kfind to 0.3.2
-	added some patches for SGI
-... lost the time to maintain a Changelog ;)
diff --git a/admin/Makefile.am b/admin/Makefile.am
deleted file mode 100644
index 1023a46..0000000
--- a/admin/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST=ChangeLog Makefile.common acinclude.m4.in am_edit am_edit.py conf.change.pl config.guess config.pl config.sub configure.in.min debianrules depcomp install-sh libtool.m4.in ltcf-c.sh ltcf-cxx.sh ltconfig ltmain.sh missing mkinstalldirs ylwrap
-
diff --git a/admin/Makefile.common b/admin/Makefile.common
index beec064..0ecd10d 100644
--- a/admin/Makefile.common
+++ b/admin/Makefile.common
@@ -1,295 +1,35 @@
+### Makefile.common
+###
+### Copyright (C) 2002 by the KDE developers
 
-SHELL=/bin/sh
-
-cvs:
-	@if grep '$$(top_srcdir)/acinclude.m4:' Makefile.am >/dev/null; then \
-	  echo "*** Creating acinclude.m4" ;\
-	  rm -f acinclude.m4 configure.files ;\
-	  $(MAKE) -f Makefile.am top_srcdir=. acinclude.m4 ;\
-	fi
-	@echo "!!! If you get recursion errors from autoconf, it is advisable to set the"
-	@echo "    environment variable M4 to something including \"--nesting-limit=500\""
-	@if test -r configure.in.in; then \
-	  rm -f subdirs configure.in ;\
-	  echo "*** Creating list of subdirectories" ;\
-	  $(MAKE) -f Makefile.am top_srcdir=. subdirs ;\
-	  echo "*** Creating configure.in" ;\
-	  $(MAKE) -f Makefile.am top_srcdir=. configure.in ;\
-	fi
-	@echo "*** Creating aclocal.m4"
-	@aclocal
-	@echo "*** Creating configure"
-	@autoconf
-	@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\
-	  || mv \$$CONFIG_STATUS.bak \$$CONFIG_STATUS;\
-	  \n  rm -f \$$CONFIG_STATUS.bak;\nfi\
-	  \n" if /^\s*chmod\s+.*\+x\s+.*CONFIG_STATUS/;' configure ;\
-	fi
-	@if grep '} \$$ac_kw foo' configure >/dev/null 2>&1; then perl -p -i -e "s/ac_kw foo/ac_kw int foo/" configure; fi
-#David's hack for autoconf bug when $INSTALL is set
-	@perl -pi -e 'if (/\[\/\$$\]\*. INSTALL=/) { print $$_ ; $$_ = "\"\") ;;\n"; }' configure
-	@if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then \
-	  echo "*** Creating config.h template" ;\
-		autoheader ;\
-	fi
-	@echo "*** Creating Makefile templates"
-	@automake
-	@echo "*** Postprocessing Makefile templates"
-	@perl admin/am_edit
-	@if egrep "^cvs-local:" Makefile.am >/dev/null; then \
-	  $(MAKE) -f Makefile.am cvs-local ;\
-	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"
+### All the real work is done by the shellscript cvs.sh
 
-dist:	
-	@if grep -e '$$(top_srcdir)/acinclude.m4:' Makefile.am >/dev/null; then \
-	  $(MAKE) -f Makefile.am top_srcdir=. acinclude.m4 ;\
-	fi
-	@if test -r configure.in.in; then \
-	  $(MAKE) -f Makefile.am top_srcdir=. subdirs configure.in; \
-	fi ;\
-	aclocal; \
-	autoheader; \
-	automake --foreign --include-deps; \
-	perl admin/am_edit; \
-	autoconf; \
-	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\
-	  || mv \$$CONFIG_STATUS.bak \$$CONFIG_STATUS;\
-	  \n  rm -f \$$CONFIG_STATUS.bak;\nfi\
-	  \n" if /^\s*chmod\s+.*\+x\s+.*CONFIG_STATUS/;' configure ;\
-	fi ;\
-	touch stamp-h.in; \
-	if grep -e "^cvs-local:" Makefile.am >/dev/null; then \
-	  $(MAKE) -f Makefile.am cvs-local ;\
-	fi ;\
-	if grep "ac_kw foo" configure >/dev/null 2>&1; then perl -p -i -e "s/ac_kw foo/ac_kw int foo/" configure; fi ;\
-	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 -e "^cvs-dist-local:" Makefile.am >/dev/null; then \
-	  $(MAKE) -f Makefile.am cvs-dist-local ;\
-	fi
+SHELL=/bin/sh
 
-cvs-clean:
-	@if test ! -d CVS; then \
-	  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;\
-	pwd=`pwd` ;\
-	dirs=`find . -type d | grep -v CVS | sed -e "s#^./##"` ;\
-	for i in $$dirs; do \
-	  if test ! -d "$$pwd/$$i/CVS"; then \
-	    echo "D $$i" ;\
-	    rm -rf "$$pwd/$$i"; \
-	    continue; \
-	  fi ;\
-	  cd $$pwd/$$i ;\
-	  for f in * .*; do \
-	    if test ! -d "$$f"; then \
-	      if grep "^/$$f/" CVS/Entries > /dev/null; then \
-		a="b"; \
-	      else \
-	        echo "F $$i/$$f"; \
-		rm -f "$$pwd/$$i/$$f"; \
-	      fi; \
-	    fi ; \
+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; \
-	done
-
-
-# The Makefiles have to be sorted for slashes, since configure creates
-# only one directory per Makefile not the whole hierarchy
-configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs
-	@rm -f configure.in configure.in.new ;\
-	cat `cat configure.files | egrep -v "^configure.in.bot"` >> configure.in.new ;\
-	echo "KDE_CREATE_SUBDIRSLIST" >> configure.in.new ;\
-	echo "AC_OUTPUT( \\" >> configure.in.new ;\
-	mfs=`find . -type d -print | fgrep -v "/." | sed -e "s#\./##" -e "/^debian/d" | sort`; \
-	for i in $$mfs; do \
-	  topleveldir=`echo $$i| sed -e "s#/.*##"`; \
-	  if test -f $$topleveldir/configure.in; then \
-		continue; \
-	  fi ;\
-	  if test ! -f $$i/Makefile.am; then \
-		continue; \
-	  fi ;\
-	  if test -s inst-apps; then \
-	    if test -z "`grep \"^$$topleveldir\" inst-apps`"; then \
-		continue; \
-	    fi ;\
-	  fi ;\
-	  echo "$$i/Makefile \\" >> configure.in.new ;\
-	done ;\
-	egrep '^dnl AC_OUTPUT\(.*\)' `cat configure.files` | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#\1 \\\\#" >> configure.in.new ;\
-	echo ")" >> configure.in.new
-	@modulename= ;\
-	if test -f configure.in.in; then \
-	   if head -2 configure.in.in | egrep "^#MIN_CONFIG$$" > /dev/null; then \
-	      line=`egrep "^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 "$$modulename" || test "$$modulename" = "@MODULENAME@"; then \
-	   modulename=`pwd`; modulename=`basename $$modulename`; \
-	fi ;\
-	if test -z "$$VERSION" || test "$$VERSION" = "@VERSION@"; then \
-	     VERSION="\"2.2.1\"";  \
-	fi ;\
-	sed -e "s#@MODULENAME@#$$modulename#" configure.in.new | \
-		sed -e "s#@VERSION@#$$VERSION#" > configure.in
-	@if test -f configure.in.bot ; then cat configure.in.bot >> configure.in ; fi
-	@rm -f configure.in.new
-
-configure.files: subdirs
-	@admindir=NO ;\
-	for i in . .. ../.. ../../..; do \
-	  if test -x $$i/admin; then admindir=$$i/admin; break; fi; \
-	done ;\
-	rm -rf configure.files ;\
-	if test -f configure.in.in && head -2 configure.in.in | egrep "^#MIN_CONFIG$$" > /dev/null; then \
-		echo $$admindir/configure.in.min >> configure.files  ;\
-	fi
-	@test -f configure.in.in && echo configure.in.in >> configure.files
-	@list=`find . -name "configure.in.in" | sort`; \
-	for i in $$list; do if test -f $$i && test ! `dirname $$i` = "." ; then \
-	  echo $$i >> configure.files ;\
-	fi; done
-	@if test -f configure.in.mid ; then echo configure.in.mid >> configure.files ; fi
-	@if test -f configure.in.bot ; then echo configure.in.bot >> configure.files ; fi
-
-subdirs:
-	@files=`ls -1 | sort`; \
-	dirs= ;\
-	lib_dirs= ;\
-	first_dirs= ;\
-	last_dirs= ;\
-	compilefirst=`grep '^COMPILE_FIRST[ ]*=' Makefile.am | \
-		sed -e 's#^COMPILE_FIRST[ ]*=[ ]*#|#' | sed -e 's#$$#|#' | sed -e 's# #|#g'`;\
-	compilelast=`grep '^COMPILE_LAST[ ]*=' Makefile.am | \
-		sed -e 's#^COMPILE_LAST[ ]*=[ ]*#|#' | sed -e 's#$$#|#' | sed -e 's# #|#g'`;\
-	for i in $$files; do if test -d $$i; then \
-	    if test -f $$i/Makefile.am; then \
-		if echo $$compilefirst | grep "|$$i|" >/dev/null; then \
-			first_dirs="$$first_dirs $$i" ;\
-		elif echo $$compilelast | grep "|$$i|" >/dev/null; then \
-			last_dirs="$$last_dirs $$i" ; \
-		else dirs="$$dirs $$i" ;\
-		fi ;\
-	     fi ;\
-	   fi; \
-	done ;\
-	rm -f SUBDIRS ;\
-	for i in $$dirs; do \
-	echo $$i >> ./SUBDIRS; \
-	done
-	@if test -r subdirs && diff subdirs SUBDIRS > /dev/null; then \
-	  rm -f SUBDIRS; \
-	fi
-	@test -r SUBDIRS && mv SUBDIRS subdirs || true
-
-package-merge:
-	@catalogs='$(POFILES)'; \
-	for cat in $$catalogs; do \
-	echo $$cat $$name; \
-	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 ; \
+	  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; \
-	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 ; \
-	  cp 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 > rc.cpp ;\
-	   else \
-		candidates=`ls -1 *.rc *.ui 2>/dev/null` ;\
-		if test -n "$$candidates"; then \
-		    echo "$$subdir has *.rc or *.ui 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>) { if (/^messages:/) { $$mes=1; print $$_; next; } if ($$mes) { if (/$$\\(XGETTEXT\)/ && / -o/) { s/ -o \$$\(podir\)/ _translatorinfo.cpp -o \$$\(podir\)/ } print $$_; } else { print $$_; } }' < Makefile.am > _transMakefile ;\
-	   $(MAKE) -s -f _transMakefile podir=$$podir EXTRACTRC="$$EXTRACTRC" PREPARETIPS="$$PREPARETIPS" \
-	   XGETTEXT="$${XGETTEXT:-xgettext} -C -ki18n \
-	   -kI18N_NOOP -ktranslate -kaliasLocale \
-	   -x $${includedir:-$$KDEDIR/include}/kde.pot" \
-	   messages ) >$$tmpname 2>&1 ;\
-	   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 \
-	  if test ! -f po/$$i; then echo "disappeared: $$i"; fi ;\
-	done
-	@for  i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do \
-	   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
+	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
 
-test:
-	perl -e '$$mes=0; while (<STDIN>) { if (/^messages:/) { $$mes=1; print $$_; next; } if ($$mes) { if (! /^\t/) { exit(0); } if (/$$\\(XGETTEXT\)/ && / -o/) { s/ -o/ _translatorinfo.cpp -o/ } print $$_;  } }' < Makefile.am
+configure.in: configure.files subdirs
+configure.files: subdirs
 
 .SILENT:
+
+.PHONY: cvs dist cvs-clean package-merge package-messages
diff --git a/admin/Makefile.in b/admin/Makefile.in
deleted file mode 100644
index a1453a2..0000000
--- a/admin/Makefile.in
+++ /dev/null
@@ -1,362 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = ChangeLog Makefile.common acinclude.m4.in am_edit am_edit.py conf.change.pl config.guess config.pl config.sub configure.in.min debianrules depcomp install-sh libtool.m4.in ltcf-c.sh ltcf-cxx.sh ltconfig ltmain.sh missing mkinstalldirs ylwrap
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  ChangeLog Makefile.am Makefile.in config.guess config.sub \
-install-sh ltcf-c.sh ltcf-cxx.sh ltconfig ltmain.sh missing \
-mkinstalldirs ylwrap
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu admin/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu admin/Makefile
-	cd $(top_srcdir) && perl admin/am_edit admin/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = admin
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu admin/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu admin/Makefile
-	cd $(top_srcdir) && perl admin/am_edit admin/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 7823796..86b4305 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -21,28 +21,142 @@ 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. If you decide that you
-dnl really want to modify it, contact coolo@kde.org mentioning that you have
-dnl and that the modified file should be committed to every module.
+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.
 
-dnl ------------------------------------------------------------------------
-dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
-dnl thanks to Raja R Harinath.
-dnl ------------------------------------------------------------------------
-dnl
-ifdef([_AC_PATH_X_DIRECT],[],
-   [AC_DEFUN([_AC_PATH_X_DIRECT],[AC_PATH_X_DIRECT])])
-ifdef([_AC_PATH_X_XMKMF],[],
-   [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])])
+# 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,
+AC_DEFUN([AC_FIND_FILE],
 [
 $3=NO
 for i in $2;
@@ -61,7 +175,7 @@ done
 
 dnl KDE_FIND_PATH(programm-name, variable-name, list of directories,
 dnl	if-not-found, test-parameter)
-AC_DEFUN(KDE_FIND_PATH,
+AC_DEFUN([KDE_FIND_PATH],
 [
    AC_MSG_CHECKING([for $1])
    if test -n "$$2"; then
@@ -114,7 +228,7 @@ AC_DEFUN(KDE_FIND_PATH,
    fi
 ])
 
-AC_DEFUN(KDE_MOC_ERROR_MESSAGE,
+AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
 [
     AC_MSG_ERROR([No Qt meta object compiler (moc) found!
 Please check whether you installed Qt correctly.
@@ -126,7 +240,7 @@ configure.
 ])
 ])
 
-AC_DEFUN(KDE_UIC_ERROR_MESSAGE,
+AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
 [
     AC_MSG_WARN([No Qt ui compiler (uic) found!
 Please check whether you installed Qt correctly.
@@ -138,13 +252,45 @@ 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_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"
@@ -156,10 +302,24 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC,
 
    KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
    if test -z "$UIC_NOT_NEEDED"; then
-     KDE_FIND_PATH(uic, UIC, [$qt_bindirs], [UIC=""])
-     if test -z "$UIC" ; 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: "
@@ -167,9 +327,16 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC,
 
    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,
+AC_DEFUN([KDE_1_CHECK_PATHS],
 [
   KDE_1_CHECK_PATH_HEADERS
 
@@ -217,7 +384,7 @@ KDE_SET_PATHS($kde_result)
 
 ])
 
-AC_DEFUN(KDE_SET_PATHS,
+AC_DEFUN([KDE_SET_PATHS],
 [
   kde_cv_all_paths="kde_have_all_paths=\"yes\" \
 	kde_htmldir=\"$kde_htmldir\" \
@@ -228,6 +395,7 @@ AC_DEFUN(KDE_SET_PATHS,
 	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\" \
@@ -236,60 +404,87 @@ AC_DEFUN(KDE_SET_PATHS,
 	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,
+AC_DEFUN([KDE_SET_DEFAULT_PATHS],
 [
 if test "$1" = "default"; then
 
   if test -z "$kde_htmldir"; then
-    kde_htmldir='\${prefix}/share/doc/HTML'
+    kde_htmldir='\${datadir}/doc/HTML'
   fi
   if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
+    kde_appsdir='\${datadir}/applnk'
   fi
   if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
+    kde_icondir='\${datadir}/icons'
   fi
   if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
+    kde_sounddir='\${datadir}/sounds'
   fi
   if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
+    kde_datadir='\${datadir}/apps'
   fi
   if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
+    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='\${prefix}/share/config'
+    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='\${prefix}/share/mimelnk'
+    kde_mimedir='\${datadir}/mimelnk'
   fi
   if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
+    kde_toolbardir='\${datadir}/toolbar'
   fi
   if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
+    kde_wallpaperdir='\${datadir}/wallpapers'
   fi
   if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
+    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='\${prefix}/share/services'
+    kde_servicesdir='\${datadir}/services'
   fi
   if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
+    kde_servicetypesdir='\${datadir}/servicetypes'
   fi
   if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
+    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)
@@ -306,31 +501,49 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_PATHS_FOR_COMPLETENESS,
+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 "$kde_have_all_paths" != "yes"; then
+   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_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_SUBST_PROGRAMS,
+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/kde2/bin /usr/kde/bin /usr/local/kde/bin"
+        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=:
@@ -342,13 +555,30 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
+        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/kde2/share /opt/kde/share $prefix/share"
+ 	    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
@@ -359,6 +589,13 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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)
@@ -367,6 +604,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         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`
@@ -385,7 +623,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         AC_SUBST(kde_libs_htmldir)
 ])dnl
 
-AC_DEFUN(AC_CREATE_KFSSTND,
+AC_DEFUN([AC_CREATE_KFSSTND],
 [
 AC_REQUIRE([AC_CHECK_RPATH])
 
@@ -403,10 +641,13 @@ 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_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
@@ -430,7 +671,7 @@ KDE_SUBST_PROGRAMS
 
 ])
 
-AC_DEFUN(AC_SUBST_KFSSTND,
+AC_DEFUN([AC_SUBST_KFSSTND],
 [
 AC_SUBST(kde_htmldir)
 AC_SUBST(kde_appsdir)
@@ -439,14 +680,22 @@ 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
@@ -459,9 +708,8 @@ dnl AC_SUBST(kde_cgidir)
 dnl AC_SUBST(kde_toolbardir)
 ])
 
-AC_DEFUN(KDE_MISC_TESTS,
+AC_DEFUN([KDE_MISC_TESTS],
 [
-   AC_LANG_C
    dnl Checks for libraries.
    AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
    AC_SUBST(LIBUTIL)
@@ -480,7 +728,6 @@ support])
       AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
    fi
    AC_CHECK_SOCKLEN_T
-   AC_LANG_C
    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,
@@ -505,27 +752,23 @@ support])
    AC_CHECK_FUNC(shmat, ,
      AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
    
-   # Solaris 2.6 and others need -lresolv for res_init
-   AC_CHECK_FUNCS(res_init, , [
-     kde_libs_safe="$LIBS"
-     LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-     AC_TRY_LINK(
-[
-#include <resolv.h>
-],
-[ 
-res_init(); 
-],
-        LIBRESOLV="-lresolv"
-        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-        AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-     )
-     LIBS=$kde_libs_safe
+   # 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(LIBRESOLV)
    AC_SUBST(X_EXTRA_LIBS)
    AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
    AC_SUBST(LIBUCB)
@@ -541,6 +784,58 @@ res_init();
 
    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 ------------------------------------------------------------------------
@@ -548,13 +843,36 @@ 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_DEFUN([K_PATH_X],
 [
-AC_REQUIRE([AC_PROG_CPP])dnl
 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_LANG_SAVE
-AC_LANG_C
+
 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
@@ -572,7 +890,7 @@ fi
 ac_x_libraries=$kde_x_libraries
 ac_x_includes=$kde_x_includes
 
-_AC_PATH_X_DIRECT
+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
@@ -592,7 +910,7 @@ mips-sgi-irix6*)
     ac_x_includes="."
   fi
   if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib"
+    ac_x_libraries="/usr/lib${kdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -648,11 +966,6 @@ fi
 all_includes="$X_INCLUDES"
 all_libraries="$X_LDFLAGS"
 
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_libraries)
-AC_SUBST(x_includes)
-
 # Check for libraries that X11R6 Xt/Xaw programs need.
 ac_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS $X_LDFLAGS"
@@ -664,13 +977,9 @@ LDFLAGS="$LDFLAGS $X_LDFLAGS"
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
 AC_CHECK_LIB(ICE, IceConnectionNumber,
   [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-AC_SUBST(LIBSM)
 LDFLAGS="$ac_save_LDFLAGS"
 
-AC_SUBST(X_PRE_LIBS)
-
 LIB_X11='-lX11 $(LIBSOCKET)'
-AC_SUBST(LIB_X11)
 
 AC_MSG_CHECKING(for libXext)
 AC_CACHE_VAL(kde_cv_have_libXext,
@@ -692,11 +1001,11 @@ 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)
 
@@ -706,58 +1015,52 @@ can't find it itself, we stop here assuming that make wouldn't find
 them either.])
 fi
 
-AC_MSG_CHECKING(for Xinerama)
-
- AC_ARG_WITH(xinerama,
-  [  --with-xinerama         enable support for Xinerama ],
-  [
-    no_xinerama=no
-  ], [
-    no_xinerama=yes
-  ]
-)
-
-kde_save_LDFLAGS="$LDFLAGS"
-kde_save_CFLAGS="$CFLAGS"
-kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
-
-if test "x$no_xinerama" = "xno"; then
-
-  AC_CACHE_VAL(ac_cv_have_xinerama,
-  [
-	  AC_TRY_LINK([#include <X11/Xlib.h>
-  			#include <X11/extensions/Xinerama.h>],
-	  	  [XineramaIsActive(NULL);],
-		  [ac_cv_have_xinerama="yes"],
-		  [ac_cv_have_xinerama="no"])
-  ])
-else
-  ac_cv_have_xinerama=no;
-fi
-
-AC_MSG_RESULT($ac_cv_have_xinerama)
-
-LIBXINERAMA=""
-
-if test "$ac_cv_have_xinerama" = "yes"; then
-  AC_DEFINE(HAVE_XINERAMA, 1, [Define if you want Xinerama support])
-  LIBXINERAMA="-lXinerama"
+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(LIBXINERAMA)
-
-LDFLAGS="$kde_save_LDFLAGS"
-CFLAGS="$kde_save_CFLAGS"
-LIBS="$kde_save_LIBS"
-
-AC_LANG_RESTORE
+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_DEFUN([KDE_PRINT_QT_PROGRAM],
 [
 AC_REQUIRE([KDE_USE_QT])
 cat > conftest.$ac_ext <<EOF
@@ -774,10 +1077,19 @@ EOF
 
 if test $kde_qtsubver -gt 0; then
 cat >> conftest.$ac_ext <<EOF
-#include <qiconview.h>
+#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
@@ -790,83 +1102,107 @@ 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
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
     QString s;
     s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
 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,
+AC_DEFUN([KDE_USE_QT],
 [
-
 if test -z "$1"; then
-  kde_qtver=2
-  kde_qtsubver=1
+  # Current default Qt version: 3.2
+  kde_qtver=3
+  kde_qtsubver=2
 else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9]\+\.\([0-9]\+\).*#\1#'`
-  # following is the check if subversion isn�t found in passed argument
+  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]\+\)\..*#\1#'`
+  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
   if test "$kde_qtver" = "1"; then
     kde_qtsubver=42
-  else
-   # this is the version number fallback to 2.1, unless major version is 1 or 2
-   if test "$kde_qtver" != "2"; then
-    kde_qtver=2
-    kde_qtsubver=1
-   fi
   fi
 fi
 
 if test -z "$2"; then
-  if test $kde_qtver = 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
-  else
+  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
+   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
-   else
+     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
+   fi
 else
-   kde_qt_verstring=$3
+   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"
-else
+fi
+if test $kde_qtver = 1; then
    kde_qt_dirs="$QTDIR /usr/lib/qt"
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_QT_DIRECT,
+AC_DEFUN([KDE_CHECK_QT_DIRECT],
 [
 AC_REQUIRE([KDE_USE_QT])
 AC_MSG_CHECKING([if Qt compiles without flags])
@@ -882,7 +1218,11 @@ 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=
@@ -925,10 +1265,11 @@ 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_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.
@@ -936,98 +1277,129 @@ dnl ------------------------------------------------------------------------
 
 AC_ARG_ENABLE(
   mt,
-  [  --enable-mt             link to threaded Qt (experimental)],
+  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
   kde_use_qt_mt=$enableval,
-  kde_use_qt_mt=no
+  [
+    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 got --enable-qt-mt then adjust some vars for the host.
+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
-
-  case $host in
-  *-*-linux-*)
-    if test "x$GCC" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread"
-      X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-    else
-      AC_MSG_WARN([Compiler is not gcc. MT support disabled.])
-    fi
-    ;;
-  *)
-    AC_MSG_WARN([MT not yet supported on $host - disabled.])
-    ;;
-  esac
-
+  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
-
-  LIBQT_GLOB="libqt.*"
-
+  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
 
-  LIBQT="-lqt"
-  kde_int_qt="-lqt"
+  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
-
-      case $host in
-      *-*-linux-*)
-        if test "x$GCC" = "xyes"; then
-          LIBQT="-lqt-mt"
-          kde_int_qt="-lqt-mt"
-          LIBQT_GLOB="libqt-mt.*"
-          USING_QT_MT="using -mt"
-        fi
-      ;;
-      esac
+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
-
-  kde_qt_was_given=no
-
+  LIBQT_GLOB="lib$qtlib-mt.*"
+  USING_QT_MT="using -mt"
 else
-  kde_int_qt="$LIBQT"
+  LIBQT="-l$qtlib"
 fi
 
-if test $kde_qtver = 2; then
+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,
-    [  --with-qt-dir=DIR       where the root of Qt is installed ],
+    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
     [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib
+       ac_qt_libraries="$withval"/lib${kdelibsuff}
        ac_qt_bindir="$withval"/bin
     ])
 
 AC_ARG_WITH(qt-includes,
-    [  --with-qt-includes=DIR  where the Qt includes are. ],
+    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
     [
        ac_qt_includes="$withval"
     ])
@@ -1035,7 +1407,7 @@ AC_ARG_WITH(qt-includes,
 kde_qt_libs_given=no
 
 AC_ARG_WITH(qt-libraries,
-    [  --with-qt-libraries=DIR where the Qt library is installed.],
+    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
     [  ac_qt_libraries="$withval"
        kde_qt_libs_given=yes
     ])
@@ -1047,12 +1419,12 @@ 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 $x_includes"
+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" = "2"; then
+if test "$kde_qtver" != "1"; then
   kde_qt_header=qstyle.h
 else
   kde_qt_header=qglobal.h
@@ -1063,7 +1435,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib $dir"
+   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
@@ -1077,6 +1449,12 @@ else
     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"
 
@@ -1088,8 +1466,8 @@ ac_ldflags_safe="$LDFLAGS"
 ac_libs_safe="$LIBS"
 
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS"
-LIBS="$LIBS $LIBQT"
+LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
+LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
 
 KDE_PRINT_QT_PROGRAM
 
@@ -1109,6 +1487,7 @@ 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)";
@@ -1116,11 +1495,17 @@ if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
       ac_qt_notfound="(headers)";
     fi
   else
-    ac_qt_notfound="(libraries)";
+    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.])
+For more details about this problem, look at the end of config.log.$missing_qt_mt])
 else
   have_qt="yes"
 fi
@@ -1139,15 +1524,15 @@ else
   qt_includes="$ac_qt_includes"
 fi
 
-if test ! "$kde_qt_libs_given" = "yes"; then
-KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
+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="";
+ QT_INCLUDES=""
 else
  QT_INCLUDES="-I$qt_includes"
  all_includes="$QT_INCLUDES $all_includes"
@@ -1159,27 +1544,93 @@ 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
 
-LIB_QT="$kde_int_qt "'$(LIBPNG) $(LIBJPEG) -lXext $(LIB_X11) $(LIBSM)'
+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_DEFUN([AC_PATH_QT],
 [
 AC_PATH_QT_1_3
 ])
 
-AC_DEFUN(KDE_CHECK_FINAL,
+AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
 [
-  AC_ARG_ENABLE(final, [  --enable-final          build size optimized apps (experimental - needs lots of memory)],
+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)
 
-  KDE_COMPILER_REPO
   if test "x$kde_use_final" = "xyes"; then
       KDE_USE_FINAL_TRUE=""
       KDE_USE_FINAL_FALSE="#"
@@ -1189,10 +1640,15 @@ AC_DEFUN(KDE_CHECK_FINAL,
   fi
   AC_SUBST(KDE_USE_FINAL_TRUE)
   AC_SUBST(KDE_USE_FINAL_FALSE)
+])
 
-  AC_ARG_ENABLE(closure, [  --disable-closure       don't delay template instantiation],
-  	kde_use_closure=$enableval, kde_use_closure=yes)
+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="#"
@@ -1200,9 +1656,44 @@ AC_DEFUN(KDE_CHECK_FINAL,
   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 ------------------------------------------------------------------------
@@ -1211,24 +1702,22 @@ 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_DEFUN([AC_BASE_PATH_KDE],
 [
-AC_PREREQ([2.13])
+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=${prefix}/include
-  ac_kde_includes=$prefix/include
+  kde_includes=${includedir}
+  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
+
+  kde_libraries=${libdir}
+  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
 
-  if test "${exec_prefix}" != NONE; then
-    kde_libraries=${exec_prefix}/lib
-    ac_kde_libraries=$exec_prefix/lib
-  else
-    kde_libraries=${prefix}/lib
-    ac_kde_libraries=$prefix/lib
-  fi
 else
   ac_kde_includes=
   ac_kde_libraries=
@@ -1249,7 +1738,7 @@ 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/kde2/include /opt/kde/include $x_includes $qt_includes"
+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)
@@ -1261,20 +1750,34 @@ 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 /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
+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
-ac_kde_libraries="$kde_libdir"
 
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then
+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 \
@@ -1304,8 +1807,8 @@ if test "$have_kde" != "yes"; then
   AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
  fi
 
- kde_libraries="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
+ kde_libraries="${libdir}"
+ kde_includes="${includedir}"
 
 else
   ac_cv_have_kde="have_kde=yes \
@@ -1324,6 +1827,8 @@ 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 
@@ -1340,14 +1845,21 @@ 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_DEFUN([KDE_CHECK_EXTRA_LIBS],
 [
 AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes, [  --with-extra-includes=DIR
-                          adds non standard include paths],
+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
 )
@@ -1372,7 +1884,7 @@ AC_MSG_RESULT($kde_use_extra_includes)
 
 kde_extra_libs=
 AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs, [  --with-extra-libs=DIR   adds non standard library paths],
+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
 )
@@ -1398,7 +1910,7 @@ AC_MSG_RESULT($kde_use_extra_libs)
 
 ])
 
-AC_DEFUN(KDE_1_CHECK_PATH_HEADERS,
+AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
 [
     AC_MSG_CHECKING([for KDE headers installed])
     AC_LANG_SAVE
@@ -1429,11 +1941,18 @@ int main() {
     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_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
+ ac_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$all_includes $CPPFLAGS"
  if AC_TRY_EVAL(ac_compile); then
    AC_MSG_RESULT(yes)
  else
@@ -1441,11 +1960,12 @@ EOF
 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_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
 AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
@@ -1470,7 +1990,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
 
  LDFLAGS=$kde_ldflags_safe
  LIBS=$kde_libs_safe
- kde_cxxflags_safe="$CXXFLAGS"
+ CXXFLAGS=$kde_cxxflags_safe
 ])
 
 AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
@@ -1481,85 +2001,53 @@ It is a separate package (and CVS module) named kde-qt-addon.])
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_KIMGIO,
-[
-   AC_REQUIRE([AC_BASE_PATH_KDE])
-   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-   AC_REQUIRE([AC_FIND_TIFF])
-   AC_REQUIRE([AC_FIND_JPEG])
-   AC_REQUIRE([AC_FIND_PNG])
-   AC_REQUIRE([KDE_CREATE_LIBS_ALIASES])
-
-   if test "$1" = "existance"; then
-     AC_LANG_SAVE
-     AC_LANG_CPLUSPLUS
-     kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries $LIBJPEG $LIBTIFF $LIBPNG $LIBQT -lm"
-     AC_CHECK_LIB(kimgio, kimgioRegister, [
-      LIBKIMGIO_EXISTS=yes],LIBKIMGIO_EXISTS=no)
-      LIBS="$kde_save_LIBS"
-      AC_LANG_RESTORE
-   else
-      LIBKIMGIO_EXISTS=yes
-   fi
-
-   if test "$LIBKIMGIO_EXISTS" = "yes"; then
-     LIB_KIMGIO='-lkimgio'
-   else
-     LIB_KIMGIO=''
-   fi
-   AC_SUBST(LIB_KIMGIO)
-])
-
-AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
+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 = 2; then
-   LIB_KDECORE='-lkdecore'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFORMULA='-lkformula'
-   AC_SUBST(LIB_KFORMULA)
-   LIB_KIO='-lkio'
-   AC_SUBST(LIB_KIO)
-   LIB_KSYCOCA='-lksycoca'
-   AC_SUBST(LIB_KSYCOCA)
-   LIB_SMB='-lsmb'
-   AC_SUBST(LIB_SMB)
-   LIB_KFILE='-lkfile'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab'
-   AC_SUBST(LIB_KAB)
-   LIB_KHTML='-lkhtml'
-   AC_SUBST(LIB_KHTML)
-   LIB_KSPELL='-lkspell'
-   AC_SUBST(LIB_KSPELL)
-   LIB_KPARTS='-lkparts'
-   AC_SUBST(LIB_KPARTS)
-   LIB_KWRITE='-lkwrite'
-   AC_SUBST(LIB_KWRITE)
+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
-   LIB_KDECORE='-lkdecore -lXext $(LIB_QT)'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui $(LIB_KDECORE)'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFM='-lkfm $(LIB_KDECORE)'
-   AC_SUBST(LIB_KFM)
-   LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)'
-   AC_SUBST(LIB_KAB)
+   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_DEFUN([AC_PATH_KDE],
 [
   AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check, [  --disable-path-check    don't try to find out, where to install],
+  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"
@@ -1580,203 +2068,303 @@ AC_DEFUN(AC_PATH_KDE,
   KDE_CREATE_LIBS_ALIASES
 ])
 
-dnl obsolete
-AC_DEFUN(AC_CHECK_SETENV,
+dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
+AC_DEFUN([KDE_CHECK_FUNC_EXT],
 [
-   AC_OBSOLETE([$0], [; instead use AC_CHECK_FUNCS([setenv unsetenv])])dnl 
-   AC_CHECK_FUNCS([setenv unsetenv])
-])
-
-AC_DEFUN(AC_CHECK_GETDOMAINNAME,
-[
-AC_MSG_CHECKING(for getdomainname)
-AC_CACHE_VAL(ac_cv_func_getdomainname,
+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 "$GCC" = "yes"; then
+if test "$GXX" = "yes"; then
 CXXFLAGS="$CXXFLAGS -pedantic-errors"
 fi
 AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <unistd.h>
+$2
 ],
 [
-char buffer[200];
-getdomainname(buffer, 200);
+$3
 ],
-ac_cv_func_getdomainname=yes,
-ac_cv_func_getdomainname=no)
+kde_cv_func_$1=yes,
+kde_cv_func_$1=no)
 CXXFLAGS="$save_CXXFLAGS"
-LIBS=$kde_safe_LIBS
+LIBS="$kde_safe_LIBS"
 AC_LANG_RESTORE
 ])
-AC_MSG_RESULT($ac_cv_func_getdomainname)
 
-AC_MSG_CHECKING([if getdomainname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_getdomainname,
+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
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  ac_cv_proto_getdomainname=no
-else
   kde_safe_libs=$LIBS
   LIBS="$LIBS $X_EXTRA_LIBS"
   AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
+$2
 
-extern "C" int getdomainname (char *, int);
+extern "C" $4;
 ],
 [
-char buffer[200];
-getdomainname(buffer, 200);
+$3
 ],
-  ac_cv_func_getdomainname=yes
-  ac_cv_proto_getdomainname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR([getdomainname unavailable]))
-fi
+[ 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($ac_cv_proto_getdomainname)
+AC_MSG_RESULT($kde_cv_proto_$1)
 
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME, 1, [Define if you have getdomainname])
+if test "x$kde_cv_func_$1" = xyes; then
+  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
+  $6
 fi
-if eval "test \"`echo $ac_cv_proto_getdomainname`\" = no"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME_PROTO, 1,
-  [Define if you have getdomainname prototype])
+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_GETHOSTNAME,
+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_MSG_CHECKING([for gethostname])
-AC_CACHE_VAL(ac_cv_func_gethostname,
+AC_DEFUN([AC_CHECK_UNSETENV],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_LINK([
+	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);
-],
-ac_cv_func_gethostname=yes,
-ac_cv_func_gethostname=no)
-CXXFLAGS="$save_CXXFLAGS"
-AC_LANG_RESTORE
+], 	
+	        [int gethostname (char *, unsigned int)],
+		[GETHOSTNAME])
 ])
-AC_MSG_RESULT($ac_cv_func_gethostname)
 
-AC_MSG_CHECKING([if gethostname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_gethostname,
+AC_DEFUN([AC_CHECK_USLEEP],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  ac_cv_proto_gethostname=no
-else
-  AC_TRY_LINK([
-#include <stdlib.h>
+	KDE_CHECK_FUNC_EXT(usleep, [
 #include <unistd.h>
+], 
+		[
+usleep(200);
+], 	
+	        [int usleep (unsigned int)],
+		[USLEEP])
+])
 
-extern "C" int gethostname (char *, int);
-],
+
+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];
-gethostname(buffer, 200);
+initgroups(buffer, 27);
 ],
-  ac_cv_func_gethostname=yes
-  ac_cv_proto_gethostname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR(gethostname unavailable))
-fi
-AC_LANG_RESTORE
+	[int initgroups(const char *, gid_t)],
+	[INITGROUPS])
 ])
-AC_MSG_RESULT($ac_cv_proto_gethostname)
 
-if eval "test \"`echo $ac_cv_proto_gethostname`\" = no"; then
-  AC_DEFINE(HAVE_GETHOSTNAME_PROTO, 1,
-  [Define if you have gethostname prototype])
-fi
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  AC_DEFINE(HAVE_GETHOSTNAME, 1, [Define if you have gethostname])
-fi
+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_USLEEP,
-[
-AC_MSG_CHECKING([for usleep])
-AC_CACHE_VAL(ac_cv_func_usleep,
+AC_DEFUN([AC_CHECK_MKDTEMP],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
+	KDE_CHECK_FUNC_EXT(mkdtemp, [
 #include <stdlib.h>
 #include <unistd.h>
 ],
-[
-usleep(200);
+	[
+mkdtemp("/tmp/aaaXXXXXX");
 ],
-ac_cv_func_usleep=yes,
-ac_cv_func_usleep=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_usleep)
-if eval "test \"`echo $ac_cv_func_usleep`\" = yes"; then
-  AC_DEFINE(HAVE_USLEEP, 1, [Define if you have the usleep function])
-fi
+	[char *mkdtemp(char *)],
+	[MKDTEMP])
 ])
 
-AC_DEFUN(AC_CHECK_RANDOM,
+
+AC_DEFUN([AC_CHECK_RES_INIT],
 [
-AC_MSG_CHECKING([for random])
-AC_CACHE_VAL(ac_cv_func_random,
+  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],
 [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
+	KDE_CHECK_FUNC_EXT(strlcpy, [
+#include <string.h>
 ],
-[
-random();
+[ char buf[20];
+  strlcpy(buf, "KDE function test", sizeof(buf));
 ],
-ac_cv_func_random=yes,
-ac_cv_func_random=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
+ 	[unsigned long strlcpy(char*, const char*, unsigned long)],
+	[STRLCPY])
 ])
-AC_MSG_RESULT($ac_cv_func_random)
-if eval "test \"`echo $ac_cv_func_random`\" = yes"; then
-  AC_DEFINE(HAVE_RANDOM, 1, [Define if you have random])
-fi
+
+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_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
@@ -1802,12 +2390,11 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_FIND_JPEG_HELPER,
+AC_DEFUN([KDE_FIND_JPEG_HELPER],
 [
 AC_MSG_CHECKING([for libjpeg$2])
 AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
 [
-AC_LANG_C
 ac_save_LIBS="$LIBS"
 LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
 ac_save_CFLAGS="$CFLAGS"
@@ -1845,7 +2432,7 @@ fi
 
 ])
 
-AC_DEFUN(AC_FIND_JPEG,
+AC_DEFUN([AC_FIND_JPEG],
 [
 dnl first look for libraries
 KDE_FIND_JPEG_HELPER(6b, 6b,
@@ -1858,7 +2445,7 @@ KDE_FIND_JPEG_HELPER(6b, 6b,
 
 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="/usr/include /usr/local/include $kde_extra_includes"
+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=
 
@@ -1885,15 +2472,61 @@ Disabling JPEG support.
 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(AC_FIND_ZLIB,
+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,
 [
-AC_LANG_C
 kde_save_LIBS="$LIBS"
 LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
 kde_save_CFLAGS="$CFLAGS"
@@ -1902,7 +2535,14 @@ AC_TRY_LINK(dnl
 [
 #include<zlib.h>
 ],
-            [return (zlibVersion() == ZLIB_VERSION); ],
+[
+  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"
@@ -1911,16 +2551,19 @@ CFLAGS="$kde_save_CFLAGS"
 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_SUBST(LIBZ)
   AC_MSG_RESULT($ac_cv_lib_z)
 else
-  AC_MSG_ERROR(not found. Check your installation and look into config.log)
+  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=""
-  AC_SUBST(LIBZ)
 fi
+AC_SUBST(LIBZ)
 ])
 
-AC_DEFUN(KDE_TRY_TIFFLIB,
+AC_DEFUN([KDE_TRY_TIFFLIB],
 [
 AC_MSG_CHECKING([for libtiff $1])
 
@@ -1929,7 +2572,11 @@ 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"
 
@@ -1962,7 +2609,7 @@ fi
 
 ])
 
-AC_DEFUN(AC_FIND_TIFF,
+AC_DEFUN([AC_FIND_TIFF],
 [
 AC_REQUIRE([K_PATH_X])
 AC_REQUIRE([AC_FIND_ZLIB])
@@ -1976,7 +2623,7 @@ AC_SUBST(LIBTIFF)
 ])
 
 
-AC_DEFUN(AC_FIND_PNG,
+AC_DEFUN([AC_FIND_PNG],
 [
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_REQUIRE([AC_FIND_ZLIB])
@@ -1984,10 +2631,14 @@ 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_LANG_C
+
 AC_TRY_LINK(dnl
     [
     #include<png.h>
@@ -2015,12 +2666,49 @@ else
 fi
 ])
 
-AC_DEFUN(AC_CHECK_BOOL,
+
+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_DEFUN([AC_CHECK_GNU_EXTENSIONS],
 [
 AC_MSG_CHECKING(if you need GNU extensions)
 AC_CACHE_VAL(ac_cv_gnu_extensions,
@@ -2048,21 +2736,19 @@ if test "$ac_cv_gnu_extensions" = "yes"; then
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_COMPILER_FLAG,
+AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
 [
-dnl AC_REQUIRE([AC_CHECK_COMPILERS]) <- breaks with autoconf 2.50
-AC_MSG_CHECKING(whether $CXX supports -$1)
-kde_cache=`echo $1 | sed 'y%.=/+-%___p_%'`
+AC_MSG_CHECKING([whether $CXX supports -$1])
+kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
 AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
 [
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -$1 -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -$1 -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
+  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)
@@ -2078,7 +2764,7 @@ 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,
+AC_DEFUN([AC_REMOVE_FORBIDDEN],
 [ __val=$$1
   __forbid=" $2 "
   if test -n "$__val"; then
@@ -2099,33 +2785,50 @@ AC_DEFUN(AC_REMOVE_FORBIDDEN,
 ])
 
 dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN(AC_VALIDIFY_CXXFLAGS,
+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_DEFUN([AC_CHECK_COMPILERS],
 [
-  AC_ARG_ENABLE(debug,[  --enable-debug          enables debug symbols [default=no]],
+  AC_ARG_ENABLE(debug,
+	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
-   if test $enableval = "no"; dnl
-     then
-       kde_use_debug_code="no"
-       kde_use_debug_define=yes
-     else
-       kde_use_debug_code="yes"
-       kde_use_debug_define=no
-   fi
+    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,[  --disable-debug         disables debug output and debug symbols [default=no]],[],[])
-
-  AC_ARG_ENABLE(strict,[  --enable-strict         compiles with strict compiler options (may not work!)],
+  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"
@@ -2134,7 +2837,21 @@ AC_DEFUN(AC_CHECK_COMPILERS,
     fi
    ], [kde_use_strict_options="no"])
 
-  AC_ARG_ENABLE(profile,[  --enable-profile        creates profiling infos [default=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"]
   )
@@ -2144,14 +2861,15 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CC 
 
+  AC_PROG_CPP
+
   if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CFLAGS="-g -O2 $CFLAGS"
-      case $host in
-        *-*-linux-gnu)	
-          CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-        ;;
-      esac
+    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
@@ -2161,6 +2879,7 @@ AC_DEFUN(AC_CHECK_COMPILERS,
     CFLAGS="-DNDEBUG $CFLAGS"
   fi
 
+
   case "$host" in
   *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
   *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
@@ -2174,34 +2893,33 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CXX
 
-  if test "$GXX" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $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"])
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      case $host in  dnl
-      *-*-linux-gnu)
-        CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS"
-        ;;
-      esac
-
-      if test "$kde_use_strict_options" = "yes"; then
-        CXXFLAGS="-Wcast-qual -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
+  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"])
 
-      if test "$kde_very_strict" = "yes"; then
-        CXXFLAGS="-Wold-style-cast -Wredundant-decls -Wconversion $CXXFLAGS"
-      fi
+      dnl convenience compiler flags
+      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
+      AC_SUBST(WOVERLOADED_VIRTUAL)
     else
-      CXXFLAGS="-O2 $CXXFLAGS"
+      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 $CXXFLAGS"
+    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
   fi  
 
   if test "$kde_use_profiling" = "yes"; then
@@ -2211,10 +2929,72 @@ AC_DEFUN(AC_CHECK_COMPILERS,
       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
     
-  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(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
+  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=
@@ -2238,96 +3018,85 @@ AC_DEFUN(AC_CHECK_COMPILERS,
 
   AC_PROG_CXXCPP
 
-  # the following is to allow programs, that are known to
-  # have problems when compiled with -O2
-  if test -n "$CXXFLAGS"; then
-      kde_safe_IFS=$IFS
-      IFS=" "
-      NOOPT_CXXFLAGS=""
-      for i in $CXXFLAGS; do
-        case $i in
-          -O*)
-                ;;
-          *)
-                NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS $i"
-                ;;
-        esac
-      done
-      IFS=$kde_safe_IFS
+  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]), [])
-
-  KDE_CXXFLAGS=
-  AC_SUBST(KDE_CXXFLAGS)
 ])
 
-AC_DEFUN(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_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_LANG_SAVE
-AC_LANG_C
 AC_OBJEXT
 AC_EXEEXT
-AC_LANG_RESTORE
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
 
 LIBTOOL_SHELL="/bin/sh ./libtool"
 #  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
+KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-AC_ARG_ENABLE(objprelink, [  --enable-objprelink     prelink apps using objprelink (experimental [only tested on linux/386])],
-       kde_use_objprelink=$enableval, kde_use_objprelink=no)
-  if test "x$kde_use_objprelink" = "xyes"; then 
+# 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')
+])
 
-      KDE_FIND_PATH(objprelink, OBJPRELINK, [], [kde_use_objprelink=no])   
-     
-      if test "x$kde_use_objprelink" = "xyes"; then
-      AC_MSG_CHECKING([Patching libtool to run objprelink.])
-      mv libtool libtool.orig
-      cat > libtool <<\EOF
-#! /bin/sh
-for n ; do case $n in
-  *.o)  test -r $n && echo objprelink $n && objprelink $n ;;
-  *.lo) m=`basename $n .lo`".o" && test -r $m && echo objprelink $m && objprelink $m 
-        m=".libs/$m" && test -r $m && echo objprelink $m && objprelink $m ;;
-esac; done
-EOF
-      cat >> libtool libtool.orig
-      rm libtool.orig
-      chmod a+x libtool
-      AC_MSG_RESULT(done)
-	fi
-  fi
+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_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
-  AC_CHECK_SIZEOF(char, 1)dnl
 ])dnl
 
-AC_DEFUN(KDE_DO_IT_ALL,
+AC_DEFUN([KDE_DO_IT_ALL],
 [
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -2340,11 +3109,11 @@ AM_KDE_WITH_NLS
 AC_PATH_KDE
 ])
 
-AC_DEFUN(AC_CHECK_RPATH,
+AC_DEFUN([AC_CHECK_RPATH],
 [
 AC_MSG_CHECKING(for rpath)
 AC_ARG_ENABLE(rpath,
-      [  --disable-rpath         do not use the rpath feature of ld],
+      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
@@ -2356,7 +3125,8 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
   fi
   dnl $x_libraries is set to /usr/lib in case
   if test -n "$X_LDFLAGS"; then
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
+    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)"
@@ -2364,11 +3134,12 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 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_DEFUN([AC_CHECK_SOCKLEN_T], [
   AC_MSG_CHECKING(for socklen_t)
   AC_CACHE_VAL(ac_cv_socklen_t, [
     AC_LANG_SAVE
@@ -2420,7 +3191,7 @@ dnl PARTICULAR PURPOSE.
 dnl >
 dnl for this file it is relicensed under LGPL
 
-AC_DEFUN(AM_KDE_WITH_NLS,
+AC_DEFUN([AM_KDE_WITH_NLS],
   [
     dnl If we use NLS figure out what method
 
@@ -2463,7 +3234,7 @@ AC_DEFUN(AM_KDE_WITH_NLS,
 
 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,
+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])
@@ -2505,7 +3276,7 @@ AC_SUBST($1)dnl
 
 # serial 1
 
-AC_DEFUN(AM_LC_MESSAGES,
+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],
@@ -2551,7 +3322,7 @@ AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
 # serial 1
 # Stephan Kulow: I put a KDE in it to avoid name conflicts
 
-AC_DEFUN(AM_KDE_GNU_GETTEXT,
+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
@@ -2560,15 +3331,15 @@ AC_DEFUN(AM_KDE_GNU_GETTEXT,
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
    AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+   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="-Wmissing-prototypes -Werror"
+   CXXFLAGS="-Werror"
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS
    AC_TRY_COMPILE([
@@ -2613,14 +3384,14 @@ __argz_count __argz_stringify __argz_next])
 
   ])
 
-AC_DEFUN(AC_HAVE_XPM,
+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, [  --without-xpm           disable color pixmap XPM tests],
+ 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
@@ -2628,10 +3399,13 @@ AC_DEFUN(AC_HAVE_XPM,
    AC_MSG_CHECKING(for XPM)
    AC_CACHE_VAL(ac_cv_have_xpm,
    [
-    AC_LANG_C
     ac_save_ldflags="$LDFLAGS"
     ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
+    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>],[],
@@ -2665,7 +3439,7 @@ AC_DEFUN(AC_HAVE_XPM,
  AC_SUBST(XPMLIB)
 ])
 
-AC_DEFUN(AC_HAVE_DPMS,
+AC_DEFUN([AC_HAVE_DPMS],
  [AC_REQUIRE_CPP()dnl
   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 
@@ -2673,7 +3447,7 @@ AC_DEFUN(AC_HAVE_DPMS,
  test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
  DPMS_LIB=
 
- AC_ARG_WITH(dpms, [  --without-dpms          disable DPMS power saving],
+ 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
@@ -2683,41 +3457,45 @@ AC_DEFUN(AC_HAVE_DPMS,
    dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
    AC_CACHE_VAL(ac_cv_have_dpms,
    [
-    AC_LANG_C
-    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"
+    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
@@ -2744,46 +3522,69 @@ AC_DEFUN(AC_HAVE_DPMS,
     $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_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, [  --without-gl            disable 3D GL modes],
+ AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
 	gl_test=$withval, gl_test="yes")
- if test "x$gl_test" = xno; then
+ 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_C
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
     ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET"
-    CFLAGS="$CFLAGS $X_INCLUDES"
+    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>           
+#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 -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET"
-      CFLAGS="$ac_save_cflags $X_INCLUDES"
+      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"
-    CFLAGS="$ac_save_cflags"
+    CXXFLAGS="$ac_save_cxxflags"
    ])dnl
 
   if test "$ac_cv_have_gl" = "no"; then
@@ -2795,15 +3596,15 @@ AC_DEFUN(AC_HAVE_GL,
     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='-lMesaGL -lMesaGLU $(LIB_X11)'
+          GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)'
        else
-          GLLIB='-lGL -lGLU $(LIB_X11)'
+          GLLIB='-lGLU -lGL $(LIB_X11)'
        fi
     else
        if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)'
+          GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)'
        else
-          GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
+          GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
        fi
     fi
     if test "$GL_INCLUDE" = ""; then
@@ -2822,63 +3623,74 @@ AC_DEFUN(AC_HAVE_GL,
 
  dnl shadow password and PAM magic - maintained by ossi@kde.org
 
-AC_DEFUN(KDE_PAM, [
+AC_DEFUN([KDE_PAM], [
   AC_REQUIRE([KDE_CHECK_LIBDL])
 
+  want_pam=
   AC_ARG_WITH(pam,
-    [  --with-pam[=ARG]        enable support for PAM: ARG=[yes|no|service name]],
+    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
     [ if test "x$withval" = "xyes"; then
-        use_pam=yes
+        want_pam=yes
         pam_service=kde
       elif test "x$withval" = "xno"; then
-        use_pam=no
+        want_pam=no
       else
-        use_pam=yes
+        want_pam=yes
         pam_service=$withval
       fi
-      ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-    ], [
-      AC_CACHE_VAL(ac_cv_path_pam,
-        [ use_pam=no
-          AC_CHECK_LIB(pam, pam_start,
-            [ AC_CHECK_HEADER(security/pam_appl.h, 
-                [ use_pam=yes
-                  pam_service=kde ]) 
-            ], , $LIBDL)
-          ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-        ])
-    ])
-  eval "$ac_cv_path_pam"
+    ], [ 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
 
-  AC_MSG_CHECKING(for PAM)
-  if test "x$use_pam" = xno; then
-    AC_MSG_RESULT(no)
-    PAMLIBS=""
-  else
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-    PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-
-    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], security/pam_appl.h,
-      [ AC_EGREP_HEADER([const struct pam_message], security/pam_appl.h,
-                        [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])])
+      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_DEFUN([DEF_PAM_SERVICE], [
   AC_ARG_WITH($1-pam,
-    [  --with-$1-pam=[val]    override PAM service from --with-pam for $2],
+    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"
+        $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.])
@@ -2895,7 +3707,7 @@ You may want to enforce it by using --with-pam.])
     AC_SUBST($3_PAM_SERVICE)
 ])
 
-AC_DEFUN(KDE_SHADOWPASSWD, [
+AC_DEFUN([KDE_SHADOWPASSWD], [
   AC_REQUIRE([KDE_PAM])
 
   AC_CHECK_LIB(shadow, getspent,
@@ -2918,7 +3730,7 @@ AC_DEFUN(KDE_SHADOWPASSWD, [
   AC_MSG_CHECKING([for shadow passwords])
 
   AC_ARG_WITH(shadow,
-    [  --with-shadow		  If you want shadow password support ],
+    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
     [ if test "x$withval" != "xno"; then
         use_shadow=yes
       else
@@ -2952,7 +3764,7 @@ AC_DEFUN(KDE_SHADOWPASSWD, [
 
 ])
 
-AC_DEFUN(KDE_PASSWDLIBS, [
+AC_DEFUN([KDE_PASSWDLIBS], [
   AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
   AC_REQUIRE([KDE_PAM])
   AC_REQUIRE([KDE_SHADOWPASSWD])
@@ -2963,10 +3775,22 @@ AC_DEFUN(KDE_PASSWDLIBS, [
     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_DEFUN([KDE_CHECK_LIBDL],
 [
 AC_CHECK_LIB(dl, dlopen, [
 LIBDL="-ldl"
@@ -2981,7 +3805,7 @@ ac_cv_have_shload=yes
 AC_SUBST(LIBDL)
 ])
 
-AC_DEFUN(KDE_CHECK_DLOPEN,
+AC_DEFUN([KDE_CHECK_DLOPEN],
 [
 KDE_CHECK_LIBDL
 AC_CHECK_HEADERS(dlfcn.h dl.h)
@@ -2996,7 +3820,7 @@ fi
 dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
 dnl (MM)
 AC_ARG_ENABLE(dlopen,
-[  --disable-dlopen        link statically [default=no]] ,
+AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
 enable_dlopen=$enableval,
 enable_dlopen=yes)
 
@@ -3021,7 +3845,7 @@ fi
 
 ])
 
-AC_DEFUN(KDE_CHECK_DYNAMIC_LOADING,
+AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
 [
 KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
 KDE_PROG_LIBTOOL
@@ -3041,7 +3865,7 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_ADD_INCLUDES,
+AC_DEFUN([KDE_ADD_INCLUDES],
 [
 if test -z "$1"; then
   test_include="Pix.h"
@@ -3078,209 +3902,53 @@ fi
 ])
 ])
 
-
-AC_DEFUN(KDE_CHECK_MICO,
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_MISC_TESTS])
-AC_MSG_CHECKING(for MICO)
-
-if test -z "$MICODIR"; then
-    kde_micodir=/usr/local
- else
-    kde_micodir="$MICODIR"
-fi
-
-AC_ARG_WITH(micodir,
-  [  --with-micodir=micodir  where mico is installed ],
-  kde_micodir=$withval,
-  kde_micodir=$kde_micodir
-)
-
-AC_CACHE_VAL(kde_cv_mico_incdir,
-[
-  mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes"
-AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir)
-
-])
-kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'`
-
-if test ! -r  $kde_micodir/include/CORBA.h; then
-  AC_MSG_ERROR([No CORBA.h found, specify another micodir])
-fi
-
-AC_MSG_RESULT($kde_micodir)
-
-MICO_INCLUDES=-I$kde_micodir/include
-AC_SUBST(MICO_INCLUDES)
-MICO_LDFLAGS=-L$kde_micodir/lib
-AC_SUBST(MICO_LDFLAGS)
-micodir=$kde_micodir
-AC_SUBST(micodir)
-
-AC_MSG_CHECKING([for MICO version])
-AC_CACHE_VAL(kde_cv_mico_version,
+AC_DEFUN([KDE_CHECK_LIBPTHREAD],
 [
-AC_LANG_C
-cat >conftest.$ac_ext <<EOF
-#include <stdio.h>
-#include <mico/version.h>
-int main() {
+  LIBPTHREAD=""
 
-   printf("MICO_VERSION=%s\n",MICO_VERSION);
-   return (0);
-}
-EOF
-ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest'
-if AC_TRY_EVAL(ac_compile); then
-  if eval `./conftest 2>&5`; then
-    kde_cv_mico_version=$MICO_VERSION
-  else
-    AC_MSG_ERROR([your system is not able to execute a small application to
-    find MICO version! Check $kde_micodir/include/mico/version.h])
+  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
-else
-  AC_MSG_ERROR([your system is not able to compile a small application to
-  find MICO version! Check $kde_micodir/include/mico/version.h])
-fi
-])
-
-dnl installed MICO version
-mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "x$1" = "x"; then
- req_version="2.3.0"
-else
- req_version=$1
-fi
-
-dnl required MICO version
-req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "$mico_v_maj" -lt "$req_v_maj" || \
-   ( test "$mico_v_maj" -eq "$req_v_maj" && \
-        test "$mico_v_mid" -lt "$req_v_mid" ) || \
-   ( test "$mico_v_mid" -eq "$req_v_mid" && \
-        test "$mico_v_min" -lt "$req_v_min" )
-
-then
-  AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \
-at least is required. You should upgrade MICO.])
-else
-  AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)])
-fi
-
-LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL"
-AC_SUBST(LIBMICO)
-if test -z "$IDL"; then
-  IDL='$(kde_bindir)/cuteidl'
-fi
-AC_SUBST(IDL)
-IDL_DEPENDENCIES='$(kde_includes)/CUTE.h'
-AC_SUBST(IDL_DEPENDENCIES)
-
-idldir="\$(includedir)/idl"
-AC_SUBST(idldir)
-
-])
-
-AC_DEFUN(KDE_CHECK_MINI_STL,
-[
-AC_REQUIRE([KDE_CHECK_MICO])
-
-AC_MSG_CHECKING(if we use mico's mini-STL)
-AC_CACHE_VAL(kde_cv_have_mini_stl,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_cxxflags="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $MICO_INCLUDES"
-AC_TRY_COMPILE(
-[
-#include <mico/config.h>
-],
-[
-#ifdef HAVE_MINI_STL
-#error "nothing"
-#endif
-],
-kde_cv_have_mini_stl=no,
-kde_cv_have_mini_stl=yes)
-CXXFLAGS="$kde_save_cxxflags"
-AC_LANG_RESTORE
-])
-
-if test "x$kde_cv_have_mini_stl" = "xyes"; then
-   AC_MSG_RESULT(yes)
-   $1
-else
-   AC_MSG_RESULT(no)
-   $2
-fi
-])
-
-])
 
+  if test -z "$LIBPTHREAD"; then
+    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
+  fi
 
-AC_DEFUN(KDE_CHECK_LIBPTHREAD,
-[
-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-AC_SUBST(LIBPTHREAD)
+  AC_SUBST(LIBPTHREAD)
 ])
 
-AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
+AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
 [
-    AC_ARG_ENABLE(kernel-threads, [  --enable-kernel-threads Enable the use of the LinuxThreads port on FreeBSD/i386 only.],
-	kde_use_kernthreads=$enableval, kde_use_kernthreads=no)
-
-    if test "$kde_use_kernthreads" = "yes"; then
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_CFLAGS="$CXXFLAGS"
-      CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
-      CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
-      AC_CHECK_HEADERS(pthread/linuxthreads/pthread.h)
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      CFLAGS="$ac_save_CFLAGS"
-      if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
-        kde_use_kernthreads=no
-      else
-        dnl Add proper -I and -l statements
-        AC_CHECK_LIB(lthread, pthread_join, [LIBPTHREAD="-llthread -llgcc_r"]) dnl for FreeBSD
-        if test "x$LIBPTHREAD" = "x"; then
-          kde_use_kernthreads=no
-        else
-          USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
-        fi
-      fi
-    else 
       USE_THREADS=""
       if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-pthread"] )
+        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
       fi
-    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"
-                echo "Setting Solaris pthread compilation options"
     		;;
         freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                echo "Setting FreeBSD pthread compilation options"
+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
                 ;;
         aix*)
                 CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
                 LIBPTHREAD="$LIBPTHREAD -lc_r"
-                echo "Setting AIX pthread compilation options"
                 ;;
         linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                USE_THREADS="$USE_THREADS -DPIC -fPIC"
-                echo "Setting Linux pthread compilation options"
+                if test "$CXX" = "KCC"; then
+                  CXXFLAGS="$CXXFLAGS --thread_safe"
+		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
+                fi
                 ;;
 	*)
 		;;
@@ -3289,25 +3957,28 @@ AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
     AC_SUBST(LIBPTHREAD)
 ])
 
-AC_DEFUN(KDE_CHECK_THREADING,
+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
-    kde_check_threading_default=no
+    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, [  --disable-threading     disables threading even if libpthread found ],
+  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,
+AC_DEFUN([KDE_TRY_LINK_PYTHON],
 [
 if test "$kde_python_link_found" = no; then
 
@@ -3319,8 +3990,6 @@ fi
 
 AC_CACHE_VAL(kde_cv_try_link_python_$1,
 [
-AC_LANG_SAVE
-AC_LANG_C
 kde_save_cflags="$CFLAGS"
 CFLAGS="$CFLAGS $PYTHONINC"
 kde_save_libs="$LIBS"
@@ -3353,13 +4022,12 @@ else
   AC_MSG_RESULT(no)
   $4
 fi
-AC_LANG_RESTORE
 
 fi
 
 ])
 
-AC_DEFUN(KDE_CHECK_PYTHON_DIR,
+AC_DEFUN([KDE_CHECK_PYTHON_DIR],
 [
 AC_MSG_CHECKING([for Python directory])
  
@@ -3373,7 +4041,7 @@ AC_CACHE_VAL(kde_cv_pythondir,
 ])
  
 AC_ARG_WITH(pythondir,
-[  --with-pythondir=pythondir   use python installed in pythondir ],
+AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
 [
   ac_python_dir=$withval
 ], ac_python_dir=$kde_cv_pythondir
@@ -3382,7 +4050,7 @@ AC_ARG_WITH(pythondir,
 AC_MSG_RESULT($ac_python_dir)
 ])
 
-AC_DEFUN(KDE_CHECK_PYTHON_INTERN,
+AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
 [
 AC_REQUIRE([KDE_CHECK_LIBDL])
 AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
@@ -3408,13 +4076,16 @@ fi
 
 PYTHONINC=-I$python_incdir
 
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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
+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
-    python_libdir=no
+    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
 
@@ -3424,7 +4095,6 @@ if test -z "$LIBPYTHON"; then
   LIBPYTHON=-lpython$version
 fi
 
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
 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
@@ -3447,16 +4117,18 @@ else
   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.
-    Pleae use \"make LIBPYTHON='-lpython$version -lotherlib'\" to fix this
+    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"
@@ -3470,17 +4142,27 @@ fi
 ])
 
 
-AC_DEFUN(KDE_CHECK_PYTHON,
+AC_DEFUN([KDE_CHECK_PYTHON],
 [
-  KDE_CHECK_PYTHON_INTERN("2.1", [KDE_CHECK_PYTHON_INTERN("2.0",
-        [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
-  ])
+  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_SGI,
+AC_DEFUN([KDE_CHECK_STL],
 [
-    AC_MSG_CHECKING([if STL implementation is SGI like])
-    AC_CACHE_VAL(kde_cv_stl_type_sgi,
+    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>
@@ -3489,60 +4171,26 @@ using namespace std;
   string astring="Hallo Welt.";
   astring.erase(0, 6); // now astring is "Welt"
   return 0;
-], kde_cv_stl_type_sgi=yes,
-   kde_cv_stl_type_sgi=no)
+], kde_cv_stl_works=yes,
+   kde_cv_stl_works=no)
 ])
 
-   AC_MSG_RESULT($kde_cv_stl_type_sgi)
+   AC_MSG_RESULT($kde_cv_stl_works)
 
-   if test "$kde_cv_stl_type_sgi" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   fi
-])
-
-AC_DEFUN(KDE_CHECK_STL_HP,
-[
-    AC_MSG_CHECKING([if STL implementation is HP like])
-    AC_CACHE_VAL(kde_cv_stl_type_hp,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hello World";
-  astring.remove(0, 6); // now astring is "World"
-  return 0;
-], kde_cv_stl_type_hp=yes,
-   kde_cv_stl_type_hp=no)
-])
-   AC_MSG_RESULT($kde_cv_stl_type_hp)
-
-   if test "$kde_cv_stl_type_hp" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
+   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
-])
-
-AC_DEFUN(KDE_CHECK_STL,
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-    KDE_CHECK_STL_SGI
-
-    if test "$kde_cv_stl_type_sgi" = "no"; then
-       KDE_CHECK_STL_HP
 
-       if test "$kde_cv_stl_type_hp" = "no"; then
-         AC_MSG_ERROR("no known STL type found")
-       fi
-    fi
-
-    CXXFLAGS="$ac_save_CXXFLAGS"
-    AC_LANG_RESTORE
+   CXXFLAGS="$ac_save_CXXFLAGS"
+   AC_LANG_RESTORE
 ])
 
-AC_DEFUN(AC_FIND_QIMGIO,
+AC_DEFUN([AC_FIND_QIMGIO],
    [AC_REQUIRE([AC_FIND_JPEG])
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_MSG_CHECKING([for qimgio])
@@ -3581,28 +4229,7 @@ else
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_ANSI,
-[
-])
-
-AC_DEFUN(KDE_CHECK_INSURE,
-[
-  AC_ARG_ENABLE(insure, [  --enable-insure             use insure++ for debugging [default=no]],
-  [
-  if test $enableval = "no"; dnl
-	then ac_use_insure="no"
-	else ac_use_insure="yes"
-   fi
-  ], [ac_use_insure="no"])
-
-  AC_MSG_CHECKING(if we will use Insure++ to debug)
-  AC_MSG_RESULT($ac_use_insure)
-  if test "$ac_use_insure" = "yes"; dnl
-       then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "????
-   fi
-])
-
-AC_DEFUN(AM_DISABLE_LIBRARIES,
+AC_DEFUN([AM_DISABLE_LIBRARIES],
 [
     AC_PROVIDE([AM_ENABLE_STATIC])
     AC_PROVIDE([AM_ENABLE_SHARED])
@@ -3611,7 +4238,7 @@ AC_DEFUN(AM_DISABLE_LIBRARIES,
 ])
 
 
-AC_DEFUN(AC_CHECK_UTMP_FILE,
+AC_DEFUN([AC_CHECK_UTMP_FILE],
 [
     AC_MSG_CHECKING([for utmp file])
 
@@ -3644,7 +4271,7 @@ AC_DEFUN(AC_CHECK_UTMP_FILE,
 ])
 
 
-AC_DEFUN(KDE_CREATE_SUBDIRSLIST,
+AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
 [
 
 DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
@@ -3659,9 +4286,10 @@ if test ! -s $srcdir/subdirs; then
   done
 fi
 
+ac_topsubdirs=
 if test -s $srcdir/inst-apps; then
   ac_topsubdirs="`cat $srcdir/inst-apps`"
-else
+elif test -s $srcdir/subdirs; then
   ac_topsubdirs="`cat $srcdir/subdirs`"
 fi
 
@@ -3678,15 +4306,19 @@ for i in $ac_topsubdirs; do
     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_DEFUN([KDE_CHECK_NAMESPACES],
 [
 AC_MSG_CHECKING(whether C++ compiler supports namespaces)
 AC_LANG_SAVE
@@ -3712,22 +4344,15 @@ AC_MSG_RESULT(no)
 AC_LANG_RESTORE
 ])
 
-AC_DEFUN(KDE_CHECK_NEWLIBS,
-[
-
-])
-
 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_DEFUN([AC_CHECK_S_ISSOCK],
 [
 AC_MSG_CHECKING(for S_ISSOCK)
 AC_CACHE_VAL(ac_cv_have_s_issock,
 [
-AC_LANG_SAVE
-AC_LANG_C
 AC_TRY_LINK(
 [
 #include <sys/stat.h>
@@ -3738,24 +4363,31 @@ int b = S_ISSOCK( buff.st_mode );
 ],
 ac_cv_have_s_issock=yes,
 ac_cv_have_s_issock=no)
-AC_LANG_RESTORE
 ])
 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_DEFUN([AC_CHECK_KDEMAXPATHLEN],
 [
 AC_MSG_CHECKING(for MAXPATHLEN)
 AC_CACHE_VAL(ac_cv_maxpathlen,
 [
-AC_LANG_C
 cat > conftest.$ac_ext <<EOF
 #ifdef STDC_HEADERS
 # include <stdlib.h>
@@ -3785,67 +4417,37 @@ AC_MSG_RESULT($ac_cv_maxpathlen)
 AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
 ])
 
-dnl -------------------------------------------------------------------------
-dnl See if the compiler supports a template repository         bero@redhat.de
-dnl -------------------------------------------------------------------------
-AC_DEFUN(KDE_COMPILER_REPO,
-[
-  REPO=""
-  NOREPO=""
-
-  KDE_CHECK_COMPILER_FLAG(frepo,
-   [
-     REPO="-frepo"
-     NOREPO="-fno-repo"
-   ])
-
-  if test -z "$REPO"; then
-  KDE_CHECK_COMPILER_FLAG(instances=explicit,
-  [
-     REPO="-instances=explicit"
-     NOREPO="-instances=extern"
-  ])
-  fi
-
-  if test -n "$REPO"; then
-     AC_DEFINE_UNQUOTED(HAVE_TEMPLATE_REPOSITORY, 1,
-		[C++ compiler supports template repository])
-     $1
-  fi
-
-  AC_SUBST(REPO)
-  AC_SUBST(NOREPO)
-])
-
-AC_DEFUN(KDE_CHECK_HEADER,
+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)
+   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
    CPPFLAGS=$kde_safe_cppflags
    AC_LANG_RESTORE
 ])
 
-AC_DEFUN(KDE_CHECK_QWSPRITEFIELD,
+AC_DEFUN([KDE_CHECK_HEADERS],
 [
-  KDE_CHECK_HEADER(QwSpriteField.h, ,
-  [
-    AC_MSG_WARN([you don't have QwSpriteField.h somewhere. Please install
-       QwSpriteField out of kdesupport.])
-      $1
-  ])
+   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,
+AC_DEFUN([KDE_FAST_CONFIGURE],
 [
   dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, [  --disable-fast-perl     disable fast Makefile generation (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,
+AC_DEFUN([KDE_CONF_FILES],
 [
   val=
   if test -f $srcdir/configure.files ; then
@@ -3860,7 +4462,7 @@ AC_DEFUN(KDE_CONF_FILES,
   AC_SUBST(CONF_FILES)
 ])dnl
 
-AC_DEFUN(KDE_SET_PREFIX,
+AC_DEFUN([KDE_SET_PREFIX],
 [
   unset CDPATH
   dnl make $KDEDIR the default for the installation
@@ -3868,8 +4470,11 @@ AC_DEFUN(KDE_SET_PREFIX,
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
-    ac_configure_args="$ac_configure_args --prefix $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
 ])
@@ -3940,7 +4545,7 @@ pushdef([AC_PROG_INSTALL],
   fi
 ])dnl
 
-AC_DEFUN(KDE_LANG_CPLUSPLUS,
+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])
@@ -3951,7 +4556,7 @@ pushdef([AC_LANG_CPLUSPLUS],
 KDE_LANG_CPLUSPLUS
 ])
 
-AC_DEFUN(KDE_CHECK_LONG_LONG,
+AC_DEFUN([KDE_CHECK_LONG_LONG],
 [
 AC_MSG_CHECKING(for long long)
 AC_CACHE_VAL(kde_cv_c_long_long,
@@ -3963,6 +4568,7 @@ AC_CACHE_VAL(kde_cv_c_long_long,
   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
@@ -3970,172 +4576,778 @@ if test "$kde_cv_c_long_long" = yes; then
 fi
 ])
 
-AC_DEFUN(KDE_CHECK_LIB,
+AC_DEFUN([KDE_CHECK_LIB],
 [
+     kde_save_LDFLAGS="$LDFLAGS"
+     dnl AC_CHECK_LIB modifies LIBS, so save it here
      kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries"
+     LDFLAGS="$LDFLAGS $all_libraries"
      case $host_os in
-      aix*) LIBS="-brtl $LIBS"
-	test "$GCC" = yes && LIBS="-Wl,$LIBS"
+      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_CHECK_INITGROUPS,
-[ 
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS(initgroups)
-  if test "x$ac_cv_func_initgroups" = "xyes"; then
-    case $host_os in
-      aix*) AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-            AC_MSG_CHECKING([for initgroups prototype])
-            AC_CACHE_VAL(kde_cv_check_initgroups_proto,
-            [ AC_TRY_COMPILE(
-              [ #include <grp.h>
-              ],
-              [ char buffer[10];
-                gid_t id;
-                int x = initgroups(buffer,id);
-              ],
-              kde_cv_check_initgroups_proto=yes,
-              kde_cv_check_initgroups_proto=no)
-            ])
-            AC_MSG_RESULT($kde_cv_check_initgroups_proto)
-            AC_LANG_RESTORE
-            ;;
-      *)
-            kde_cv_check_initgroups_proto=yes
-            ;;
-    esac
-  else
-    kde_cv_check_initgroups_proto=no
-  fi
-  if test "x$kde_cv_check_initgroups_proto" = "xyes"; then
-    kde_check_initgroups_proto=1
-  else
-    kde_check_initgroups_proto=0
-  fi
-  AC_DEFINE_UNQUOTED(HAVE_INITGROUPS_PROTO,$kde_check_initgroups_proto,
-           [initgroups may exist but not its prototype (e.g. AIX<4.3.3:8)])
-])
-
-
-AC_DEFUN(KDE_CHECK_JAVA_DIR,
+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_MSG_CHECKING([for Java directory])
 
 AC_ARG_WITH(java,
-[  --with-java=javadir     use java installed in javadir, --without-java disables ],
+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_cv_java_bindir=no
-   kde_cv_java_includedir=no
-   kde_cv_java_libjvmdir=no
-   kde_cv_java_libhpidir=no
+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 -> look in $PATH
-    AC_CACHE_VAL(kde_cv_java_bindir,
-    [
-      dnl First look for javac in $PATH. If not found we'll look at the option.
-      KDE_FIND_PATH(javac, JAVAC, [], [])
+  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
-          kde_cv_java_bindir=`echo $JAVAC | sed -e 's,/javac$,/,'`
           dnl this substitution might not work - well, we test for jni.h below
-          kde_cv_java_includedir=`echo $kde_cv_java_bindir | sed -e 's,bin/$,include/,'`
+          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
       else
-          kde_cv_java_bindir=no
+          kde_java_includedir=no
       fi
-    ])
   else
     dnl config option set
-    kde_cv_java_bindir=$ac_java_dir/bin
-    kde_cv_java_includedir=$ac_java_dir/include
+    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 Look for libjvm.so
-kde_cv_java_libjvmdir=`find $kde_cv_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-dnl Look for libhpi.so and avoid green threads
-kde_cv_java_libhpidir=`find $kde_cv_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,'`
+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 At this point kde_cv_java_bindir and kde_cv_java_includedir are either set or "no"
-if test ! "x$kde_cv_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
 
-  if test ! -x "$kde_cv_java_bindir/javac"; then
-    AC_MSG_ERROR([javac not found under $kde_cv_java_bindir - it seems you passed a wrong --with-java.])
+  else
+    JAVAC=
+    jni_includes=
   fi
-  if test ! -x "$kde_cv_java_bindir/javah"; then
-    AC_MSG_ERROR([javah not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
+
+  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_cv_java_bindir/jar"; then
-    AC_MSG_ERROR([jar not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
+
+  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
-  if test ! -r "$kde_cv_java_includedir/jni.h"; then
-    AC_MSG_ERROR([jni.h not found under $kde_cv_java_includedir. Use --with-java or --without-java.])
+
+  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 ! -r "$kde_cv_java_libjvmdir/libjvm.so"; then
-    AC_MSG_ERROR([libjvm.so not found under $kde_cv_java_libjvmdir. Use --without-java.])
+
+  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
-  if test ! -r "$kde_cv_java_libhpidir/libhpi.so"; then
-    AC_MSG_ERROR([libhpi.so not found under $kde_cv_java_libhpidir. Use --without-java.])
+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
 
-  jni_includes="-I$kde_cv_java_includedir"
-  dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-  dnl and under linux here..
-  test -d "$kde_cv_java_includedir/linux" && jni_includes="$jni_includes -I$kde_cv_java_includedir/linux"
-  test -d "$kde_cv_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_cv_java_includedir/genunix"
+  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
 
-  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
-	    ],[ 
-	    ],[ AC_MSG_ERROR([Incorrect version of $kde_cv_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 ])
-	    ])
-
-  CXXFLAGS="$ac_cxxflags_safe"    
+  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
 
-  dnl All tests ok, inform and subst the variables
-  AC_MSG_RESULT([javac/javah/jar in $kde_cv_java_bindir, jni.h in $kde_cv_java_includedir])
+  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
 
-  JAVAC=$kde_cv_java_bindir/javac
-  AC_SUBST(JAVAC)
-  JAVAH=$kde_cv_java_bindir/javah
-  AC_SUBST(JAVAH)
-  JAR=$kde_cv_java_bindir/jar
-  AC_SUBST(JAR)
-  AC_SUBST(jni_includes)
-  JVMLIBS="-L$kde_cv_java_libjvmdir -ljvm -L$kde_cv_java_libhpidir -lhpi"
-  AC_SUBST(JVMLIBS)
 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
index 514f22a..e639c0a 100644
--- a/admin/am_edit
+++ b/admin/am_edit
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
 # Expands the specialised KDE tags in Makefile.in to (hopefully) valid
 # make syntax.
@@ -18,7 +18,7 @@
 #    KDE_ICON = AUTO
 #
 # For documentation :
-#    ...
+#    http://developer.kde.org/documentation/other/developer-faq.html
 #
 # and more new tags TBD!
 #
@@ -31,22 +31,7 @@
 # Alex Zepeda  <jazepeda@pacbell.net>
 # David Faure <faure@kde.org>
 # Stephan Kulow <coolo@kde.org>
-#
-# I've puddled around with automoc and produced something different
-# 1999-02-01 John Birch <jb.nz@writeme.com>
-#       * Rewritten automoc to cater for more than just moc file expansion
-#         Version 0.01 does the same as automoc at this stage.
-# 1999-02-18 jb
-#       * We must always write a Makefile.in file out even if we fail
-#         because we need the "perl autokmake" in the AUTOMAKE so that a
-#         "make" will regenerate the Makefile.in correctly.
-#         Reworked moc file checking so that missing includes in cpp
-#         will work and includes in cpp when using use_automoc will also
-#         work.
-# 1999-02-23 jb
-#       * Added POFILE processing and changed the USE_AUTOMOC tag to
-#         AUTO instead.
-# ... See ChangeLog for more logs
+# Dirk Mueller <mueller@kde.org>
 
 use Cwd;
 use File::Find;
@@ -66,6 +51,7 @@ sub findMocCandidates ();
 sub pruneMocCandidates ($);
 sub checkMocCandidates ();
 sub addMocRules ();
+sub findKcfgFile($);
 
 sub tag_AUTOMAKE ();
 sub tag_META_INCLUDES ();
@@ -75,10 +61,14 @@ 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
@@ -98,6 +88,7 @@ $use_final  = 1;        # create code for --enable-final
 $cleantarget = "clean";
 $dryrun     = 0;
 $pathoption = 0;
+$foreign_libtool = 0;
 
 while (defined ($ARGV[0]))
 {
@@ -114,6 +105,7 @@ while (defined ($ARGV[0]))
                 "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;
     }
@@ -121,26 +113,27 @@ while (defined ($ARGV[0]))
     {
         $verbose = 1;       # Oh is there a problem...?
     }
-    elsif (/^-p(.+)$|^--path=(.+)$/)
+    elsif (/^(?:-p|--path=)(.+)$/)
     {
-        $thisProg = "$1/".basename($thisProg) if($1);
-        $thisProg = "$2/".basename($thisProg) if($2);
+        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 from automake\n",
-                "(where dir can be a full or relative directory name)",
+                "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",
-	        "  --no-final         don't patch for --enable-final\n",
-                "                     called from is not the one to be used\n";
+                "                     called from is not the one to be used\n",
+	        "  --no-final         don't patch for --enable-final\n";
 	
         exit 0;
     }
@@ -149,6 +142,11 @@ while (defined ($ARGV[0]))
 	$use_final = 0;
         $thisProg .= " --no-final";
     }
+    elsif (/^--foreign-libtool$/)
+    {
+        $foreign_libtool = 1;
+        $thisProg .= " --foreign-libtool";
+    }
     elsif (/^-n$/)
     {
     	$dryrun = 1;
@@ -178,7 +176,7 @@ if (!@makefiles)
     find (\&add_makefile, cwd());
     #chdir('$topdir');
 } else {
-    print STDOUT "Using user enter input files\n"   if ($verbose);
+    print STDOUT "Using input files specified by user\n"   if ($verbose);
 }
 
 foreach $makefile (sort(@makefiles))
@@ -217,6 +215,8 @@ sub processMakefile ($)
     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
@@ -224,23 +224,28 @@ sub processMakefile ($)
     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 $alluis = "";
     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 %depedmocs = ();
+    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;
@@ -248,24 +253,37 @@ sub processMakefile ($)
     $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;
-        $depedmocs{$program} = "";
+        $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
-	tag_UIFILES();             # Sorts out ui rules
         if ($sources_changed{$program}) {
-            my $lookup = "$program" . '_SOURCES\s*=\s*(.*)';
-            substituteLine($lookup, "$program\_SOURCES=" . $sources{$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 = ();
@@ -295,7 +313,8 @@ sub processMakefile ($)
         appendLines ("$cleantarget-metasources:\n\t-rm -f $cleanMoc\n");
         $target_adds{"$cleantarget-am"} .= "$cleantarget-metasources ";
     }
-    tag_DIST();
+    
+    tag_DIST() unless ($kdeopts{"noautodist"});
 
     if ($idl_output) {
         appendLines ("$cleantarget-idl:\n\t-rm -f $idl_output\n");
@@ -307,6 +326,11 @@ sub processMakefile ($)
         $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 ";
@@ -328,113 +352,154 @@ sub processMakefile ($)
     $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.*=[^\n]*";
-        
+        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};
         }
-        substituteLine ($lookup, $new);
+        if($MakefileData =~ m/\n$lookup/) {
+            substituteLine ($lookup, $new);
+        }
+        else {
+            appendLines("$new\n");
+        }
     }
-    appendLines($final_lines . "all-am");
-    appendLines($nofinal_lines . "all-am");
-    
-    my $lookup = 'DEP_FILES\s*=([^\n]*)';
-    if ($MakefileData =~ /\n$lookup\n/o) {
-        $depfiles = $1;
-        
+    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) {
-            $lines  = "\@KDE_USE_FINAL_TRUE\@DEP_FILES = $dep_files $dep_finals \034\t$depfiles\n";
-            $lines .= "\@KDE_USE_FINAL_FALSE\@DEP_FILES = $dep_files $depfiles\n";
+            # 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 {
-            $lines = "DEP_FILES = $dep_files $depfiles\n";
+            $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) -f \$(top_srcdir)/admin/Makefile.common 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";
-      my $lookup = "install-data-am:\s*(.*)";
-      if ($MakefileData =~ /\n$lookup\n/) {
-        my $newdeps = $1;
-	$newdeps =~ s/\s*install-kde_moduleLTLIBRARIES\s*/ /g;
-	substituteLine($lookup, "install-data-am: " . $newdeps);
+#      $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) . ":\s*(.*)";
+	my $lookup = quotemeta($add) . ':([^\n]*)';
         if ($MakefileData =~ /\n$lookup\n/) {
-            substituteLine($lookup, "$add: " . $target_adds{$add} . $1);
+	  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";
+	  $lines .= "$add: " . $target_adds{$add} . "\n";
         }
     }
-    if ($lines) {
-        appendLines($lines);
-    }
+
+    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 $vor = $1;   # "vor" means before in German
-            my $nach = $2; # "nach" means after in German
+            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 = "$vor\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$nach";
+            $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
             substituteLine($lookup, $replacement);
         } else {
             $found = 0;
         }
     }
 
-    $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=link) (\$\(CXXLD\).*\$\(KCXXFLAGS\))';
-    
-    if ($MakefileData =~ m/$lookup/ ) {
-        $MakefileData =~ s/$lookup/$1 --tag=CXX $2/;
-    }
+    if($foreign_libtool == 0) {
+        $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=link) (\$\(CXXLD\).*\$\(KCXXFLAGS\))';
 
-    $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=compile) (\$\(CXX\).*\$\(KCXXFLAGS\))';
-    if ($MakefileData =~ m/$lookup/ ) {
-        $MakefileData =~ s/$lookup/$1 --tag=CXX $2/;
+        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;
@@ -451,6 +516,16 @@ sub processMakefile ($)
 
 #-----------------------------------------------------------------------------
 
+# 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.
@@ -463,8 +538,10 @@ sub initialise ()
     }
 
     # Checking for files to process...
-    open (FILEIN, $makefile)
-      || die "Could not open $makefileDir/$makefile: $!\n";
+
+    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
@@ -477,6 +554,8 @@ sub initialise ()
 
     # 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...
@@ -491,10 +570,15 @@ sub initialise ()
     %kdeopts = ();
     $kdeopts{"foreign"} = 0;
     $kdeopts{"qtonly"} = 0;
+    $kdeopts{"noautodist"} = 0;
+    $kdeopts{"foreign-libtool"} = $foreign_libtool;
     $kdeopts{"nofinal"} = !$use_final; # default
 
-    if ($MakefileData =~ /\nKDE_OPTIONS\s*=\s*([^\n]*)\n/) {
-        local @kde_options = split(/[\s\034]/, $1);
+    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
@@ -521,7 +605,8 @@ sub initialise ()
       }
 
     while ($MakefileData =~ /\n\.SUFFIXES:([^\n]+)\n/g) {
-	my @list=split(' ', $1);
+	my $suffixes_str = $1;
+	my @list=split(' ', $suffixes_str);
 	foreach $ext (@list) {
 	    if ($ext =~ /^\.$cppExt$/) {
 		$cxxsuffix = $ext;
@@ -531,36 +616,47 @@ sub initialise ()
 	    }
 	}
     }
-                                                     
-    while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=[ \t\034]*([^\n]*)\n/g) {
-        
+
+    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(/[\s\034]+/, $objs);
+
+        my @objlist = split(/[\034\s]+/, $objs);
         foreach $obj (@objlist) {
-            if ($obj =~ /\$\((\S+)\)/ ) {
-                my $variable = $1;
-                if ($variable !~ 'OBJEXT') {
+            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$program\_SOURCES\s*=\s*(.*)\n/) {
+
+        if ($MakefileData =~ /\n$sourceprogram\_SOURCES\s*=[ \t]*(.*)\n/) {
             $sources{$program} = $1;
-        } else {
+        } 
+        else {
             $sources{$program} = "";
             print STDERR "found program with no _SOURCES: $program\n";
         }
@@ -574,21 +670,18 @@ sub initialise ()
             $realname{$program} = "";
         }
     }
-    
-    my $lookup = '\nDEPDIR\s*=.*';
-    if ($MakefileData !~ /($lookup)\n/o) {
-        $lookup = '\nbindir\s*=.*';
-        if ($MakefileData =~ /($lookup)\n/) {
-            substituteLine ($lookup, "DEPDIR = .deps\n$1");
-        }
-    } else {
-        print STDERR "$printname defines DEPDIR. This means you're using automake > 1.4 - this is not supported!\n";
+
+    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*=\s*([^\n]*)/g) {
-            foreach $file (split('[\034\s]', $2)) {
+        while ($MakefileData =~ /\n($mark)\s*=[ \t]*([^\n]*)/g) {
+	    my $clean_str = $2; 
+            foreach $file (split('[\034\s]+', $clean_str)) {
                 $file =~ s/\.\///;
                 push(@cleanfiles, $file);
             }
@@ -607,15 +700,14 @@ sub initialise ()
 # header files could be located.
 sub tag_META_INCLUDES ()
 {
-    my $lookup = '[^=\n]*META_INCLUDES\s*=\s*(.*)';
-    return 1    if ($MakefileData !~ /($lookup)\n/o);
+    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);
 
-    $headerStr =~ tr/\034/ /;
-    my @headerlist = split(' ', $headerStr);
+    my @headerlist = split(/[\034\s]+/, $headerStr);
 
     foreach $dir (@headerlist)
     {
@@ -646,47 +738,62 @@ sub tag_FINAL()
             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 $mocsources = "";
-        
-        my @progsources = split(/[\s\034]+/, $sources{$program});
+        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/;
             
-            if (defined($sourcelist{$suffix})) {
-                $sourcelist{$suffix} .= " " . $source;
+            $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{$suffix} .= $source;
-            }
+		$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. (ie Just check the files suffix against
+            # 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)$/) {
-              $cxx_suffix = $1;
+              $cxxsuffix = $1;
               $suffix_is_cxx = 1;
             }
             
-            my $mocfiles_in = ($suffix eq $cxxsuffix) &&
-              defined($depedmocs{$program});
+            my $mocfiles_in = ($suffix eq $cxxsuffix) && $moc_cpp_added;
             
-            my @sourcelist = split(/[\s\034]+/, $sourcelist{$suffix});
+            my @sourcelist = split(/[\034\s]+/, $sourcelist{$suffix});
             
             if ((@sourcelist == 1 && !$mocfiles_in) || $suffix_is_cxx != 1 ) {
                 
                 # we support IDL on our own
-                if ($suffix =~ /^skel$/ || $suffix =~ /^stub/ || $suffix =~ /^h$/
-                    || $suffix =~ /^ui$/ ) {
+                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;
@@ -702,43 +809,36 @@ sub tag_FINAL()
             my $source_deps = "";
             foreach $source (@sourcelist) {
                 if (-f $source) {
-                    $source_deps .= "\$(srcdir)/$source ";
+                    $source_deps .= " \$(srcdir)/$source";
                 } else {
-                    $source_deps .= "$source ";
+                    $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 . " ";
-            
-            if ($mocfiles_in) {
-                $handling .= $depedmocs{$program};
-                foreach $mocfile (split(' ', $depedmocs{$program})) {
-                    if ($mocfile =~ m/\.$suffix$/) {
-                        $mocsources .= " " . $mocfile;
-                    }
-                }
-            }
-            
-            $handling .= "\n";
+
+            $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} . " $mocsources; do \\\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 .= "\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");
-            $finalObjs{$program} .= "$program.all_$suffix.";
+            my $finalObj = "$program.all_$suffix.";
             if ($program =~ /_la$/) {
-                $finalObjs{$program} .= "lo ";
+                $finalObj .= "lo";
             } else {
-                $finalObjs{$program} .= "o ";
+                $finalObj .= "o";
             }
+	    $finalObjs{$program} .= $finalObj . " ";
         }
     }
     
@@ -756,12 +856,216 @@ sub tag_FINAL()
     }
 }
 
+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 @deped            = ();  # here we add to create moc files
+    local @depend           = ();  # here we add to create moc files
     local $mocExt           = ".moc";
     local %mocFiles         = ();
 
@@ -770,7 +1074,6 @@ sub tag_METASOURCES ()
 
     my $lookup;
     my $found = "";
-
     if ($metasourceTags > 1) {
 	$lookup = $program . '_METASOURCES\s*=\s*(.*)';
 	return 1    if ($MakefileData !~ /\n($lookup)\n/);
@@ -779,7 +1082,7 @@ sub tag_METASOURCES ()
 	$lookup = $program . '_METASOURCES\s*=\s*(.*)';
 	if ($MakefileData !~ /\n($lookup)\n/) {
 	    $lookup = 'METASOURCES\s*=\s*(.*)';
-	    return 1    if ($MakefileData !~ /\n($lookup)\n/o);
+	    return 1    if ($MakefileData !~ /\n($lookup)\n/);
 	    $found = $1;
 	    $metasourceTags = 0; # we can use the general target only once
 	} else {
@@ -819,15 +1122,15 @@ sub tag_METASOURCES ()
     if (@newObs) {
         my $ext =  ($program =~ /_la$/) ? ".moc.lo " : ".moc.o ";
         $realObjs{$program} .= "\034" . join ($ext, @newObs) . $ext;
-        $depedmocs{$program} = join (".moc.$cxxsuffix " , @newObs) . ".moc.$cxxsuffix";
+        $dependmocs{$program} = join (".moc.$cxxsuffix " , @newObs) . ".moc.$cxxsuffix";
         foreach $file (@newObs) {
-            $dep_files .= " \$(DEPDIR)/$file.moc.P";
+            $dep_files .= " \$(DEPDIR)/$file.moc.P" if($dep_files !~/$file.moc.P/);
         }
     }
-    if (@deped) {
-        $depedmocs{$program} .= " ";
-        $depedmocs{$program} .= join('.moc ', @deped) . ".moc";
-        $depedmocs{$program} .= " ";
+    if (@depend) {
+        $dependmocs{$program} .= " ";
+        $dependmocs{$program} .= join('.moc ', @depend) . ".moc";
+        $dependmocs{$program} .= " ";
     }
     addMocRules ();
     @globalmocs{keys %mocFiles}=values %mocFiles;
@@ -839,13 +1142,21 @@ sub tag_METASOURCES ()
 # Errors are logged in the global $errorflags
 sub tag_AUTOMAKE ()
 {
-    my $lookup = '.*cd \$\(top_srcdir\)\s+&&\s+\$\(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;
 }
 
@@ -894,7 +1205,7 @@ sub tag_SUBDIRS ()
     return 1;
   }
 
-  my $subdirs;
+  my $subdirs = ".";
 
   opendir (THISDIR, ".");
   foreach $entry (readdir(THISDIR)) {
@@ -906,8 +1217,7 @@ sub tag_SUBDIRS ()
   }
   closedir (THISDIR);
 
-  my $lines = "SUBDIRS =$subdirs\n";
-  substituteLine('SUBDIRS\s*=.*', $lines);
+  substituteLine('SUBDIRS\s*=.*', "SUBDIRS =$subdirs");
   return 0;
 }
 
@@ -918,25 +1228,25 @@ sub tag_IDLFILES ()
     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 ($source =~ m/\.stub$/ || $skel) {
-            
+        if ($stub || $skel || $signals) {
+
             my $qs = quotemeta($source);
             $sources{$program} =~ s/$qs//;
             $sources_changed{$program} = 1;
-            
-            print STDOUT "adding IDL file $source\n" if ($verbose);
-            
-            $source =~ s/\.(stub|skel)$//;
-            
+
+            $source =~ s/\.(stub|skel|signals)$//;
             my $sourcename;
-            
+
             if ($skel) {
                 $sourcename = "$source\_skel";
-            } else {
+            } elsif ($stub) {
                 $sourcename = "$source\_stub";
+            } else {
+                $sourcename = "$source\_signals";
             }
             
             my $sourcedir = '';
@@ -951,21 +1261,32 @@ sub tag_IDLFILES ()
             
             if ($allidls !~ /$source\_kidl/) {
                 
-                $dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOPIDL_DEPENDENCIES)\n";
-                $dep_lines .= "\t\$(DCOPIDL) $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; /bin/false )\n";
+                $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-stub $source.kidl\n";
-                } else {
+                    $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 .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-skel $source.kidl\n";
+                    $dep_lines .= $dep_lines_tmp;
                 }
                 
                 $allidls .= $sourcename . " ";
@@ -985,7 +1306,7 @@ sub tag_IDLFILES ()
             push(@cleanfiles, "$sourcename.$cxxsuffix");
             push(@cleanfiles, "$sourcename.h");
             push(@cleanfiles, "$sourcename.kidl");
-            $dep_files .= " \$(DEPDIR)/$sourcename.P";
+            $dep_files .= " \$(DEPDIR)/$sourcename.P" if ($dep_files !~/$sourcename.P/);
         }
     }
     if ($dep_lines) {
@@ -1015,7 +1336,6 @@ sub tag_IDLFILES ()
 sub tag_UIFILES ()
 {
     my @psources = split(/[\034\s]+/, $sources{$program});
-    my $dep_lines = "";
     my @depFiles = ();
     
     foreach $source (@psources) {
@@ -1035,24 +1355,30 @@ sub tag_UIFILES ()
                 $sourcedir = '$(srcdir)/';
             }
 
-            if ($alluis !~ /$source/) {
+            if (!$uiFiles{$source}) {
 
-                $dep_lines .= "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n";
+                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";
-                    $dep_lines .= "\t\$(UIC) -tr i18n -i $source.h $sourcedir$source.ui | sed -e \"s,i18n( \\\"\\\" ),QString::null,g\" >> $source.$cxxsuffix || rm -f $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 || rm -f $source.$cxxsuffix\n";
+                    $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
                 }
-                $dep_lines .= "\techo '#include \"$source.moc\"' >> $source.$cxxsuffix\n\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";
 
-                $alluis .= "$source ";
-                $depedmocs{$program} .= " $source.moc";
+                $rule_adds{"$source.$cxxsuffix"} = $dep_lines;
+
+		$uiFiles{$source} = 1;
+                $dependmocs{$program} .= " $source.moc";
                 $globalmocs{$source} = "\035$source.h\035$source.cpp";
             }
             
@@ -1066,24 +1392,76 @@ sub tag_UIFILES ()
             $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.h");
             push(@cleanfiles, "$source.moc");
-
-            $dep_files .= " \$(DEPDIR)/$source.P";
+            $dep_files .= " \$(DEPDIR)/$source.P" if($dep_files !~/$source.P/ );
         }
     }
-    if ($dep_lines) {
-        appendLines($dep_lines);
+}
+
+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*=\s*([^\n]*)';
+    my $lookup = '([^\s]*)_ICON\s*=[ \t]*(.*)';
     my $install = "";
     my $uninstall = "";
 
-    while ($MakefileData =~ /\n$lookup/og) {
+    while ($MakefileData =~ /\n$lookup/g) {
         my $destdir;
         if ($1 eq "KDE") {
             $destdir = "kde_icondir";
@@ -1093,7 +1471,8 @@ sub tag_ICON()
         my $iconauto = ($2 =~ /AUTO\s*$/);
         my @appnames = ();
         if ( ! $iconauto ) {
-            my @_appnames = split(" ", $2);
+	    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));
@@ -1110,11 +1489,11 @@ sub tag_ICON()
             if ( $iconauto )
               {
                   push(@files, $entry)
-                    if ($entry =~ /\.xpm/ || $entry =~ /\.png/);
+                    if ($entry =~ /\.xpm/ || $entry =~ /\.png/ || $entry =~ /\.mng/ || $entry =~ /\.svg/);
               } else {
                   foreach $appname (@appnames) {
                       push(@files, $entry)
-                        if ($entry =~ /-$appname\.xpm/ || $entry =~ /-$appname\.png/);
+                        if ($entry =~ /-$appname\.xpm/ || $entry =~ /-$appname\.png/ || $entry =~ /-$appname\.mng/ || $entry =~ /-$appname\.svg/);
                   }
               }
         }
@@ -1125,7 +1504,7 @@ sub tag_ICON()
         foreach $file (@files) {
             my $newfile = $file;
             my $prefix = $file;
-            $prefix =~ s/\.(png|xpm)$//;
+            $prefix =~ s/\.(png|xpm|mng|svg|svgz)$//;
             my $appname = $prefix;
             $appname =~ s/^[^-]+-// if ($appname =~ /-/) ;
             $appname =~ s/^[^-]+-// if ($appname =~ /-/) ;
@@ -1150,12 +1529,12 @@ sub tag_ICON()
                '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',
@@ -1170,10 +1549,18 @@ sub tag_ICON()
                'hi32' => 'hicolor/32x32',
                'hi48' => 'hicolor/48x48',
                'hi64' => 'hicolor/64x64',
-               'hisc' => 'hicolor/scalable'
+               '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?))@$1@;
+            $newfile =~ s@.*-($appname\.(png|xpm|mng|svgz|svg?))@$1@;
             
             if (! defined $dir_hash{$prefix}) {
                 print STDERR "unknown icon prefix $prefix in $printname\n";
@@ -1226,7 +1613,7 @@ sub handle_POFILES($$)
     }
   appendLines ($tmp);
   my $lookup = 'POFILES\s*=([^\n]*)';
-  if ($MakefileData !~ /\n$lookup/o) {
+  if ($MakefileData !~ /\n$lookup/) {
     appendLines("$pofileLine\nGMOFILES =$allgmofiles");
   } else {
     substituteLine ($lookup, "$pofileLine\nGMOFILES =$allgmofiles");
@@ -1239,8 +1626,8 @@ sub handle_POFILES($$)
 
 	$target_adds{"maintainer-clean"} .= "clean-nls ";
 
-	$lookup = 'DISTFILES\s*=\s*(.*)';
-	if ($MakefileData =~ /\n$lookup\n/o) {
+	$lookup = 'DISTFILES\s*=[ \t]*(.*)';
+	if ($MakefileData =~ /\n$lookup/) {
 	  $tmp = "DISTFILES = \$(GMOFILES) \$(POFILES) $1";
 	  substituteLine ($lookup, $tmp);
 	}
@@ -1262,11 +1649,15 @@ sub handle_POFILES($$)
   $tmp .= "; do \\\n";
   if ($lang) {
     $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
-    $tmp .= "\t  test ! -f \$\$base.gmo || \$(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  test ! -f \$\$base.gmo || \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\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);
@@ -1316,7 +1707,7 @@ sub handle_POFILES($$)
 sub tag_POFILES ()
 {
     my $lookup = 'POFILES\s*=([^\n]*)';
-    return 1    if ($MakefileData !~ /\n$lookup/o);
+    return 1    if ($MakefileData !~ /\n$lookup/);
     print STDOUT "POFILES processing <$1>\n"   if ($verbose);
 
     my $tmp = $1;
@@ -1334,11 +1725,10 @@ sub tag_POFILES ()
     if ($tmp =~ /^\s*AUTO\s*$/)
     {
         opendir (THISDIR, ".");
-	next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^#.*#$/);
 	$pofiles =  join(" ", grep(/\.po$/, readdir(THISDIR)));
         closedir (THISDIR);
         print STDOUT "pofiles found = $pofiles\n"   if ($verbose);
-	if (-f "charset" && -f "kdelibs.po") {
+	if (-f "charset" && -f "kdelibs/kdelibs.po") {
 	    handle_TOPLEVEL();
 	}
     }
@@ -1356,14 +1746,15 @@ sub tag_POFILES ()
 
 sub helper_LOCALINSTALL($)
 {
-  my $lookup = "\n" . $_[0] . ":";
-  if ($MakefileData =~ /($lookup)/) {
+  my $lookup = "\035" . $_[0] . " *:[^\035]*\035\t";
+  my $copy = $MakefileData;
+  $copy =~ s/\n/\035/g;
+  if ($copy =~ /($lookup.*)$/) {
 
-    my $install = $MakefileData;
-    $install =~ s/\n/\035/g;
-    $install =~ s/.*\035$_[0]:[^\035]*\035//;
+    $install = $1;
+    $install =~ s/\035$_[0] *:[^\035]*\035//;
     my $emptyline = 0;
-    while (! $emptyline) {
+    while (! $emptyline ) {
       if ($install =~ /([^\035]*)\035(.*)/) {
 	local $line = $1;
 	$install = $2;
@@ -1396,7 +1787,7 @@ sub replaceDestDir($) {
       || $line =~ /^\s*(\@.*\@)*\s*\$\(INSTALL\S*\)/
       || $line =~ /^\s*(\@.*\@)*\s*(-?rm.*) \S*$/)
   {
-    $line =~ s/^(.*) ([^\s]*)\s*$/$1 \$(DESTDIR)$2/ if ($line !~ /\$\(DESTDIR\)/);
+    $line =~ s/^(.*) ([^\s]+)\s*$/$1 \$(DESTDIR)$2/ if ($line !~ /\$\(DESTDIR\)/);
   }
 
   if ($line ne $_[0]) {
@@ -1406,11 +1797,35 @@ sub replaceDestDir($) {
 }
 
 #---------------------------------------------------------------------------
+# 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/ &&
@@ -1418,11 +1833,12 @@ sub tag_CLOSURE () {
         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\$\(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";
@@ -1436,28 +1852,75 @@ sub tag_CLOSURE () {
     $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 =~ /^Makefile$$/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/);
+        next if ($entry eq "CVS" || $entry =~ /^\./  || $entry eq "Makefile" || $entry =~ /~$/ || $entry =~ /^\#.*\#$/);
         next if (! -f $entry);
-        next if ($entry =~ /\.moc/ || $entry =~ /\.lo$/ || $entry =~ /\.la$/ || $entry =~ /\.o/);
+        next if ($entry =~ /\.moc/ || $entry =~ /\.moc.$cppExt$/ || $entry =~ /\.lo$/ || $entry =~ /\.la$/ || $entry =~ /\.o/);
+        next if ($entry =~ /\.all_$cppExt\.$cppExt$/);
         $foundfiles{$entry} = 1;
     }
     closedir (THISDIR);
 
-    my @marks = ("EXTRA_DIST", "DIST_COMMON", '\S*_SOURCES', '\S*_HEADERS', 'MAINTAINERCLEANFILES', 'CLEANFILES', 'DISTCLEANFILES', '\S*_OBJECTS');
+    # 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*=\s*([^\n]*)/g) {
-            foreach $file (split('[\034\s]', $2)) {
+        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");
+                 "stamp-h1", "stamp-h1", "config.h", "Makefile", 
+                 "config.status", "config.h", "libtool", "core" );
     foreach $file (@files) {
         $foundfiles{$file} = 0 if (defined $foundfiles{$file});
     }
@@ -1470,10 +1933,11 @@ sub tag_DIST () {
     }
     if ($KDE_DIST) {
         print "KDE_DIST $printname $KDE_DIST\n" if ($verbose);
-        
-        my $lookup = "DISTFILES *=(.*)";
-        if ($MakefileData =~ /\n$lookup\n/o) {
-            substituteLine($lookup, "KDE_DIST=$KDE_DIST\n\nDISTFILES=$1 \$(KDE_DIST)\n");
+
+        my $lookup = 'DISTFILES\s*=[ \t]*(.*)';
+        if ($MakefileData =~ /\n$lookup/) {
+            substituteLine($lookup, "DISTFILES = $1 \$(KDE_DIST)");
+            appendLines("KDE_DIST=$KDE_DIST\n");
         }
     }
 }
@@ -1483,20 +1947,10 @@ sub tag_DIST () {
 # Errors are logged in the global $errorflags
 sub tag_DOCFILES ()
 {
-#    if ($MakefileData =~ /\nSUBDIRS\s*=/) { # subdirs
-#      $MakefileData =~ /\n(.*-recursive:\s*)\n/;
-#      my $orig_rules = $1;
-#      my $rules = $orig_rules;
-#      $rules =~ s/:\s*$//;
-#      substituteLine($orig_rules, "$rules docs-recursive:");
-#      appendLines("docs: docs-recursive docs-am\n");
-#    } else {
-#      appendLines("docs: docs-am\n");
-#    }
     $target_adds{"all"} .= "docs-am ";
 
-    my $lookup = 'KDE_DOCS\s*=\s*([^\n]*)';
-    goto nodocs    if ($MakefileData !~ /\n$lookup/o);
+    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;
@@ -1518,7 +1972,7 @@ sub tag_DOCFILES ()
     {
         opendir (THISDIR, ".");
 	foreach $entry (readdir(THISDIR)) {
-	  next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/);
+	  next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry eq "core" || $entry eq "index.cache.bz2");
 	  next if (! -f $entry);
 	  $files .= "$entry ";
 	}
@@ -1534,7 +1988,7 @@ sub tag_DOCFILES ()
     goto nodocs if (!$files);        # Nothing to do
 
     if ($files =~ /(^| )index\.docbook($| )/) {
-      
+
       my $lines = "";
       my $lookup = 'MEINPROC\s*=';
       if ($MakefileData !~ /\n($lookup)/) {
@@ -1550,14 +2004,17 @@ sub tag_DOCFILES ()
          $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 .= "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";
@@ -1577,7 +2034,7 @@ sub tag_DOCFILES ()
       appendLines("docs-am: $files\n");
     }
 
-    $target_adds{"install-data-am"} .= "install-nls";
+    $target_adds{"install-data-am"} .= "install-nls ";
     $target_adds{"uninstall"} .= "uninstall-nls ";
 
     $tmp = "install-nls:\n";
@@ -1588,13 +2045,13 @@ sub tag_DOCFILES ()
     $tmp .= "\tdone\n";
     if ($appname eq 'common') {
       $tmp .= "\t\@echo \"merging common and language specific dir\" ;\\\n";
-      $tmp .= "\tif test ! -e \$(kde_htmldir)/en/common/kde-common.css; then echo 'no english docs found in \$(kde_htmldir)/en/common/'; exit 1; fi \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 ! -e \$\$p && echo \$(LN_S) ../../en/common/\$\$p \$(DESTDIR)\$(kde_htmldir)/$kdelang/common/\$\$p && \$(LN_S) ../../en/common/\$\$p \$\$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";
     }
@@ -1626,14 +2083,17 @@ sub tag_DOCFILES ()
 # are candidates for "moc-ing".
 sub findMocCandidates ()
 {
-    my @list = ();
     foreach $dir (@headerdirs)
     {
+        my @list = ();
         opendir (SRCDIR, "$dir");
-        @hFiles = grep { /.+\.$hExt$/o } readdir(SRCDIR);
+        @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);
@@ -1642,8 +2102,9 @@ sub findMocCandidates ()
             read HFIN, $hfData, $hfsize;
             close HFIN;
             # push (@list, $hf) if(index($hfData, "Q_OBJECT") >= 0); ### fast but doesn't handle //Q_OBJECT
-            if ( $hfData =~ /{([^}]*)Q_OBJECT/s ) {              ## handle " { friend class blah; Q_OBJECT "
-                push (@list, $hf) unless $1 =~ m://[^\n]*Q_OBJECT[^\n]*$:s;  ## 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
@@ -1652,8 +2113,8 @@ sub findMocCandidates ()
             $hFile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
             if ($mocFiles{$1})
             {
-                print STDERR "Warning: Multiple header files found for $1\n";
-                next;                           # Use the first one
+              print STDERR "Warning: Multiple header files found for $1\n";
+              next;                           # Use the first one
             }
             $mocFiles{$1} = "$dir\035$hFile";   # Add relative dir
         }
@@ -1671,7 +2132,7 @@ sub findMocCandidates ()
 sub pruneMocCandidates ($)
 {
     my %prunedMoc = ();
-    local @mocList = split(' ', @_[0]);
+    local @mocList = split(' ', $_[0]);
 
     foreach $mocname (@mocList)
     {
@@ -1707,7 +2168,8 @@ sub checkMocCandidates ()
     return unless (keys %mocFiles);
     opendir(THISDIR, ".") || return;
     @cppFiles = grep { /.+\.$cppExt$/o  && !/.+\.moc\.$cppExt$/o
-                         && !/.+\.all_$cppExt\.$cppExt$/o } readdir(THISDIR);
+                         && !/.+\.all_$cppExt\.$cppExt$/o
+			 && !/^\./  } readdir(THISDIR);
     closedir THISDIR;
     return unless (@cppFiles);
     my $files = join (" ", @cppFiles);
@@ -1731,7 +2193,7 @@ sub checkMocCandidates ()
 	@cppFiles = keys %{$moc2cpp->{"$mocFile.moc"}};
         if (@cppFiles == 1) {
             $mocFiles{$mocFile} .= "\035" . $cppFiles[0];
-	    push(@deped, $mocFile);
+	    push(@depend, $mocFile);
         } elsif (@cppFiles == 0) {
             push (@newObs, $mocFile);           # Produce new object file
             next    if ($haveAutomocTag);       # This is expected...
@@ -1769,18 +2231,58 @@ sub addMocRules ()
         $dir =~ s#^\.#\$(srcdir)#;
         if (defined ($cppFile))
         {
-            $target_adds{"\$(srcdir)/$cppFile"} .= "$mocFile.moc ";
-            appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile.moc\n");
-            $cleanMoc .= " $mocFile.moc";
+	  $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"});
@@ -1790,8 +2292,8 @@ sub make_meta_classes ()
     my $moc_class_headers = "";
     foreach $program (@programs) {
 	my $mocs = "";
-	my @progsources = split(/[\s\034]+/, $sources{$program});
-	my @depmocs = split(' ', $depedmocs{$program});
+	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;
@@ -1802,9 +2304,7 @@ sub make_meta_classes ()
 	print STDOUT "globalmocs=[".join(' ', keys(%globalmocs))."]\n" if ($verbose);
 	foreach my $mocFile (keys (%globalmocs))
 	{
-	    undef $cppFile;
-	    ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
-	    $dir =~ s#^\.#\$(srcdir)#;
+	    my ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
 	    if (defined ($cppFile))
 	    {
 		$mocs .= " $mocFile.moc" if exists $shash{$cppFile};
@@ -1814,7 +2314,7 @@ sub make_meta_classes ()
 		# 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 %depedmocs. If the user wants to use AUTO he can't just
+		# 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
@@ -1825,28 +2325,6 @@ sub make_meta_classes ()
 	}
 	if ($mocs) {
 	    print STDOUT "==> mocs=[".$mocs."]\n" if ($verbose);
-	    my $sourcename = $program."_meta_unload";
-	    my $ext = ($program =~ /_la$/) ? ".lo" : ".o";
-	    my $srcfile = $sourcename.".$cxxsuffix";
-	    my $objfile = $sourcename.$ext;
-	    $moc_class_headers .= " $srcfile";
-	    my $appl;
-	    $appl  = "$srcfile: $mocs\n";
-	    $appl .= "\t\@echo 'creating $srcfile'\n";
-	    $appl .= "\t\@-rm -f $srcfile\n";
-	    $appl .= "\t\@echo 'static const char * _metalist_$program\[\] = {' > $srcfile\n";
-	    $appl .= "\t\@cat $mocs | grep 'char.*className' | ";
-	    $appl .=  "sed -e 's/.*[^A-Za-z0-9_:]\\([A-Za-z0-9_:]*\\)::className.*\$\$/\\\"\\1\\\",/' | sort | uniq >> $srcfile\n";
-	    $appl .= "\t\@echo '0};' >> $srcfile\n";
-	    $appl .= "\t\@echo '#include <kunload.h>' >> $srcfile\n";
-	    $appl .= "\t\@echo '_UNLOAD($program)' >> $srcfile\n";
-		$appl .= "\n";
-	    
-	    $realObjs{$program} .= " \034" . $objfile . " ";
-	    $sources{$program} .= " $srcfile";
-            $sources_changed{$program} = 1;
-            $dep_files .= " \$(DEPDIR)/$sourcename.P";
-	    appendLines ($appl);
 	}
 	print STDOUT "\n" if $verbose;
     }
@@ -1865,8 +2343,15 @@ sub updateMakefile ()
     open (FILEOUT, "> $makefile")
                         || die "Could not create $makefile: $!\n";
 
-    print FILEOUT "\# $progId - " . '$Revision: 1.7 $ '  . "\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;
 }
@@ -1895,11 +2380,11 @@ sub substituteLine ($$)
     if ($MakefileData =~ /\n($lookup)/) {
       $old = $1;
       $old =~ s/\034/\\\n#>\- /g;         # Fix continuation lines
-      $new =~ s/\034/\\\n/g;
-      my $newCount = ($new =~ tr/\n//) + 1;
+      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 {
-      print STDERR "Warning: substitution of \"$lookup\" in $printname failed\n";
+        warn "Warning: substitution of \"$lookup\" in $printname failed\n";
     }
 }
 
@@ -1909,8 +2394,9 @@ sub substituteLine ($$)
 sub appendLines ($)
 {
   my ($new) = @_;
-  $new =~ s/\034/\\\n/g;        # Fix continuation lines
-  my $newCount = ($new =~ tr/\n//) + 1;
+  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";
 }
 
@@ -1935,3 +2421,18 @@ sub restoreMakefile ()
 }
 
 #-----------------------------------------------------------------------------
+
+# 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/am_edit.py b/admin/am_edit.py
deleted file mode 100644
index dfe574e..0000000
--- a/admin/am_edit.py
+++ /dev/null
@@ -1,330 +0,0 @@
-import getopt, string, posixpath, sys, os, os.path, re
-
-# Some global globals...
-verbose     = 0
-thisProg    = posixpath.basename(sys.argv[0])
-if not thisProg: # happy only when running in xemacs ;/
-    thisProg = 'am_edit.py'
-cppsuffixes = ['cpp', 'cc', 'cxx', 'C', 'c++']
-hExt        = ['h', 'H', 'hh', 'hxx', 'h++']
-progId      = "KDE tags expanded automatically by " + thisProg
-use_final   = 1
-dryrun      = 0
-pathoption  = 0
-topdir      = os.path.abspath(os.curdir) + "/"
-foreigndirs = []
-
-class Makefile:
-    def __init__(self, file):
-        # some useful globals for the subroutines called here
-        self.headerdirs = ['.']
-        self.haveAutomocTag   = 0
-
-        self.programs = []
-
-        # lists the objects compiled into $program
-        self.realobjs = {}
-        # lists the sources used for $program
-        self.sources = {}
-        # lists the objects compiled when final
-        self.finalObjs = {}
-        # the binary name of program variable
-        self.realname = {}
-        # lists the idl files used for $program
-        self.idlfiles = {}
-        # lists all idl generated files for cleantarget
-        self.idl_output = ""
-
-        self.depedmocs = {}
-
-        self.dep_files      = ""
-        self.dep_finals     = ""
-        # the targets to add
-        self.target_adds    = {}
-        self.kdelang        = ""
-        self.makefile       = file
-        self.makefileDir    = os.path.dirname(self.makefile)
-        self.options        = {}
-
-
-    NoMakefileAmFound = "found Makefile.in without Makefile.am"
-
-    def findLine(self, line):
-        import types
-        if type(line) is types.StringType:
-            regexp = re.compile(line)
-        else:
-            regexp = line
-        for line in self.lines:
-            match = regexp.match(line)
-            if match:
-                return match
-    
-    def substituteLine(self, old, new):
-        import types
-        if type(old) is types.StringType:
-            regexp = re.compile(old)
-        else:
-            regexp = old
-            
-        for index in range(len(self.lines)):
-            line = self.lines[index]
-            match = regexp.match(line)
-            if match:
-                line = '#>- ' + line
-                newlines = string.split(new, '\n')
-                self.lines[index:index+1] = [line, '#>+ %d' % len(newlines)] + newlines
-                return
-
-    def addTarget(self, target, dependson):
-        if not self.target_adds.has_key(target):
-            self.target_adds[target] = [dependson]
-        else:
-            self.target_adds[target].append(dependson)
-            
-    def appendLines(self, newlines):
-        lines = string.split(newlines, '\n') + ['\n']
-        self.lines.extend(['#>+ %d' % len(lines)] + lines)
-        
-    def restore(self):
-        index = 0
-        while index < len(self.lines):
-            line = self.lines[index]
-            if line[0:3] == '#>+':
-                # the +1 is the comment itself
-                linec = string.atoi(line[3:]) + 1
-                del self.lines[index:index+linec]
-                continue
-            if line[0:3] == '#>-':
-                self.lines[index] = self.lines[index][4:]
-            index = index + 1
-        
-    def initialize(self):
-        global foreigndirs
-
-        os.chdir(self.makefileDir)
-        self.printname = string.replace(self.makefile, topdir, "")
-        self.makefile = os.path.basename(self.makefile)
-
-        if not posixpath.exists("Makefile.am"):
-            raise self.NoMakefileAmFound, self.makefileDir
-
-        for dir in foreigndirs:
-            if dir.match(self.makefileDir):
-                print 'leaving ' + self.makefileDir
-                return 0
-
-        f = open(self.makefile)
-        self.lines = []
-      
-        while 1:
-            line = f.readline()
-            if not line: break
-            self.lines.append(string.rstrip(line))
-
-        f.close()
-        
-        # take out the 
-        self.restore()
-        
-        optionline = re.compile('^\s*(\w+)\s*=\s*([^\n]*)$')
-        linecontinued = re.compile('\\\s*\n')
-        lastline = ''
-
-        index = 0
-        while index < len(self.lines):
-            line = self.lines[index]
-            if linecontinued.search(line):
-                self.lines[index] = linecontinued.sub(' ', line) + self.lines[index+1]
-                continue
-            else:
-                index = index + 1
-
-            match = optionline.search(line)
-            if match:
-                self.options[match.group(1)] = match.group(2)
-
-        if self.options.has_key('KDE_OPTIONS'):
-            options = string.split(self.options['KDE_OPTIONS'])
-            if 'foreign' in options:
-                foreigndirs.append(re.compile(self.makefileDir + "/.*"))
-                return 0
-
-        self.cxxsuffix = ""
-        suffixes = re.compile('^\.SUFFIXES:(.*)$')
-
-        for line in self.lines:
-            match = suffixes.match(line)
-            if match:
-                existing_suffixes = string.split(match.group(1))
-                for suffix in existing_suffixes:
-                    # leave out the .
-                    if suffix[1:] in cppsuffixes:
-                        self.cxxsuffix = suffix[1:]
-                        break
-                if self.cxxsuffix:
-                    break
-
-        search_real_programs = {}
-
-        for option in self.options.keys():
-            if string.rfind(option, '_OBJECTS') > 0:
-
-                program = option[0:string.find(option, '_OBJECTS')]
-                objs = self.options[option]
-
-                variable_in_objects = 0
-
-                objlist = string.split(objs)
-                variable = re.compile('\$\((\w+)\)')
-                for obj in objlist:
-                    match = variable.match(obj)
-                    if match and not match.group(1) == 'OBJEXT':
-                        variable_in_objects = 1
-                        break
-
-                if variable_in_objects:
-                    continue
-
-                if len(program) > 3 and program[3] == 'am_':
-                    program = program[3:]
-
-                if verbose:
-                    print "found program " + program
-
-                self.programs.append(program)
-                self.realobjs[program] = objs
-
-                if self.options.has_key(program + "_SOURCES"):
-                    self.sources[program] = self.options[program + "_SOURCES"]
-                else:
-                    self.sources[program] = ""
-                    sys.stderr.write("found program with no _SOURCES: " + program + '\n')
-
-                # unmask to regexp
-                realprogram = string.replace(program, '_', '.')
-                search_real_programs[program] = re.compile('.*(' + realprogram +
-                                                           ')(\$\(EXEEXT\)?)?:.*\$\(' +
-                                                           program + '_OBJECTS\).*')
-
-                self.realname[program] = "";
-
-        for line in self.lines:
-            if string.find(line, '_OBJECTS') > 0: # just a random piece to not use at _every_ line
-                for program in self.programs:
-                    match = search_real_programs[program].match(line)
-                    if match:
-                        self.realname[program] = match.group(1)
-
-    def finalTouch(self):
-        if self.options.has_key('DEPDIR'):
-            sys.stderr.write(self.printname + " defines DEPDIR. This means you're using automake > 1.4 - this is not supported!")
-        else:
-            # taken out a random variable
-            self.substituteLine('bindir\s*=.*', 'DEPDIR = .deps\nbindir = ' + self.options['bindir'])
-
-        self.appendLines('cvs-clean:\n' +
-                         '\t$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean')
-
-        self.appendLines('kde-rpo-clean:\n'+
-                         '\t-rm -f *.rpo')
-
-        self.addTarget('clean', 'kde-rpo-clean')
-        self.addAllTargets()
-
-    def addAllTargets(self):
-        for target in self.target_adds.keys():
-            match = self.findLine(target + ':\s*(.*)')
-            if match:
-                self.substituteLine(match.re, target + ': ' +
-                                    string.join(self.target_adds[target]) +
-                                    ' ' + match.group(1))
-                    
-    def writeback(self):
-        f = open(self.makefile, 'w')
-        for line in self.lines:
-            f.write(line)
-            f.write('\n')
-        f.close()
-
-    def tag_automake(self):
-        match = self.findLine('^(.*cd \$\(top_srcdir\)\s+&&\s+\$\(AUTOMAKE\).*)$')
-        if not match: return 1
-        self.substituteLine(match.re, match.group(1) + '\n' +
-                       '\tcd $(top_srcdir) && python ' +
-                       thisProg + ' ' + self.printname)
-        
-def main():
-    global use_final, dryrun, pathoption, thisProg, verbose
-
-    optlist, makefiles = getopt.getopt(sys.argv[1:], 'vhp:n', [
-        'version', 'verbose', 'path=', 'help', 'no-final'])
-
-    for option, param in optlist:
-        if option == '--version':
-            print "\n"
-            print thisProg + "$Revision: 1.3 $"
-            print "This is really free software, unencumbered by the GPL."
-            print "You can do anything you like with it except sueing me."
-            print "Copyright 1998 Kalle Dalheimer <kalle\@kde.org>"
-            print "Concept, design and unnecessary questions about perl"
-            print "     by Matthias Ettrich <ettrich\@kde.org>"
-            print ""
-            print "Making it useful by Stephan Kulow <coolo\@kde.org> and"
-            print "Harri Porten <porten\@kde.org>"
-            print "Updated (Feb-1999), John Birch <jb.nz\@writeme.com>"
-            print "Current Maintainer Stephan Kulow"
-            sys.exit(0)
-        if option == '--verbose' or option == '-v':
-            verbose = 1
-        if option == '-p' or option == '--path':
-            thisProg = param + "/" + thisProg
-            if (not posixpath.exists(thisProg)):
-                sys.stderr.write(thisProg + " doesn't exist\n")
-            pathoption=1
-        if option == '--help' or option == '-h':
-            print "Usage " + thisProg + " [OPTION] ... [dir/Makefile.in]..."
-            print "Patches dir/Makefile.in generated from automake"
-            print "(where dir can be a full or relative directory name)"
-            print "  -v, --verbose      verbosely list files processed"
-            print "  -h, --help         print this help, then exit"
-            print "  --version          print version number, then exit"
-            print "  -p, --path=        use the path to am_edit if the path"
-            print "  --no-final         don't patch for --enable-final"
-            print "                     called from is not the one to be used"
-            sys.exit(0)
-        if option == '--no-final':
-            use_final = 0
-        if option == '-n':
-            dryrun = 1
-
-    if not use_final:
-        thisProg = thisProg + " --no-final"
-
-    if thisProg[0] == '/' and not pathoption:
-        sys.stderr.write( "Illegal full pathname call performed...\n"
-                          "The call to \"" + thisProg + "\"\n"
-                          "would be inserted in some Makefile.in.\n"
-                          "Please use option --path.\n")
-        sys.exit(1)
-
-    if len(makefiles) == 0:
-        import find
-        makefiles = find.find('Makefile.in')
-
-    for index in range(len(makefiles)):
-        if not makefiles[index][0] == '/':
-            makefiles[index] = os.path.normcase(os.path.abspath(makefiles[index]))
-
-    makefiles.sort()
-    for file in makefiles:
-        makefile = Makefile(file)
-        try:
-            makefile.initialize()
-            makefile.tag_automake()
-            makefile.finalTouch()
-            makefile.writeback()
-        except Makefile.NoMakefileAmFound, param:
-            if verbose: print Makefile.NoMakefileAmFound + ' in ' + param
-
-main()
diff --git a/admin/compile b/admin/compile
new file mode 100755
index 0000000..9bb997a
--- /dev/null
+++ b/admin/compile
@@ -0,0 +1,99 @@
+#! /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
index 7793be4..645b820 100644
--- a/admin/conf.change.pl
+++ b/admin/conf.change.pl
@@ -1,15 +1,33 @@
-#!/usr/bin/perl -w
+#!/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@ifh.de>
+# 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);
@@ -61,6 +79,11 @@ while (<>) {
 # 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 {
@@ -69,17 +92,19 @@ while (<>) {
     } elsif ($flag == 3) {
         if (/^\s*rm\s+-f\s+conftest/ ) {
 	    $flag = 4;
-	    insert_main_loop();
+	    &insert_main_loop();
 	} elsif (/^\s*rm\s+-f\s+.*ac_cs_root/ ) {
 	    $flag = 4;
-	    insert_main_loop();
+	    &insert_main_loop();
 	    #die "hhhhhhh";
 	    if ($ac_version != 2141) {
 	        print STDERR "hmm, don't know autoconf version\n";
 	    }
-        } elsif (/^\#\s*CONFIG_HEADER section.*/) {
+        } elsif (/^\#\s*CONFIG_(HEADER|COMMANDS) section.*|^\s+#\s(Run) the commands associated/) {
           $flag = 4;
-          insert_main_loop();
+          my $commands = defined $2;
+          &insert_main_loop();
+          $commands && insert_command_loop();
           if($ac_version != 250) {
             print STDERR "hmm, something went wrong :-(\n";
           }
@@ -91,9 +116,46 @@ while (<>) {
 
 die "wrong input (flag != 4)" unless $flag == 4;
 print STDERR "hmm, don't know autoconf version\n" unless $ac_version;
-die "autoconf 2.50 is currently not supported" if  $ac_version == 250;
 
 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
@@ -101,7 +163,7 @@ if test "x\$ac_cs_root" = "x" ; then
 fi
 EOF
     if ($vpath_seen) {
-        print <<EOF;
+      print <<EOF;
 # VPATH subst was seen in original config.status main loop
 echo '/^[ 	]*VPATH[ 	]*=[^:]*\$/d' >> \$ac_cs_root.subs
 EOF
@@ -114,10 +176,16 @@ for ac_file in .. \$CONFIG_FILES ; do
     fi
 done
 if test -f \$ac_cs_root.sacfiles ; then
-    perl $ac_aux_dir/config.pl "\$ac_cs_root" "\$ac_given_srcdir" "\$ac_given_INSTALL"
+    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
index 378eab8..5145e35 100755
--- a/admin/config.guess
+++ b/admin/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2001-03-30'
+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
@@ -24,8 +24,9 @@ timestamp='2001-03-30'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -52,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -87,33 +88,43 @@ if test $# != 0; then
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
 
-# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
+# 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 dummy(){}" > $dummy.c
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break
-	  fi
-	done
-	rm -f $dummy.c $dummy.o $dummy.rel
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	rm -f $files ;
 	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found
+	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac ;
+unset files'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
@@ -127,29 +138,31 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
+	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
 	# compatibility and a consistent mechanism for selecting the
 	# object file format.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
 		then
@@ -171,6 +184,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 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}'`
@@ -179,6 +231,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 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:
@@ -204,9 +257,9 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
 	if test "$?" = 0 ; then
-		case `./$dummy` in
+		case `$dummy` in
 			0-0)
 				UNAME_MACHINE="alpha"
 				;;
@@ -225,9 +278,15 @@ EOF
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+			3-1307)
+				UNAME_MACHINE="alphaev7"
+				;;
 		esac
 	fi
-	rm -f $dummy.s $dummy
+	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*:*)
@@ -242,29 +301,11 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
 	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
@@ -286,6 +327,10 @@ EOF
     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 ;;
@@ -314,7 +359,7 @@ EOF
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -328,9 +373,6 @@ EOF
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -357,18 +399,6 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -385,6 +415,7 @@ EOF
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -406,12 +437,21 @@ EOF
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && 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 ;;
@@ -459,7 +499,7 @@ EOF
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i*86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
     ia64:AIX:*:*)
@@ -472,6 +512,7 @@ EOF
 	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>
 
@@ -483,8 +524,8 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && 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
@@ -493,7 +534,7 @@ EOF
 	fi
 	exit 0 ;;
     *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
@@ -533,10 +574,8 @@ EOF
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -545,12 +584,13 @@ EOF
                         case "${sc_kernel_bits}" in
                           32) HP_ARCH="hppa2.0n" ;;
                           64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -583,10 +623,10 @@ EOF
                   exit (0);
               }
 EOF
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    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 ;;
@@ -595,6 +635,7 @@ EOF
 	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
@@ -620,8 +661,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && 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:*:* )
@@ -630,7 +671,7 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -639,7 +680,7 @@ EOF
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
-    i?86:OSF1:*:*)
+    i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
@@ -649,9 +690,6 @@ EOF
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -670,16 +708,14 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -693,19 +729,13 @@ EOF
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -715,10 +745,19 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# 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
@@ -729,6 +768,9 @@ EOF
     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
@@ -754,103 +796,49 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     mips:Linux:*:*)
-	cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-int main (int argc, char *argv[]) {
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c && rmdir $tmpdir
+	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
-	# Determine Lib Version
-	cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unknown\n");
-#endif
-  return 0;
-}
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		./$dummy | grep 1\.99 > /dev/null
-		if test "$?" = 0 ; then LIBC="libc1" ; fi
-	fi
-	rm -f $dummy.c $dummy
-	echo powerpc-unknown-linux-gnu${LIBC}
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
 	exit 0 ;;
     alpha:Linux:*:*)
-	cat <<EOF >$dummy.s
-	  .data
-	  \$Lformat:
-		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-	   .text
-		.globl main
-		.align 4
-		.ent main
-	    main:
-		.frame \$30,16,\$26,0
-		ldgp \$29,0(\$27)
-		.prologue 1
-		.long 0x47e03d80 # implver \$0
-		lda \$2,-1
-		.long 0x47e20c21 # amask \$2,\$1
-		lda \$16,\$Lformat
-		mov \$0,\$17
-		not \$1,\$18
-		jsr \$26,printf
-		ldgp \$29,0(\$26)
-		mov 0,\$16
-		jsr \$26,exit
-		.end main
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-		0-0)	UNAME_MACHINE="alpha" ;;
-		1-0)	UNAME_MACHINE="alphaev5" ;;
-		1-1)    UNAME_MACHINE="alphaev56" ;;
-		1-101)	UNAME_MACHINE="alphapca56" ;;
-		2-303)	UNAME_MACHINE="alphaev6" ;;
-		2-307)	UNAME_MACHINE="alphaev67" ;;
-		esac
-		objdump --private-headers $dummy | \
-		  grep ld.so.1 > /dev/null
-		if test "$?" = 0 ; then
-			LIBC="libc1"
-		fi
-	fi
-	rm -f $dummy.s $dummy
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
@@ -876,78 +864,67 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit 0 ;;
-    i?86:Linux:*:*)
+    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported emulations:/!d
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
+				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_emulations" in
-	  i?86linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
-		;;
-	  elf_i?86)
+        case "$ld_supported_targets" in
+	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  i?86coff)
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;
+	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
-		;;
-	esac
-	# Either a pre-BFD a.out linker (linux-gnuoldld)
-	# or one that does not give us useful --help.
-	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	# If ld does not provide *any* "supported emulations:"
-	# that means it is gnuoldld.
-	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-	case "${UNAME_MACHINE}" in
-	i?86)
-	  VENDOR=pc;
-	  ;;
-	*)
-	  VENDOR=unknown;
-	  ;;
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	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
 	;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
+    i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
         # I am not positive that other SVR4 systems won't match this,
@@ -955,7 +932,7 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -963,34 +940,33 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i?86:*:5:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-	else
-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit 0 ;;
-    i?86:*:3.2:*)
+    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:*DOS:*:*)
+    i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	exit 0 ;;
     pc:*:*:*)
@@ -1016,9 +992,12 @@ EOF
 	# "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 | 4850:*:4.0:3.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`
@@ -1035,7 +1014,7 @@ EOF
     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*:*)
+    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.*:*)
@@ -1064,8 +1043,8 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
@@ -1077,6 +1056,10 @@ EOF
 	# 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 ;;
@@ -1105,6 +1088,9 @@ EOF
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
 	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
@@ -1115,15 +1101,17 @@ EOF
 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1146,7 +1134,7 @@ EOF
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
-    i?86:OS/2:*:*)
+    i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
@@ -1169,11 +1157,18 @@ EOF
     *: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>
@@ -1288,8 +1283,8 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+rm -f $dummy.c $dummy && rmdir $tmpdir
 
 # Apollos put the system type in the environment.
 
diff --git a/admin/config.pl b/admin/config.pl
index 011cd25..034042e 100644
--- a/admin/config.pl
+++ b/admin/config.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # a script for use by autoconf to make the Makefiles
 # from the Makefile.in's
 #
@@ -10,24 +10,48 @@
 # 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@ifh.de>
-#
-# the first part was done by looking at the config.status files generated
-# by configure.
-# 
-my $ac_cs_root=$ARGV[0];
-my $ac_given_srcdir=$ARGV[1];
-my $ac_given_INSTALL=$ARGV[2];
+# 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;
 
-# print "ac_cs_root=$ac_cs_root\n";
-# print "ac_given_srcdir=$ac_given_srcdir\n";
-# print "ac_given_INSTALL=$ac_given_INSTALL\n";
+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_cs_root.subs") || die "can't open $ac_cs_root.subs: $!";
+open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
 my @subs = <CF>;
 close(CF);
 chomp @subs;
@@ -37,43 +61,51 @@ chomp @subs;
 if ($bad_perl) {
     print "Using perl older than version 5.005\n";
     foreach my $pat (@subs) {
-	if (  ($pat =~ /s%([^%]*)%([^%]*)%g/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/g% )
-	   || ($pat =~ /s%([^%]*)%([^%]*)%;t/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/;t% )
+	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   (newer autoconf)
-	    push @comp_subs, make_closure($1, $2);
+            # 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_cs_root.subs ($pat)"
+	    die "Uhh. Malformed pattern in $ac_subs ($pat)"
 		unless ( $pat =~ /^\s*$/ );   # ignore white lines
 	}
     }
 } else {
     foreach my $pat (@subs) {
-	if (  ($pat =~ /s%([^%]*)%([^%]*)%g/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/g% )
-	   || ($pat =~ /s%([^%]*)%([^%]*)%;t/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/;t% )
-	   ) {
-            # form : s%bla%blubb%g
-	    # or     s%bla%blubb%;t t   (newer autoconf)
-	    push @comp_match, eval "qr/\Q$1\E/";  # compile match pattern
-	    push @comp_subs, $2;
-	} elsif ( ($pat =~ /%([^%]*)%d/ )
-	   || ($pat =~ m%/([^/]*)/d% )
-	   ) {
-	    push @comp_match, eval "qr/\Q$1\E/";
-	    push @comp_subs, "";
-	} else {
-	    die "Uhh. Malformed pattern in $ac_cs_root.subs ($pat)"
-		unless ( $pat =~ /^\s*$/ );   # ignore white lines
-	}
+       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;
@@ -81,11 +113,12 @@ undef @subs;
 # read the list of files to be patched, form:
 # ./Makefile arts/Makefile arts/examples/Makefile arts/flow/Makefile
 
-open(CF, "< $ac_cs_root.sacfiles") || die "can't open $ac_cs_root.sacfiles: $!";
+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 =~ /\.\./;
@@ -106,7 +139,7 @@ foreach $ac_file (@ac_files) {
     ($ac_dir = $ac_file) =~ s%/[^/][^/]*$%%;
     if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) {
 # The file is in a subdirectory.
-	if (! -d "$ac_dir") { mkdir "$ac_dir", 0777; }
+	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.
@@ -142,27 +175,24 @@ foreach $ac_file (@ac_files) {
     my $ac_comsub="";
     my $fname=$ac_file_in;
     $fname =~ s%.*/%%;
-    my $configure_input="Generated automatically from $fname by config.pl.";
-    if ($ac_file =~ /.*[Mm]akefile.*/) {
-	$ac_comsub="# ".$configure_input."\n";  # for the first line in $ac_file
-    }
+    $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, $ac_comsub);
+    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, $firstline) = @_;
+    my ($outf, $infiles) = @_;
     my $filedata;
     my @infiles=split(' ', $infiles);
     my $i=0;
 
-    if ($firstline) {
-	$filedata = $firstline;
-    }
     foreach my $name (@infiles) {
 	if (open(CF, "< $name")) {
 	    while (<CF>) {
@@ -198,11 +228,7 @@ sub patch_file {
 
 sub make_closure {
     my ($pat, $sub) = @_;
-    $pat =~ s/\@/\\@/g;   # @bla@ -> \@bla\@
-    $pat =~ s/\$/\\\$/g;  # $bla -> \$bla
-    $sub =~ s/\@/\\@/g;
-    $sub =~ s/\$/\\\$/g;
-    my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%$pat%$sub%g; }";
+    my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%\Q$pat\E%\Q$sub\E%g; }";
     if ($@) {
         print "can't create CODE: $@\n";
     }
diff --git a/admin/config.sub b/admin/config.sub
index 4ac0c8b..1dea9b7 100755
--- a/admin/config.sub
+++ b/admin/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2001-03-30'
+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
@@ -29,7 +29,8 @@ timestamp='2001-03-30'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -157,6 +158,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -215,25 +224,46 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-		| pj | pjl | h8500)
+	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)
@@ -241,13 +271,13 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+	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[234567]86 | x86_64)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -256,30 +286,56 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-	      | [cjt]90-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+	| 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.
@@ -342,6 +398,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -362,16 +422,8 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	cray | j90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -386,6 +438,14 @@ case $basic_machine in
 	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
@@ -506,19 +566,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -566,14 +626,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -588,6 +640,10 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -667,6 +723,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -689,19 +749,19 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -716,15 +776,25 @@ case $basic_machine in
 	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
 		;;
@@ -742,10 +812,22 @@ case $basic_machine in
 	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
 		;;
@@ -753,7 +835,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -819,10 +901,22 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	t3d)
+		basic_machine=alpha-cray
+		os=-unicos
+		;;
 	t3e)
-		basic_machine=t3e-cray
+		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
@@ -833,6 +927,10 @@ case $basic_machine in
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -857,8 +955,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+		basic_machine=f301-fujitsu
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -879,13 +977,17 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
 		;;
-        xps | xps100)
+	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -906,13 +1008,6 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -932,13 +1027,16 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4)
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -953,10 +1051,6 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1016,16 +1110,19 @@ case $os in
 	      | -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*)
+	      | -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[34567]86-*)
+		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
@@ -1072,14 +1169,20 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1118,8 +1221,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
 		;;
 	-none)
 		;;
@@ -1152,10 +1255,11 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1182,6 +1286,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1245,19 +1352,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1329,7 +1436,7 @@ case $basic_machine in
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1344,6 +1451,9 @@ case $basic_machine in
 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
+			-vos*)
+				vendor=stratus
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/admin/configure.in.bot.end b/admin/configure.in.bot.end
new file mode 100644
index 0000000..fb483b6
--- /dev/null
+++ b/admin/configure.in.bot.end
@@ -0,0 +1,12 @@
+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
index 4503fec..7c7e25a 100644
--- a/admin/configure.in.min
+++ b/admin/configure.in.min
@@ -11,7 +11,8 @@ 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 Licensednl    along with this library; see the file COPYING.LIB.  If not, write to
+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.
 
@@ -52,4 +53,5 @@ 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
new file mode 100644
index 0000000..35d48e9
--- /dev/null
+++ b/admin/cvs-clean.pl
@@ -0,0 +1,87 @@
+#! /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
new file mode 100644
index 0000000..36c8a27
--- /dev/null
+++ b/admin/cvs.sh
@@ -0,0 +1,648 @@
+#! /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
index 0fd8318..94eab8d 100755
--- a/admin/debianrules
+++ b/admin/debianrules
@@ -7,78 +7,113 @@ 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";
 
-if (@ARGV && $ARGV[0] eq 'cleanup') {
+$mandir			=	"$kde_prefix/share/man";
+$infodir		=	"$kde_prefix/share/info";
+$sysconfdir		=	"/etc";
 
-if (-d "debian/tmp/usr/share/config") {
-	if (! -d "debian/tmp/$kde_confdir") {
-	  system("mv debian/tmp/usr/share/config debian/tmp/$kde_confdir");
-	}
-}
-system("rm -f `find debian/ -name \".anchors\"`");
-system("chmod 755 debian/*preinst debian/*postinst");
+$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";
 
-exit;
+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="";
+  }
 }
-
-$QTDIR="/usr/share/qt";
-$kde_prefix="/usr";
-$kde_htmldir="$kde_prefix/share/doc/kde/HTML";
-$kde_icondir="$kde_prefix/share/icons";
-$kde_sounddir="$kde_prefix/share/sounds";
-$kde_datadir="$kde_prefix/share/apps";
-$kde_locale="$kde_prefix/share/locale";
-$kde_confdir="/etc/kde2";
-$kde_cgidir="$kde_prefix/lib/cgi-bin";
-$kde_appsdir="$kde_prefix/share/applnk";
-$kde_mimedir="$kde_prefix/share/mimelnk";
-$kde_wallpaperdir="$kde_prefix/share/wallpapers";
-$kde_bindir="$kde_prefix/bin";
-$kde_servicesdir="$kde_prefix/share/services";
-$kde_servicetypesdir="$kde_prefix/share/servicetypes";
-$kde_includedir="$kde_prefix/include/kde";
-$kde_libdir="$kde_prefix/lib";
-$kde_moduledir="$kde_prefix/lib/kde2";
-$mandir="$kde_prefix/share/man"; 
-$infodir="$kde_prefix/share/info";
-$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 (@ARGV && $ARGV[0] eq 'echodirs') {
-  print STDOUT "export kde_htmldir=$kde_htmldir\n";
+  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_icondir=$kde_icondir\n";
-  print STDOUT "export kde_sounddir=$kde_sounddir\n";
   print STDOUT "export kde_datadir=$kde_datadir\n";
-  print STDOUT "export kde_cgidir=$kde_cgidir\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_confdir=$kde_confdir\n";
   print STDOUT "export kde_mimedir=$kde_mimedir\n";
-  print STDOUT "export kde_wallpaperdir=$kde_wallpaperdir\n";
-  print STDOUT "export kde_bindir=$kde_bindir\n";
   print STDOUT "export kde_servicesdir=$kde_servicesdir\n";
   print STDOUT "export kde_servicetypesdir=$kde_servicetypesdir\n";
-  print STDOUT "export kde_includedir=$kde_includedir\n";
-  print STDOUT "export kde_libdir=$kde_libdir\n";
-  print STDOUT "export kde_moduledir=$kde_moduledir\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 kde_prefix=$kde_prefix\n";
-  print STDOUT "export INSTALL_DATA=install -p -c -m 644\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 "configkde=--disable-debug --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
-  print STDOUT "configkdevelop=--disable-debug --enable-docbase --enable-kdoc2 --disable-rpath --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html\n";
-  print STDOUT "configkdepim=--disable-debug --with-extra-includes=/usr/include/libpisock --enable-shared --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\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
index 30f36ee..4c20c6c 100755
--- a/admin/depcomp
+++ b/admin/depcomp
@@ -18,6 +18,11 @@
 # 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
@@ -50,10 +55,12 @@ fi
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!
-  if "$@" -MT "$object" -MF "$tmpdepfile" -MD -MP; then :
+## 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
-    stat=$?
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -73,9 +80,10 @@ gcc)
   if test -z "$gccflag"; then
     gccflag=-MD,
   fi
-  if "$@" -Wp,"$gccflag$tmpdepfile"; then :
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
   else
-    stat=$?
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -126,19 +134,24 @@ sgi)
   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
+    # 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).
+    # 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 's/^[^\.]*\.o://' | 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" | \
-## 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"
+' < "$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
@@ -150,8 +163,12 @@ sgi)
 
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.
-  tmpdepfile=`echo "$object" | sed 's/\(.*\)\..*$/\1.u/'`
+  # 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
@@ -166,21 +183,11 @@ aix)
   fi
 
   if test -f "$tmpdepfile"; then
-    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).
-    tr ' ' '
-' < "$tmpdepfile" | sed 's/^[^\.]*\.o://' | tr '
-' ' ' >> $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"
+    # 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
@@ -190,6 +197,73 @@ aix)
   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.
diff --git a/admin/detect-autoconf.sh b/admin/detect-autoconf.sh
new file mode 100644
index 0000000..fae9c6d
--- /dev/null
+++ b/admin/detect-autoconf.sh
@@ -0,0 +1,95 @@
+#! /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
index e9de238..36f96f3 100755
--- a/admin/install-sh
+++ b/admin/install-sh
@@ -56,7 +56,7 @@ dir_arg=""
 
 while [ x"$1" != x ]; do
     case $1 in
-	-c) instcmd="$cpprog"
+	-c) instcmd=$cpprog
 	    shift
 	    continue;;
 
@@ -79,7 +79,7 @@ while [ x"$1" != x ]; do
 	    shift
 	    continue;;
 
-	-s) stripcmd="$stripprog"
+	-s) stripcmd=$stripprog
 	    shift
 	    continue;;
 
@@ -106,128 +106,132 @@ done
 
 if [ x"$src" = x ]
 then
-	echo "install:	no input file specified"
+	echo "$0: no input file specified" >&2
 	exit 1
 else
-	true
+	:
 fi
 
 if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
-	
-	if [ -d $dst ]; then
+
+	if [ -d "$dst" ]; then
 		instcmd=:
 		chmodcmd=""
 	else
-		instcmd=mkdir
+		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 
+# might cause directories to be created, which would be especially bad
 # if $src (and thus $dsttmp) contains '*'.
 
-	if [ -f $src -o -d $src ]
+	if [ -f "$src" ] || [ -d "$src" ]
 	then
-		true
+		:
 	else
-		echo "install:  $src does not exist"
+		echo "$0: $src does not exist" >&2
 		exit 1
 	fi
-	
+
 	if [ x"$dst" = x ]
 	then
-		echo "install:	no destination specified"
+		echo "$0: no destination specified" >&2
 		exit 1
 	else
-		true
+		:
 	fi
 
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 
-	if [ -d $dst ]
+	if [ -d "$dst" ]
 	then
-		dst="$dst"/`basename $src`
+		dst=$dst/`basename "$src"`
 	else
-		true
+		:
 	fi
 fi
 
 ## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
+defaultIFS='
+	'
+IFS="${IFS-$defaultIFS}"
 
-oIFS="${IFS}"
+oIFS=$IFS
 # Some sh's can't handle IFS=/ for some reason.
 IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS
 
 pathcomp=''
 
 while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
+	pathcomp=$pathcomp$1
 	shift
 
-	if [ ! -d "${pathcomp}" ] ;
+	if [ ! -d "$pathcomp" ] ;
         then
-		$mkdirprog "${pathcomp}"
+		$mkdirprog "$pathcomp"
 	else
-		true
+		:
 	fi
 
-	pathcomp="${pathcomp}/"
+	pathcomp=$pathcomp/
 done
 fi
 
 if [ x"$dir_arg" != x ]
 then
-	$doit $instcmd $dst &&
+	$doit $instcmd "$dst" &&
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+	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 ] 
+	if [ x"$transformarg" = x ]
 	then
-		dstfile=`basename $dst`
+		dstfile=`basename "$dst"`
 	else
-		dstfile=`basename $dst $transformbasename | 
+		dstfile=`basename "$dst" $transformbasename |
 			sed $transformarg`$transformbasename
 	fi
 
 # don't allow the sed command to completely eliminate the filename
 
-	if [ x"$dstfile" = x ] 
+	if [ x"$dstfile" = x ]
 	then
-		dstfile=`basename $dst`
+		dstfile=`basename "$dst"`
 	else
-		true
+		:
 	fi
 
-# Make a temp file name in the proper directory.
+# Make a couple of temp file names in the proper directory.
 
 	dsttmp=$dstdir/#inst.$$#
+	rmtmp=$dstdir/#rm.$$#
 
-# Move or copy the file name to the temp name
+# Trap to clean up temp files at exit.
 
-	$doit $instcmd $src $dsttmp &&
+	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+	trap '(exit $?); exit' 1 2 13 15
 
-	trap "rm -f ${dsttmp}" 0 &&
+# Move or copy the file name to the temp name
+
+	$doit $instcmd "$src" "$dsttmp" &&
 
 # and set any options; do chmod last to preserve setuid bits
 
@@ -235,17 +239,38 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location.  We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons.  In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+	if [ -f "$dstdir/$dstfile" ]
+	then
+		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+		{
+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		  (exit 1); exit
+		}
+	else
+		:
+	fi
+} &&
 
 # Now rename the file to the real destination.
 
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 
 fi &&
 
+# The final little trick to "correctly" pass the exit status to the exit trap.
 
-exit 0
+{
+	(exit 0); exit
+}
diff --git a/admin/libtool.m4.in b/admin/libtool.m4.in
index 4e67b29..c274015 100644
--- a/admin/libtool.m4.in
+++ b/admin/libtool.m4.in
@@ -1,4 +1,4 @@
-## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
+# 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
@@ -22,7 +22,21 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 46 AC_PROG_LIBTOOL
+# 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
@@ -30,6 +44,11 @@ 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.
@@ -38,55 +57,43 @@ 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_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
 
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
 AC_SUBST(LIBTOOL)dnl
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
 
+# AC_LIBTOOL_SETUP
+# ----------------
 AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
+[AC_PREREQ(2.50)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
@@ -96,6 +103,7 @@ 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!
@@ -103,6 +111,95 @@ 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*)
@@ -112,38 +209,271 @@ file_magic*)
   ;;
 esac
 
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
+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"
 
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+  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"
@@ -155,6 +485,51 @@ case $host in
       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*
   ;;
@@ -164,185 +539,1347 @@ case $host in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
+    [AC_LANG_PUSH(C)
      AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+     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
   ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+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)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
   ])
 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*
 ])
 
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
 
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
+# 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
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+
+    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_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_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
+# 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
+  ;;
+
 *)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
+  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="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
+  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_DISABLE_STATIC - set the default static flag to --disable-static
+# 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_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
 
 
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
+# AC_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,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
+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_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_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
+# AC_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)])
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
 
 
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
+# 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_MSG_CHECKING([for $1])
+[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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+*)
+  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"
@@ -352,7 +1889,7 @@ dnl not every word.  This closes a longstanding sh security hole.
 	  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
+	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
 	    cat <<EOF 1>&2
@@ -373,8 +1910,8 @@ EOF
       break
     fi
   done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
 esac])
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
@@ -383,35 +1920,41 @@ if test -n "$MAGIC_CMD"; then
 else
   AC_MSG_RESULT(no)
 fi
-])
+])# AC_PATH_TOOL_PREFIX
 
 
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognise a shared library
 AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+[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)
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
   else
     MAGIC_CMD=:
   fi
 fi
-])
+])# AC_PATH_MAGIC
 
 
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
 AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+[AC_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 GCC])
+  AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -421,12 +1964,12 @@ if test "$GCC" = yes; then
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+    [[\\/]]* | ?:[[\\/]]*)
+      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%/%"`
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -446,22 +1989,26 @@ else
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
 	test "$with_gnu_ld" != no && break
-      else
+	;;
+      *)
 	test "$with_gnu_ld" != yes && break
-      fi
+	;;
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
@@ -473,32 +2020,50 @@ else
 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_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[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.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
-else
+  ;;
+*)
   lt_cv_prog_gnu_ld=no
-fi])
+  ;;
+esac])
 with_gnu_ld=$lt_cv_prog_gnu_ld
-])
+])# AC_PROG_LD_GNU
 
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+
+# 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'])
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
 reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
+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
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
+[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=
@@ -509,13 +2074,13 @@ lt_cv_deplibs_check_method='unknown'
 # `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
+# '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
-aix*)
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -524,36 +2089,39 @@ beos*)
   ;;
 
 bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
+  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*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+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'
+  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* )
+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_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.*`
       ;;
@@ -567,15 +2135,27 @@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20*|hpux11*)
-  lt_cv_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
+hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+  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*)
+irix5* | irix6* | nonstopux*)
   case $host_os in
-  irix5*)
+  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"
     ;;
@@ -587,7 +2167,7 @@ irix5* | irix6*)
     *) libmagic=never-match;;
     esac
     # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
     ;;
   esac
   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
@@ -595,47 +2175,46 @@ irix5* | irix6*)
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | m68k* | arm* | mips* | hppa* | sh* )
+  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 )'] ;;
+    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='file_magic NetBSD/[a-z0-9]* demand paged shared library']
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
   fi
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
   ;;
 
-openbsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
-    i*86 )
-      changequote(,)dnl
-      lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
-      changequote([, ])dnl
-      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
+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
   ;;
 
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  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*)
@@ -656,83 +2235,113 @@ solaris*)
 
 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
     ;;
-  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*`
+  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 path to a BSD-compatible name lister
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
 AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
       # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
 	lt_cv_path_NM="$tmp_nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
+	  break
+	  ;;
+	*)
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
+	  ;;
+	esac
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
 NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
+])# AC_PROG_NM
 
-# AC_CHECK_LIBM - check for math library
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
 AC_DEFUN([AC_CHECK_LIBM],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
+*-*-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, main, LIBM="$LIBM -lm")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
   ;;
 esac
-])
+])# AC_CHECK_LIBM
 
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
+
+# 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.
@@ -744,23 +2353,27 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
   LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
 
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL 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_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, main,
+  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])
@@ -771,85 +2384,3391 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   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
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
-    INCLTDL=
+    LTDLINCL=
   fi
-])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
 
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
 
-AC_DEFUN([_AC_LIBTOOL_CXX],
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
 AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
+_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
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
 
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
 
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_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])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
+	 [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"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
+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"
-CFLAGS="$lt_save_CFLAGS"
+])# 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
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
+  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
+
 
-dnl old names
+# _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($@)])
@@ -858,11 +5777,78 @@ AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
 AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
 AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
+# 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/ltcf-c.sh b/admin/ltcf-c.sh
deleted file mode 100644
index 288580c..0000000
--- a/admin/ltcf-c.sh
+++ /dev/null
@@ -1,796 +0,0 @@
-#### This script is meant to be sourced by ltconfig.
-
-# ltcf-c.sh - Create a C compiler specific configuration
-#
-# Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# 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.
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='main(){return(0);}'
-
-## Linker Characteristics
-case $host_os in
-cygwin* | mingw*)
-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-  # When not using gcc, we currently assume that we are using
-  # Microsoft Visual C++.
-  if test "$with_gcc" != yes; then
-    with_gnu_ld=no
-  fi
-  ;;
-
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # If archive_cmds runs LD, not CC, wlarc should be empty
-  wlarc='${wl}'
-
-  # See if GNU ld supports shared libraries.
-  case $host_os in
-  aix3* | aix4* | aix5*)
-    # On AIX, the GNU linker is very broken
-    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
-    ;;
-
-  amigaos*)
-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-
-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-    # that the semantics of dynamic libraries on AmigaOS, at least up
-    # to version 4, is to share data among multiple programs linked
-    # with the same dynamic library.  Since this doesn't match the
-    # behavior of shared libraries on other platforms, we can use
-    # them.
-    ld_shlibs=no
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      allow_undefined_flag=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-  cygwin* | mingw*)
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec='-L$libdir'
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-
-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~
-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-      else $CC -o impgen impgen.c ; fi)~
-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-
-    # cygwin and mingw dlls have different entry points and sets of symbols
-    # to exclude.
-    # FIXME: what about values for MSVC?
-    dll_entry=__cygwin_dll_entry@12
-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-    case $host_os in
-    mingw*)
-      # mingw values
-      dll_entry=_DllMainCRTStartup@12
-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-      ;;
-    esac
-
-    # mingw and cygwin differ, and it's simplest to just exclude the union
-    # of the two symbol sets.
-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-
-    # recent cygwin and mingw systems supply a stub DllMain which the user
-    # can override, but on older systems we have to supply one (in ltdll.c)
-    if test "x$lt_cv_need_dllmain" = "xyes"; then
-      ltdll_obj='$output_objdir/$soname-ltdll.'"$objext "
-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/$soname-ltdll.c~
-	test -f $output_objdir/$soname-ltdll.$objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-    else
-      ltdll_obj=
-      ltdll_cmds=
-    fi
-
-    # Extract the symbol export list from an `--export-all' def file,
-    # then regenerate the def file from the symbol export list, so that
-    # the compiled dll only exports the symbol export list.
-    # Be careful not to strip the DATA tag left be newer dlltools.
-    export_symbols_cmds="$ltdll_cmds"'
-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-
-    # If the export-symbols file already is a .def file (1st line
-    # is EXPORTS), use it as is.
-    # If DATA tags from a recent dlltool are present, honour them!
-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-        cp $export_symbols $output_objdir/$soname-def;
-      else
-        echo EXPORTS > $output_objdir/$soname-def;
-        _lt_hint=1;
-        cat $export_symbols | while read symbol; do
-         set dummy \$symbol;
-         case \[$]# in
-           2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-           *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
-         esac;
-         _lt_hint=`expr 1 + \$_lt_hint`;
-        done;
-      fi~
-      '"$ltdll_cmds"'
-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-    ;;
-
-  darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
-    archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`'
-    # We need to add '_' to the symbols in $export_symbols first
-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    whole_archive_flag_spec='-all_load $convenience'
-    ;;
-
-  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 | egrep 'BFD 2\.8' > /dev/null; then
-      ld_shlibs=no
-      cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-  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 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-  esac
-
-  case "$host_os" in
-  freebsd*)
-    skip_need_lc_check=yes
-    ;;
-  esac
-
-  if test "$ld_shlibs" = yes; then
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    case $host_os in
-    cygwin* | mingw*)
-      # dlltool doesn't understand --whole-archive et. al.
-      whole_archive_flag_spec=
-      ;;
-    *)
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-	whole_archive_flag_spec=
-      fi
-      ;;
-    esac
-  fi
-else
-  # PORTME fill in a description of your system's linker (not GNU ld)
-  case $host_os in
-  aix3*)
-    allow_undefined_flag=unsupported
-    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 "$with_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*)
-    hardcode_direct=yes
-    hardcode_libdir_separator=':'
-    link_all_deplibs=yes
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-    if test "$with_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
-        shared_flag='${wl}-G'
-      else
-        shared_flag='${wl}-bM:SRE'
-      fi
-    fi
-
-    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
-    # Let the compiler handle the export list.
-    always_export_symbols=no
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other run time loading flags (-brtl), -berok will
-      #           link without error, but may produce a broken library.
-      allow_undefined_flag=' ${wl}-berok'
-      # The following three lines along with hardcode_into_libs=yes put the correct path into libraries.
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir${libdir:+:}/usr/lib:/lib'
-      archive_cmds='$CC '"$shared_flag"' $libobjs $deplibs $linker_flags ${wl}-G '"$hardcode_libdir_flag_spec"' -o $lib'
-      archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $linker_flags ${wl}-G '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
-    else
-      if test "$host_cpu" = ia64; then
-        hardcode_libdir_flag_spec='${wl}-R $libdir${libdir:+:}/usr/lib:/lib'
-        allow_undefined_flag="-z nodefs"
-        archive_cmds='$CC '"$shared_flag"' $libobjs $deplibs $linker_flags '"$hardcode_libdir_flag_spec"' -o $lib'
-        archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $linker_flags '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
-      else
-        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=' '
-        build_libtool_need_lc=yes
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-        # 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
-    ;;
-
-  cygwin* | mingw*)
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec=' '
-    allow_undefined_flag=unsupported
-    # Tell ltmain to make .lib files, not .a files.
-    libext=lib
-    # FIXME: Setting linknames here is a bad hack.
-    archive_cmds='$CC -o $lib $libobjs $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"`'
-    ;;
-
-  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
-    skip_need_lc_check=yes
-    ;;
-
-  hpux9* | hpux10* | hpux11*)
-    case $host_os in
-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-    esac
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    hardcode_minus_L=yes # Not in the search PATH, but as the default
-			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  irix5* | irix6*)
-    if test "$with_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}${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 ${objdir}/so_locations -o $lib'
-    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 $linkopts'
-    hardcode_direct=yes
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_shlibpath_var=no
-    ;;
-
-  openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  os2*)
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-    ;;
-
-  osf3*)
-    if test "$with_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}${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 ${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 "$with_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}${objdir}/so_locations -o $lib'
-    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 ${objdir}/so_locations -o $lib'
-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-    fi
-    hardcode_libdir_flag_spec='-rpath $libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  sco3.2v5*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_shlibpath_var=no
-    runpath_var=LD_RUN_PATH
-    hardcode_runpath_var=yes
-    ;;
-
-  solaris*)
-    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='-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*)
-    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-    ;;
-
-  sysv4.3*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_shlibpath_var=no
-    export_dynamic_flag_spec='-Bexport'
-    ;;
-
-  sysv5*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-    hardcode_libdir_flag_spec=
-    hardcode_shlibpath_var=no
-    runpath_var='LD_RUN_PATH'
-    ;;
-
-  uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ld_shlibs=yes
-    fi
-    ;;
-
-  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
-    ;;
-
-  unixware7*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    ld_shlibs=no
-    ;;
-  esac
-fi
-
-## Compiler Characteristics: PIC flags, static flags, etc
-if test "X${ac_cv_prog_cc_pic+set}" = Xset; then
-  :
-else
-  ac_cv_prog_cc_pic=
-  ac_cv_prog_cc_shlib=
-  ac_cv_prog_cc_wl=
-  ac_cv_prog_cc_static=
-  ac_cv_prog_cc_no_builtin=
-  ac_cv_prog_cc_can_build_shared=$can_build_shared
-
-  if test "$with_gcc" = yes; then
-    ac_cv_prog_cc_wl='-Wl,'
-    ac_cv_prog_cc_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_cv_prog_cc_static='-Bstatic'
-      else
-        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-      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'.
-      ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    cygwin* | mingw* | 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).
-      ac_cv_prog_cc_pic='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_cv_prog_cc_pic='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      ac_cv_prog_cc_pic=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	 ac_cv_prog_cc_pic=-Kconform_pic
-      fi
-      ;;
-    *)
-      ac_cv_prog_cc_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for PIC flags for the system compiler.
-    case $host_os in
-    aix*)
-     # All AIX code is PIC.
-      ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      # Is there a better ac_cv_prog_cc_static that works with the bundled CC?
-      ac_cv_prog_cc_wl='-Wl,'
-      ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-      ac_cv_prog_cc_pic='+Z'
-      ;;
-
-    irix5* | irix6*)
-      ac_cv_prog_cc_wl='-Wl,'
-      ac_cv_prog_cc_static='-non_shared'
-      # PIC (with -KPIC) is the default.
-      ;;
-
-    cygwin* | mingw* | 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).
-      ac_cv_prog_cc_pic='-DDLL_EXPORT'
-      ;;
-
-    newsos6)
-      ac_cv_prog_cc_pic='-KPIC'
-      ac_cv_prog_cc_static='-Bstatic'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      # All OSF/1 code is PIC.
-      ac_cv_prog_cc_wl='-Wl,'
-      ac_cv_prog_cc_static='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      ac_cv_prog_cc_pic='-Kpic'
-      ac_cv_prog_cc_static='-dn'
-      ac_cv_prog_cc_shlib='-belf'
-      ;;
-
-    solaris*)
-      ac_cv_prog_cc_pic='-KPIC'
-      ac_cv_prog_cc_static='-Bstatic'
-      ac_cv_prog_cc_wl='-Wl,'
-      ;;
-
-    sunos4*)
-      ac_cv_prog_cc_pic='-PIC'
-      ac_cv_prog_cc_static='-Bstatic'
-      ac_cv_prog_cc_wl='-Qoption ld '
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      ac_cv_prog_cc_pic='-KPIC'
-      ac_cv_prog_cc_static='-Bstatic'
-      ac_cv_prog_cc_wl='-Wl,'
-      ;;
-
-    uts4*)
-      ac_cv_prog_cc_pic='-pic'
-      ac_cv_prog_cc_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	ac_cv_prog_cc_pic='-Kconform_pic'
-	ac_cv_prog_cc_static='-Bstatic'
-      fi
-      ;;
-
-    *)
-      ac_cv_prog_cc_can_build_shared=no
-      ;;
-    esac
-  fi
-  case "$host_os" in
-      # Platforms which do not suport PIC and -DPIC is meaningless
-      # on them:
-      *djgpp*)
-        ac_cv_prog_cc_pic=
-        ;;
-      *)
-        ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
-        ;;
-  esac
-fi
-
-need_lc=yes
-if test "$enable_shared" = yes && test "$with_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 $ac_n "checking whether -lc should be explicitly linked in... $ac_c" 1>&6
-    if eval "test \"`echo '$''{'ac_cv_archive_cmds_needs_lc'+set}'`\" = set"; then
-      echo $ac_n "(cached) $ac_c" 1>&6
-      need_lc=$ac_cv_archive_cmds_needs_lc
-    elif test "x$skip_need_lc_check" = "xyes" ; then
-      echo $ac_n "(skipping, using no) $ac_c" 1>&6
-      need_lc=no
-    else
-      $rm conftest*
-      echo "static int dummy;" > conftest.$ac_ext
-      if { (eval echo ltcf-c.sh:need_lc: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
-	# Append any warnings to the config.log.
-	cat conftest.err 1>&5
-	soname=conftest
-	lib=conftest
-	libobjs=conftest.$ac_objext
-	deplibs=
-	wl=$ac_cv_prog_cc_wl
-	compiler_flags=-v
-	linker_flags=-v
-	verstring=
-	output_objdir=.
-	libname=conftest
-	save_allow_undefined_flag=$allow_undefined_flag
-	allow_undefined_flag=
-	if { (eval echo ltcf-c.sh:need_lc: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then
-	  need_lc=no
-	fi
-	allow_undefined_flag=$save_allow_undefined_flag
-      else
-	cat conftest.err 1>&5
-      fi
-    fi
-    $rm conftest*
-    echo "$ac_t$need_lc" 1>&6
-    ;;
-  esac
-fi
-ac_cv_archive_cmds_needs_lc=$need_lc
diff --git a/admin/ltcf-cxx.sh b/admin/ltcf-cxx.sh
deleted file mode 100644
index 70ccba9..0000000
--- a/admin/ltcf-cxx.sh
+++ /dev/null
@@ -1,1040 +0,0 @@
-#### This script is meant to be sourced by ltconfig.
-
-# ltcf-cxx.sh - Create a C++ compiler specific configuration
-#
-# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# Original C++ support by:Gary V. Vaughan <gvv@techie.com>
-#    Alexandre Oliva <oliva@lsd.ic.unicamp.br>
-#    Ossama Othman <ossama@debian.org>
-#    Thomas Thanner <tanner@gmx.de>
-#
-# 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.
-
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return (0); }'
-
-# C++ compiler
-CXX=${CXX-c++}
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-CC=${CC-"$CXX"}
-CFLAGS=${CFLAGS-"$CXXFLAGS"}
-
-# Allow CC (or CXX) to be a program name with arguments.
-set dummy $CC
-compiler=$2
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# we are optimistic. (Too optimistic if you ask me, down there we switch it
-# off again for most platforms ;) (MM)
-ld_shlibs=yes
-
-# Check if we are using GNU gcc  (taken/adapted from configure script)
-# We need to check here since "--with-gcc" is set at configure time,
-# not ltconfig time!
-cat > conftest.$ac_ext <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-c++} -E conftest.$ac_ext'; { (eval echo \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  with_gcc=yes
-
-  # Set up default GNU C++ configuration
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if eval "`$CC -print-prog-name=ld` --version 2>&1" | \
-      egrep 'GNU ld' > /dev/null; then
-    with_gnu_ld=yes
-
-    archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${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" | \
-        egrep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-  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='$CC -shared $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_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-
-else
-  with_gcc=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-echo "ltcf-cxx: with_gcc=$with_gcc ; with_gnu_ld=$with_gnu_ld"
-
-# PORTME: fill in a description of your system's C++ link characteristics
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  aix4* | aix5*)
-    archive_cmds=''
-    hardcode_direct=yes
-    hardcode_libdir_separator=':'
-    link_all_deplibs=yes
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-    if test "$with_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
-        shared_flag='${wl}-G'
-      else
-        shared_flag='${wl}-bM:SRE'
-      fi
-    fi
-
-    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
-    # Let the compiler handle the export list.
-    always_export_symbols=no
-    if test "$aix_use_runtimelinking" = yes; then
-      allow_undefined_flag=' ${wl}-berok'
-      # The following three lines along with hardcode_into_libs=yes put the correct path into libraries.
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir${libdir:+:}/usr/lib:/lib'
-      archive_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' -o $lib'
-      archive_expsym_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
-     else
-      if test "$host_cpu" = ia64; then
-        hardcode_libdir_flag_spec='${wl}-R $libdir${libdir:+:}/usr/lib:/lib'
-        allow_undefined_flag="-z nodefs"
-        archive_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags '"$hardcode_libdir_flag_spec"' -o $lib'
-        archive_expsym_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
-      else
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-        # Warning - without using the other run time loading flags, -berok will
-        #           link without error, but may produce a broken library.
-        no_undefined_flag='${wl}-bnoerok'
-        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=' '
-        build_libtool_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
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  dgux*)
-    case $cc_basename in
-      ec++)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      ghcx)
-        # Green Hills C++ Compiler
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  freebsd*)
-    # FreeBSD uses GNU C++ and GNU ld
-    skip_need_lc_check=yes
-    remove_lgcc=yes
-    ;;
-  hpux*)
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    hardcode_minus_L=yes # Not in the search PATH, but as the default
-			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
-
-    case $cc_basename in
-      CC)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      aCC)
-	case $host_os in
-	hpux9*) archive_cmds='$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' ;;
-	*) archive_cmds='$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_cmds='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 "$with_gcc" = yes && test "$with_gnu_ld" = no ; then
-	  # MM: for HP-UX and g++ -fPIC is needed to link pic objects together
-	  case $host_os in
-	  hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -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' ;;
-	  *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
-	  esac
-	  output_verbose_link_cmds='$CC -shared -fPIC $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-	  remove_lgcc=yes
-        fi
-	if test "$with_gcc" = no ; then
-	  # FIXME: insert proper C++ library support
-          ld_shlibs=no
-	fi
-        ;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC)
-        # SGI C++
-        archive_cmds='$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='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-        if test "$with_gcc" = yes; then
-          if test "$with_gnu_ld" = no; then
-            archive_cmds='$CC -D_LANGUAGE_C_CPLUS_PLUS -shared $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='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
-          fi
-        fi
-        ;;
-    esac
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    link_all_deplibs=yes
-    ;;
-  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='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-        archive_expsym_cmds='templib=`echo $lib | sed -e "s/\.so\..*/\.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_cmds='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest.so 2>&1 | egrep "ld"`; rm -f libconftest.so; 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='${wl}--rpath,$libdir'
-        export_dynamic_flag_spec='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-        old_archive_cmds='$CC -Bstatic -o $oldlib $oldobjs'
-        ;;
-      cxx)
-        # Compaq C++
-        archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds='$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='-rpath $libdir'
-        hardcode_libdir_separator=:
-
-        # 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_cmds='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'
-        ;;
-      insure)
-        if test "$with_gcc" = yes; then
-	  # Insure++ together with gcc probably means also GNU ld
-	  # only -whole-archive isn't supported
-	  whole_archive_flag_spec=""
-	  # and we can't use -nostdlib, because bloody insure has no way to
-	  # output the linkline (-Zvm isn't working as documented), so we don't
-	  # know the depending libs. So we hope, insure gets it right anyway.
-	  archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  runpath_var=LD_RUN_PATH
-	  hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-	  export_dynamic_flag_spec='${wl}--export-dynamic'
-	  output_verbose_link_cmds=""
-	fi
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  netbsd*)
-    if test "$with_gcc" = no || test "$with_gnu_ld" = no; then
-      # This should only be triggered for NetBSD/a.out
-      # Add in C++ constructor/destructor support
-      if test -f /usr/pkg/lib/c++rt0/c++rt0.o.PIC; then
-        cppopts="/usr/pkg/lib/c++rt0/c++rt0.o.PIC"
-      elif test -f /usr/lib/c++rt0.o; then
-        cppopts="/usr/lib/c++rt0.o"
-      fi
-      archive_cmds='ld -Bshareable -o $lib '"$cppopts"' $libobjs $deplibs $linkopts'
-    fi
-    ;;
-  openbsd*)
-    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-      # MM: OpenBSD 2.7 uses G++, but not GNU ld
-      archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
-      hardcode_libdir_flag_spec='${wl}-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      whole_archive_flag_spec='${wl}-Bforcearchive'
-      remove_lgcc=yes
-    fi
-    ;;
-  osf3*)
-    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$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='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-
-      # 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_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-    else
-      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='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  hardcode_libdir_separator=:
-
-	  # Archives containing C++ object files must be created using
-	  # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	  old_archive_cmds='$CC -Bstatic -o $oldlib $oldobjs'
-
-	  ;;
-	RCC)
-	  # Rational C++ 2.4.1
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs=no
-	  ;;
-	cxx)
-	  allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds='$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='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator=:
-
-	  # 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_cmds='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'
-	  ;;
-	*)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs=no
-	  ;;
-      esac
-    fi
-    ;;
-  osf4* | osf5*)
-    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-      allow_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
-      no_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
-      archive_cmds='$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='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-
-      # 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_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-    else
-      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='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  hardcode_libdir_separator=:
-
-	  # Archives containing C++ object files must be created using
-	  # the KAI C++ compiler.
-	  old_archive_cmds='$CC -o $oldlib $oldobjs'
-	  ;;
-	RCC)
-	  # Rational C++ 2.4.1
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs=no
-	  ;;
-	cxx)
-	  allow_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
-	  no_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
-	  archive_cmds='$CC -shared${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` -update_registry ${objdir}/so_locations -o $lib'
-	  
-	  hardcode_libdir_flag_spec='-rpath $libdir'
-	  hardcode_libdir_separator=:
-
-	  # 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_cmds='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'
-	  ;;
-	*)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs=no
-	  ;;
-      esac
-    fi
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  sco*)
-    case $cc_basename in
-      CC)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC)
-        # Sun C++ 4.x
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      lcc)
-        # Lucid
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        no_undefined_flag=' -ztext'
-        archive_cmds='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-        archive_expsym_cmds='$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='-R$libdir'
-        hardcode_shlibpath_var=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='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-            ;;
-        esac
-        link_all_deplibs=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_cmds='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | egrep "\-R|\-L"`; 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='$CC -xar -o $oldlib $oldobjs'
-        ;;
-      gcx)
-        # Green Hills C++ Compiler
-        archive_cmds='$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='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-        ;;
-      *)
-        # GNU C++ compiler with Solaris linker
-        if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-          if $CC --version | egrep -v '^2\.7' > /dev/null; then
-            archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
-            archive_expsym_cmds='$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 $linker_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_cmds="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
-          else
-            # g++ 2.7 appears to require `-G' NOT `-shared' on this
-            # platform.
-            archive_cmds='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
-            archive_expsym_cmds='$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 $linker_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_cmds="$CC -G $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
-          fi
-
-          hardcode_libdir_flag_spec='${wl}-R $wl$libdir'
-        fi
-        ;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC)
-        # NonStop-UX NCC 3.20
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  unixware*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-esac
-
-
-## Compiler Characteristics: PIC flags, static flags, etc
-
-# We don't use cached values here since only the C compiler
-# characteristics should be cached.
-ac_cv_prog_cc_pic=
-ac_cv_prog_cc_shlib=
-ac_cv_prog_cc_wl=
-ac_cv_prog_cc_static=
-ac_cv_prog_cc_no_builtin=
-ac_cv_prog_cc_can_build_shared=$can_build_shared
-
-ac_cv_prog_cc_pic_works=
-ac_cv_prog_cc_static_works=
-
-if test "$with_gcc" = yes; then
-  ac_cv_prog_cc_wl='-Wl,'
-  ac_cv_prog_cc_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_cv_prog_cc_static='-Bstatic'
-    else
-      lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-    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'.
-    ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-    ;;
-  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-    # PIC is the default for these OSes.
-    ;;
-  cygwin* | mingw* | 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).
-    ac_cv_prog_cc_pic='-DDLL_EXPORT'
-    ;;
-  darwin* | rhapsody*)
-    # PIC is the default on this platform
-    # Common symbols not allowed in MH_DYLIB files
-    lt_cv_prog_cc_pic='-fno-common'
-    ;;
-  *djgpp*)
-    # DJGPP does not support shared libraries at all
-    ac_cv_prog_cc_pic=
-    ;;
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      ac_cv_prog_cc_pic=-Kconform_pic
-    fi
-    ;;
-  *)
-    ac_cv_prog_cc_pic='-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_cv_prog_cc_static='-Bstatic'
-      else
-        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-    chorus*)
-      case $cc_basename in
-      cxch68)
-        # Green Hills C++ Compiler
-        # ac_cv_prog_cc_static="--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++)
-          ac_cv_prog_cc_pic='-KPIC'
-          ;;
-        ghcx)
-          # Green Hills C++ Compiler
-          ac_cv_prog_cc_pic='-pic'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    freebsd*)
-      # FreeBSD uses GNU C++
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      case $cc_basename in
-        CC)
-          ac_cv_prog_cc_wl='-Wl,'
-          ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-          ac_cv_prog_cc_pic='+Z'
-          ;;
-        aCC)
-          ac_cv_prog_cc_wl='-Wl,'
-          ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-          ac_cv_prog_cc_pic='+Z'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    irix5* | irix6*)
-      case $cc_basename in
-        CC)
-          ac_cv_prog_cc_wl='-Wl,'
-          ac_cv_prog_cc_static='-non_shared'
-          ac_cv_prog_cc_pic='-KPIC'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    linux*)
-      case $cc_basename in
-        KCC)
-          # KAI C++ Compiler
-          ac_cv_prog_cc_wl='--backend -Wl,'
-          ac_cv_prog_cc_pic='-fPIC'
-          ;;
-        cxx)
-          # Compaq C++
-          # Make sure the PIC flag is empty.  It appears that all Alpha
-          # Linux and Compaq Tru64 Unix objects are PIC.
-          ac_cv_prog_cc_pic=
-          ac_cv_prog_cc_static='-non_shared'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    lynxos*)
-      ;;
-    m88k*)
-      ;;
-    mvs*)
-      case $cc_basename in
-        cxx)
-          ac_cv_prog_cc_pic='-W c,exportall'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    netbsd*)
-      ;;
-    osf3* | osf4* | osf5*)
-      case $cc_basename in
-        KCC)
-          ac_cv_prog_cc_wl='--backend -Wl,'
-          ;;
-        RCC)
-          # Rational C++ 2.4.1
-          ac_cv_prog_cc_pic='-pic'
-          ;;
-        cxx)
-          # Digital/Compaq C++
-          ac_cv_prog_cc_wl='-Wl,'
-          # Make sure the PIC flag is empty.  It appears that all Alpha
-          # Linux and Compaq Tru64 Unix objects are PIC.
-          ac_cv_prog_cc_pic=
-          ac_cv_prog_cc_static='-non_shared'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    psos*)
-      ;;
-    sco*)
-      case $cc_basename in
-        CC)
-          ac_cv_prog_cc_pic='-fPIC'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    solaris*)
-      case $cc_basename in
-        CC)
-          # Sun C++ 4.2, 5.x and Centerline C++
-          ac_cv_prog_cc_pic='-KPIC'
-          ac_cv_prog_cc_static='-Bstatic'
-          ac_cv_prog_cc_wl='-Qoption ld '
-          ;;
-        gcx)
-          # Green Hills C++ Compiler
-          ac_cv_prog_cc_pic='-PIC'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    sunos4*)
-      case $cc_basename in
-        CC)
-          # Sun C++ 4.x
-          ac_cv_prog_cc_pic='-pic'
-          ac_cv_prog_cc_static='-Bstatic'
-          ;;
-        lcc)
-          # Lucid
-          ac_cv_prog_cc_pic='-pic'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    tandem*)
-      case $cc_basename in
-        NCC)
-          # NonStop-UX NCC 3.20
-          ac_cv_prog_cc_pic='-KPIC'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    unixware*)
-      ;;
-    vxworks*)
-      ;;
-    *)
-      ac_cv_prog_cc_can_build_shared=no
-      ;;
-  esac
-fi
-
-case "$host_os" in
-    # Platforms which do not suport PIC and -DPIC is meaningless
-    # on them:
-    *djgpp*)
-      ac_cv_prog_cc_pic=
-      ;;
-    *)
-      ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
-      ;;
-esac
-
-
-# Figure out "hidden" C++ library dependencies from verbose
-# compiler output whening linking a shared library.
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-
-if (eval $ac_compile) 2>&5; 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
-
-  for p in `eval $output_verbose_link_cmds`; 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"; then
-             compiler_lib_search_path="${prev}${p}"
-           else
-             compiler_lib_search_path="${compiler_lib_search_path} ${prev}${p}"
-           fi
-           ;;
-         # The "-l" case would never come before the object being
-         # linked, so don't bother handling this case.
-         esac
-       else
-	 add="${prev}${p}"
-	 if test "x$remove_lgcc" = "xyes" ; then
-	   case "$add" in
-	     -lgcc ) add="" ;;
-	   esac
-	 fi
-	 if test -n "$add" ; then
-           if test -z "$postdeps"; then
-             postdeps="$add"
-           else
-             postdeps="${postdeps} ${add}"
-           fi
-         fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-         pre_test_object_deps_done=yes
-         continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-         if test -z "$predep_objects"; then
-           predep_objects="$p"
-         else
-           predep_objects="$predep_objects $p"
-         fi
-       else
-         if test -z "$postdep_objects"; then
-           postdep_objects="$p"
-         else
-           postdep_objects="$postdep_objects $p"
-         fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out
-else
-  echo "ltcf-cxx.sh: error: problem compiling test program"
-fi
-
-$rm -f confest.$objext
-
-if test "x$skip_need_lc_check" = "xyes" ; then
-  need_lc=no
-else
-  case " $postdeps " in
-  *" -lc "*) need_lc=no ;;
-  *) need_lc=yes ;;
-  esac
-fi
diff --git a/admin/ltconfig b/admin/ltconfig
deleted file mode 100755
index caefe9f..0000000
--- a/admin/ltconfig
+++ /dev/null
@@ -1,2794 +0,0 @@
-#! /bin/sh
-
-# ltconfig - Create a system-specific libtool.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# 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 lot of this script is taken from autoconf-2.10.
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-echo=echo
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) PATH_SEPARATOR=';' ;;
-    *)     PATH_SEPARATOR=':' ;;
-  esac
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test "X${echo_test_string+set}" != Xset; then
-  # find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for dir in $PATH /usr/ucb; do
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running ltconfig again with it.
-      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 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
-
-# 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'
-
-# The name of this program.
-progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
-
-# Constants:
-PROGRAM=ltconfig
-PACKAGE=libtool
-VERSION=1.4a
-TIMESTAMP=" (1.641.2.206mm 2001/04/03 21:47:47)"
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-rm="rm -f"
-
-help="Try \`$progname --help' for more information."
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-enable_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-enable_static=yes
-enable_fast_install=yes
-enable_dlopen=unknown
-enable_win32_dll=no
-pic_mode=default
-ltmain=
-silent=
-srcdir=
-ac_config_guess=
-ac_config_sub=
-host=
-build=NONE
-nonopt=NONE
-ofile="$default_ofile"
-verify_host=yes
-tagname=
-with_gcc=no
-with_gnu_ld=no
-need_locks=yes
-ac_ext=c
-libext=a
-cache_file=
-max_cmd_len=
-
-## Dependencies to place before and after the object being linked:
-predep_objects=
-postdep_objects=
-predeps=
-postdeps=
-compiler_lib_search_path=
-
-## Link characteristics:
-allow_undefined_flag=
-no_undefined_flag=
-need_lib_prefix=unknown
-need_version=unknown
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-archive_cmds=
-archive_expsym_cmds=
-old_archive_from_new_cmds=
-old_archive_from_expsyms_cmds=
-striplib=
-old_striplib=
-export_dynamic_flag_spec=
-whole_archive_flag_spec=
-thread_safe_flag_spec=
-hardcode_into_libs=no
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-hardcode_shlibpath_var=unsupported
-runpath_var=
-link_all_deplibs=unknown
-always_export_symbols=no
-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-# include_expsyms should be a list of space-separated symbols to be *always*
-# included in the symbol list
-include_expsyms=
-# exclude_expsyms can be an egrep regular expression of symbols to exclude
-# it will be wrapped by ` (' and `)$', so one must not match beginning or
-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-# as well as any symbol that contains `d'.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-# platforms (ab)use it in PIC code, but their linkers get confused if
-# the symbol is explicitly referenced.  Since portable code cannot
-# rely on this symbol name, it's probably fine to never include it in
-# preloaded symbol tables.
-extract_expsyms_cmds=
-
-## Tools:
-old_AR="$AR"
-old_AR_FLAGS="$AR_FLAGS"
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-old_CPPFLAGS="$CPPFLAGS"
-old_LDFLAGS="$LDFLAGS"
-old_LIBS="$LIBS"
-old_MAGIC_CMD="$MAGIC_CMD"
-old_LD="$LD"
-old_LN_S="$LN_S"
-old_LTCC="$LTCC"
-old_NM="$NM"
-old_RANLIB="$RANLIB"
-old_STRIP="$STRIP"
-old_AS="$AS"
-old_DLLTOOL="$DLLTOOL"
-old_OBJDUMP="$OBJDUMP"
-old_OBJEXT="$OBJEXT"
-old_EXEEXT="$EXEEXT"
-old_reload_flag="$reload_flag"
-old_deplibs_check_method="$deplibs_check_method"
-old_file_magic_cmd="$file_magic_cmd"
-
-# Parse the command line options.
-args=
-prev=
-for option
-do
-  case $option in
-  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    eval "$prev=\$option"
-    prev=
-    continue
-  fi
-
-  case $option in
-  --help) cat <<EOM
-Usage: $progname [OPTION]... LTMAIN [HOST]
-
-Generate a system-specific libtool script.
-
-    --build                configure for building on BUILD [BUILD=HOST]
-    --debug                enable verbose shell tracing
-    --disable-shared       do not build shared libraries
-    --disable-static       do not build static libraries
-    --disable-fast-install do not optimize for fast installation
-    --enable-dlopen        enable dlopen support
-    --enable-win32-dll     enable building dlls on win32 hosts
-    --help                 display this help and exit
-    --no-verify            do not verify that HOST is a valid host type
--o, --output=FILE          specify the output file [default=$default_ofile]
-    --quiet                same as \`--silent'
-    --silent               do not print informational messages
-    --srcdir=DIR           find \`config.guess' in DIR
-    --version              output version information and exit
-    --add-tag=TAG          append an alternate configuration
-    --with-gcc             assume that the GNU C compiler will be used
-    --with-gnu-ld          assume that the C compiler uses the GNU linker
-    --prefer-pic           try to use only PIC objects
-    --prefer-non-pic       try to use only non-PIC objects
-    --disable-lock         disable file locking
-    --cache-file=FILE      configure cache file
-
-LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
-that provides basic libtool functionality.
-
-HOST is the canonical host system name [default=guessed].
-EOM
-  exit 0
-  ;;
-
-  --build) prev=build ;;
-  --build=*) build="$optarg" ;;
-
-  --debug)
-    echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --disable-shared) enable_shared=no ;;
-
-  --disable-static) enable_static=no ;;
-
-  --disable-fast-install) enable_fast_install=no ;;
-
-  --enable-dlopen) enable_dlopen=yes ;;
-
-  --enable-win32-dll) enable_win32_dll=yes ;;
-
-  --quiet | --silent) silent=yes ;;
-
-  --srcdir) prev=srcdir ;;
-  --srcdir=*) srcdir="$optarg" ;;
-
-  --no-verify) verify_host=no ;;
-
-  --output | -o) prev=ofile ;;
-  --output=*) ofile="$optarg" ;;
-
-  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
-
-  --add-tag) prev=tagname ;;
-  --add-tag=*) tagname="$optarg" ;;
-
-  --with-gcc) with_gcc=yes ;;
-  --with-gnu-ld) with_gnu_ld=yes ;;
-
-  --prefer-pic) pic_mode=yes ;;
-  --prefer-non-pic) pic_mode=no ;;
-
-  --disable-lock) need_locks=no ;;
-
-  --cache-file=*) cache_file="$optarg" ;;
-
-  -*)
-    echo "$progname: unrecognized option \`$option'" 1>&2
-    echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    if test -z "$ltmain"; then
-      ltmain="$option"
-    elif test -z "$host"; then
-# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
-#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
-#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
-#      fi
-      host="$option"
-    else
-      echo "$progname: too many arguments" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-done
-
-if test -z "$ltmain"; then
-  echo "$progname: you must specify a LTMAIN file" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-if test ! -f "$ltmain"; then
-  echo "$progname: \`$ltmain' does not exist" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-if test -n "$tagname"; then
-  # Check whether tagname contains only valid characters
-  case `$echo "X$tagname" | $Xsed -e 's/[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]//g'` in
-  "") ;;
-  *)
-    echo "$progname: invalid tag name: $tagname" 1>&2
-    exit 1
-    ;;
-  esac
-
-  if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$ofile" > /dev/null; then
-    echo "$progname: tag name $tagname already exists" 1>&2
-    exit 1
-  fi
-
-  if test ! -f "$ofile"; then
-    echo "$progname: warning: output file \`$ofile' does not exist" 1>&2
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL $ofile --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      echo "$progname: warning: output file \`$ofile' does not look like a libtool script" 1>&2
-    else
-      echo "$progname: warning: using \`LTCC=$LTCC', extracted from \`$ofile'" 1>&2
-    fi
-  fi
-fi
-
-# Quote any args containing shell metacharacters.
-ltconfig_args=
-for arg
-do
-  case $arg in
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ltconfig_args="$ltconfig_args '$arg'" ;;
-  *) ltconfig_args="$ltconfig_args $arg" ;;
-  esac
-done
-
-# A relevant subset of AC_INIT.
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 compiler messages saved in config.log
-# 6 checking for... messages and results
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>>./config.log
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
-if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
-
-if test -n "$cache_file" && test -r "$cache_file" && test -f "$cache_file"; then
-  echo "loading cache $cache_file within ltconfig"
-  . $cache_file
-fi
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-if test -z "$srcdir"; then
-  # Assume the source directory is the same one as the path to LTMAIN.
-  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
-  test "$srcdir" = "$ltmain" && srcdir=.
-fi
-
-trap "$rm conftest*; exit 1" 1 2 15
-if test "$verify_host" = yes; then
-  # Check for config.guess and config.sub.
-  ac_aux_dir=
-  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-    if test -f $ac_dir/config.guess; then
-      ac_aux_dir=$ac_dir
-      break
-    fi
-  done
-  if test -z "$ac_aux_dir"; then
-    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-  ac_config_guess=$ac_aux_dir/config.guess
-  ac_config_sub=$ac_aux_dir/config.sub
-
-  # Make sure we can run config.sub.
-  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
-  else
-    echo "$progname: cannot run $ac_config_sub" 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-
-  echo $ac_n "checking host system type""... $ac_c" 1>&6
-
-  host_alias=$host
-  case $host_alias in
-  "")
-    # Force config.guess to use the C compiler.
-    # CC_FOR_BUILD overrides the CC variable in config.guess but I had
-    # problems with it so do it this way for now.
-    CC="$LTCC"
-
-    if host_alias=`$SHELL $ac_config_guess`; then :
-    else
-      echo "$progname: cannot guess host type; you must specify one" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Restore the C compiler.
-    CC="$old_CC"
-    ;;
-  esac
-  host=`$SHELL $ac_config_sub $host_alias`
-  echo "$ac_t$host" 1>&6
-
-  # Make sure the host verified.
-  test -z "$host" && exit 1
-
-  # Check for the build system type
-  echo $ac_n "checking build system type... $ac_c" 1>&6
-
-  build_alias=$build
-  case $build_alias in
-  NONE)
-    case $nonopt in
-    NONE) build_alias=$host_alias ;;
-    *) build_alias=$nonopt ;;
-    esac ;;
-  esac
-
-  build=`$SHELL $ac_config_sub $build_alias`
-  build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-  echo "$ac_t""$build" 1>&6
-
-elif test -z "$host"; then
-  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
-  echo "$help" 1>&2
-  exit 1
-else
-  host_alias=$host
-  build_alias=$host_alias
-  build=$host
-fi
-
-if test x"$host" != x"$build"; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case $host_os in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-esac
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# 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
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-fi
-
-# Source the script associated with the $tagname tag configuration.
-if test -n "$tagname"; then
-  . $ltmain
-else
-  # FIXME:  We should use a variable here
-  # Configure for a C compiler
-  . $srcdir/ltcf-c.sh
-fi
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$NM" && NM=nm
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$objext" && objext=o
-
-echo $ac_n "checking for objdir... $ac_c" 1>&6
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-echo "$ac_t$objdir" 1>&6
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-set dummy $CC
-compiler="$2"
-
-# We assume here that the value for ac_cv_prog_cc_pic will not be cached
-# in isolation, and that seeing it set (from the cache) indicates that
-# the associated values are set (in the cache) correctly too.
-echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
-echo "$progname:678:checking for $compiler option to produce PIC" 1>&5
-
-if test -z "$ac_cv_prog_cc_pic"; then
-  echo "$ac_t"none 1>&6
-else
-  echo "$ac_t""$ac_cv_prog_cc_pic" 1>&6
-
-  # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $ac_cv_prog_cc_pic works... $ac_c" 1>&6
-  echo "$progname:687:checking that $compiler PIC flag $ac_cv_prog_cc_pic works." 1>&5
-  if test "X${ac_cv_prog_cc_pic_works+set}" = Xset && \
-     test "X${ac_cv_prog_cc_pic_works}" != X; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    ac_cv_prog_cc_pic_works=yes
-    $rm conftest*
-    echo $lt_simple_compile_test_code > conftest.$ac_ext
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $ac_cv_prog_cc_pic -DPIC"
-    if { (eval echo $progname:697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-      # Append any warnings to the config.log.
-      cat conftest.err 1>&5
-
-      case $host_os in
-      hpux9* | hpux10* | hpux11*)
-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-	# they create non-PIC objects.  So, if there were any warnings, we
-	# assume that PIC is not supported.
-	if test -s conftest.err; then
-	  ac_cv_prog_cc_pic_works=no
-	  ac_cv_prog_cc_can_build_shared=no
-	  ac_cv_prog_cc_pic=
-	else
-	  ac_cv_prog_cc_pic_works=yes
-	  ac_cv_prog_cc_pic=" $ac_cv_prog_cc_pic"
-	fi
-	;;
-      *)
-	ac_cv_prog_cc_pic_works=yes
-	ac_cv_prog_cc_pic=" $ac_cv_prog_cc_pic"
-	;;
-      esac
-    else
-      # Append any errors to the config.log.
-      cat conftest.err 1>&5
-      ac_cv_prog_cc_pic_works=no
-      ac_cv_prog_cc_can_build_shared=no
-      ac_cv_prog_cc_pic=
-    fi
-    CFLAGS="$save_CFLAGS"
-    $rm conftest*
-  fi
-  # Belt *and* braces to stop my trousers falling down:
-  if test "X$ac_cv_prog_cc_pic_works" = Xno; then
-    ac_cv_prog_cc_pic=
-    ac_cv_prog_cc_can_build_shared=no
-  fi
-  echo "$ac_t""$ac_cv_prog_cc_pic_works" 1>&6
-fi
-
-# Check for any special shared library compilation flags.
-if test -n "$ac_cv_prog_cc_shlib"; then
-  echo "$progname: warning: \`$CC' requires \`$ac_cv_prog_cc_shlib' to build shared libraries" 1>&2
-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$ac_cv_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    echo "$progname: add \`$ac_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
-    ac_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-echo $ac_n "checking if $compiler static flag $ac_cv_prog_cc_static works... $ac_c" 1>&6
-echo "$progname:749: checking if $compiler static flag $ac_cv_prog_cc_static works" >&5
-if test "X${ac_cv_prog_cc_static_works+set}" = Xset && \
-   test "X${ac_cv_prog_cc_static_works}" != X; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  $rm conftest*
-  echo $lt_simple_link_test_code > conftest.$ac_ext
-  save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $ac_cv_prog_cc_static"
-  if { (eval echo $progname:758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    ac_cv_prog_cc_static_works=yes
-  else
-    ac_cv_prog_cc_static_works=no
-    ac_cv_prog_cc_static=
-  fi
-  LDFLAGS="$save_LDFLAGS"
-  $rm conftest*
-fi
-# Belt *and* braces to stop my trousers falling down:
-if test "X$ac_cv_prog_cc_static_works" = Xno; then
-  ac_cv_prog_cc_static=
-fi
-echo "$ac_t""$ac_cv_prog_cc_static_works" 1>&6
-pic_flag="$ac_cv_prog_cc_pic"
-special_shlib_compile_flags="$ac_cv_prog_cc_shlib"
-wl="$ac_cv_prog_cc_wl"
-link_static_flag="$ac_cv_prog_cc_static"
-no_builtin_flag="$ac_cv_prog_cc_no_builtin"
-can_build_shared="$ac_cv_prog_cc_can_build_shared"
-
-# find the maximum length of command line arguments
-echo "$progname:780: finding the maximum length of command line arguments" 1>&5
-echo $ac_n "finding the maximum length of command line arguments... $ac_c" 1>&6
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  i=0
-  testring="ABCDEF"
-  while test `$CONFIG_SHELL $0 --fallback-echo "X$testring" >/dev/null 2>&1` == `echo "X$testring" >/dev/null 2>&1` &&
-          new_result=`expr "X$testring" : ".*" 2>&1` &&
-          lt_cv_sys_max_cmd_len=$new_result &&
-          test $i != 32 # 1 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.  1/4 should be good.
-  len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-  lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len - $len`
-fi
-echo "$progname:@lineno@: result: $lt_cv_sys_max_cmd_len" 1>&5
-echo "${ac_t}$lt_cv_sys_max_cmd_len" 1>&6
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  max_cmd_len=$lt_cv_sys_max_cmd_len
-else
-  max_cmd_len=none
-fi
-
-# Check to see if options -o and -c are simultaneously supported by compiler
-echo $ac_n "checking if $compiler supports -c -o file.$objext... $ac_c" 1>&6
-if test "${lt_cv_compiler_c_o+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  $rm -r conftest 2>/dev/null
-  mkdir conftest
-  cd conftest
-  $rm conftest*
-  echo $lt_simple_compile_test_code > conftest.$ac_ext
-  mkdir out
-  # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-  # that will create temporary files in the current directory regardless of
-  # the output directory.  Thus, making CWD read-only will cause this test
-  # to fail, enabling locking or at least warning the user not to do parallel
-  # builds.
-  chmod -w .
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -o out/conftest2.$objext"
-  echo "$progname:829: checking if $compiler supports -c -o file.$objext" >&5
-  if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$objext; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s out/conftest.err; then
-        lt_cv_compiler_c_o=no
-      else
-        lt_cv_compiler_c_o=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat out/conftest.err 1>&5
-    lt_cv_compiler_c_o=no
-  fi
-  CFLAGS="$save_CFLAGS"
-  chmod u+w .
-  $rm conftest* out/*
-  rmdir out
-  cd ..
-  rmdir conftest
-  $rm -r conftest 2>/dev/null
-fi
-compiler_c_o=$lt_cv_compiler_c_o
-echo "${ac_t}$compiler_c_o" 1>&6
-
-# Check to see if we can do hard links to lock some files if needed
-hard_links="nottested"
-if test "$compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$ac_t$hard_links" 1>&6
-  $rm conftest*
-  if test "$hard_links" = no; then
-    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-if test "$with_gcc" = yes; then
-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
-  $rm conftest*
-  echo $lt_simple_compile_test_code > conftest.$ac_ext
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-  echo "$progname:883: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-  if { (eval echo $progname:884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	compiler_rtti_exceptions=no
-      else
-	echo "$ac_t"yes 1>&6
-	compiler_rtti_exceptions=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    compiler_rtti_exceptions=no
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-
-  if test "$compiler_rtti_exceptions" = "yes"; then
-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-  else
-    no_builtin_flag=' -fno-builtin'
-  fi
-  
-fi
-
-# See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
-
-echo "$ac_t$ld_shlibs" 1>&6
-test "$ld_shlibs" = no && can_build_shared=no
-
-# Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var"; 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 "$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 "$ac_t$hardcode_action" 1>&6
-
-echo $ac_n "checking whether stripping libraries is possible... $ac_c" 1>&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 "${ac_t}yes" 1>&6
-else
-  echo "${ac_t}no" 1>&6
-fi
-
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-# PORTME Fill in your ld.so characteristics
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-
-echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$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}.so$major'
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # 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.
-    # We preserve .a as extension for shared libraries though AIX4.2
-    # and later linker supports .so
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
-      # lib<name>.a to let people know that these are not typical AIX shared libraries.
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-      # We want symlinks to be created for the different names.
-      version_type=linux
-    else
-      # We preserve .a as extension for shared libraries though AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}.so$major.o'
-    fi
-    # 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 | egrep '(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
-    shlibpath_var=LIBPATH
-    deplibs_check_method=pass_all
-    # Put the right runpath into libraries.
-    hardcode_into_libs=yes
-    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
-	# 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.
-        can_build_shared=no
-      fi
-      ;;
-    esac
-  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}.so'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  lt_cv_dlopen="load_add_on"
-  lt_cv_dlopen_libs=
-  lt_cv_dlopen_self=yes
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  export_dynamic_flag_spec=-rdynamic
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  need_version=no
-  need_lib_prefix=no
-  case $with_gcc,$host_os in
-  yes,cygwin*)
-    library_names_spec='$libname.dll.a'
-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog .libs/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll; $rm \$dlpath'
-    ;;
-  yes,mingw*)
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
-    ;;
-  yes,pw32*)
-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-;;
-  *)
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  lt_cv_dlopen="LoadLibrary"
-  lt_cv_dlopen_libs=
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.$`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
-  soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  *)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  dynamic_linker="$host_os dld.sl"
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  shlibpath_var=SHLIB_PATH
-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-  soname_spec='${libname}${release}.sl$major'
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6*)
-  version_type=irix
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
-  case $host_os in
-  irix5*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-    need_version=yes
-  else
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-    soname_spec='${libname}${release}.so$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-    need_version=no
-  fi
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  # OpenBSD 2.7 the overriding is needed for fast-install
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  need_lib_prefix=no
-  library_names_spec='$libname.dll $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_version=no
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-    soname_spec='$libname.so.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$ac_t$dynamic_linker" 1>&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-
-# 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
-global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/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
-  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
-  ;;
-irix*)
-  symcode='[BCDEGRST]'
-  ;;
-solaris* | sysv5*)
-  symcode='[BDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $host_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[ABCDGISTW]'
-fi
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-  $rm 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
-
-  echo "$progname:1423: checking if global_symbol_pipe works" >&5
-  if { (eval echo $progname:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { echo "$progname:1427: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$global_symbol_to_cdecl"' < "$nlist" >> 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/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> 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.$objext conftstm.$objext
-	  save_LIBS="$LIBS"
-	  save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo $progname:1479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-	    pipe_works=yes
-	  else
-	    echo "$progname: failed program was:" >&5
-	    cat conftest.$ac_ext >&5
-	  fi
-	  LIBS="$save_LIBS"
-	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 $global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  $rm conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    global_symbol_pipe=
-  fi
-done
-if test "$pipe_works" = yes; then
-  echo "${ac_t}ok" 1>&6
-else
-  echo "${ac_t}failed" 1>&6
-fi
-
-if test -z "$global_symbol_pipe"; then
-  global_symbol_to_cdecl=
-fi
-
-# Report the final consequences.
-echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
-
-# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
-# configure.in, otherwise build static only libraries.
-case $host_os in
-cygwin* | mingw* | pw32* | os2*)
-  if test x$can_build_shared = xyes; then
-    test x$enable_win32_dll = xno && can_build_shared=no
-    echo "checking if package supports dlls... $can_build_shared" 1>&6
-  fi
-;;
-esac
-
-echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-
-echo "$ac_t$enable_shared" 1>&6
-
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-
-echo "checking whether to build static libraries... $enable_static" 1>&6
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$with_gcc" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-# Check whether we must set pic_mode to default
-test -z "$pic_flag" && pic_mode=default
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-if test "X${lt_cv_dlopen+set}" != Xset; then
-  lt_cv_dlopen=no lt_cv_dlopen_libs=
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "$progname:1583: checking for dlopen in -ldl" >&5
-if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-/*#line 1590 "ltconfig"*/
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo $progname:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if test "X$ac_cv_lib_dl_dlopen" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "$progname:1622: checking for dlopen" >&5
-if test "X${ac_cv_func_dlopen+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-/*#line 1627 "ltconfig"*/
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-dlopen();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo $progname:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_dlopen=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_dlopen=no
-fi
-rm -f conftest*
-fi
-if test "X$ac_cv_func_dlopen" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "$progname:1669: checking for dlopen in -lsvld" >&5
-if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsvld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-/*#line 1676 "ltconfig"*/
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo $progname:1689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if test "X$ac_cv_lib_svld_dlopen" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "$progname:1708: checking for dld_link in -ldld" >&5
-if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-/*#line 1715 "ltconfig"*/
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link();
-
-int main() {
-dld_link()
-; return 0; }
-EOF
-if { (eval echo $progname:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if test "X$ac_cv_lib_dld_dld_link" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "$progname:1747: checking for shl_load" >&5
-if test "X${ac_cv_func_shl_load+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-/*#line 1752 "ltconfig"*/
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-shl_load();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo $progname:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_shl_load=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_shl_load=no
-fi
-rm -f conftest*
-fi
-
-if test "X$ac_cv_func_shl_load" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "$progname:1795: checking for shl_load in -ldld" >&5
-if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-/*#line 1802 "ltconfig"*/
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load();
-
-int main() {
-shl_load()
-; return 0; }
-EOF
-if { (eval echo $progname:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if test "X$ac_cv_lib_dld_shl_load" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-fi
-
-fi
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-for ac_hdr in dlfcn.h; do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "$progname:1863: checking for $ac_hdr" >&5
-if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-/*#line 1868 "ltconfig"*/
-#include <$ac_hdr>
-int fnord = 0;
-int main () { return(0); }
-EOF
-ac_try="$ac_compile >/dev/null 2>conftest.out"
-{ (eval echo $progname:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-    if test "x$ac_cv_header_dlfcn_h" = xyes; then
-      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-    fi
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:1902: checking whether a program can dlopen itself" >&5
-if test "X${lt_cv_dlopen_self+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    lt_cv_dlopen_self=cross
-  else
-    cat > conftest.$ac_ext <<EOF
-/*#line 1910 "ltconfig"*/
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LTDL_GLOBAL	RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-#  define LTDL_GLOBAL	DL_GLOBAL
-# else
-#  define LTDL_GLOBAL	0
-# endif
-#endif
-
-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LTDL_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-# else
-#  ifdef DL_LAZY
-#   define LTDL_LAZY_OR_NOW	DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-#   else
-#    ifdef DL_NOW
-#     define LTDL_LAZY_OR_NOW	DL_NOW
-#    else
-#     define LTDL_LAZY_OR_NOW	0
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-void fnord() { int i=42; }
-int main() {
-    void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-               if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); return 1;}
-
-EOF
-if { (eval echo $progname:1957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  lt_cv_dlopen_self=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  lt_cv_dlopen_self=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-
-  if test "$lt_cv_dlopen_self" = yes; then
-    LDFLAGS="$LDFLAGS $link_static_flag"
-  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:1976: checking whether a statically linked program can dlopen itself" >&5
-if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    lt_cv_dlopen_self_static=cross
-  else
-    cat > conftest.$ac_ext <<EOF
-/*#line 1984 "ltconfig"*/
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LTDL_GLOBAL	RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-#  define LTDL_GLOBAL	DL_GLOBAL
-# else
-#  define LTDL_GLOBAL	0
-# endif
-#endif
-
-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LTDL_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-# else
-#  ifdef DL_LAZY
-#   define LTDL_LAZY_OR_NOW	DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-#   else
-#    ifdef DL_NOW
-#     define LTDL_LAZY_OR_NOW	DL_NOW
-#    else
-#     define LTDL_LAZY_OR_NOW	0
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-void fnord() { int i=42; }
-int main() {
-    void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); return 1; }
-
-EOF
-if { (eval echo $progname:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  lt_cv_dlopen_self_static=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  lt_cv_dlopen_self_static=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-fi
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-# Copy echo and quote the copy, instead of the original, because it is
-# used later.
-ltecho="$echo"
-if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
-fi
-LTSHELL="$SHELL"
-
-LTCONFIG_VERSION="$VERSION"
-
-# Only quote variables if we're using ltmain.sh.
-case $ltmain in
-*.sh)
-  # Now quote all the things that may contain metacharacters.
-  for var in ltecho old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \
-    old_MAGIC_CMD old_LD old_LDFLAGS old_LIBS \
-    old_LN_S old_NM old_RANLIB old_STRIP \
-    old_AS old_DLLTOOL old_OBJDUMP \
-    old_OBJEXT old_EXEEXT old_reload_flag \
-    old_deplibs_check_method old_file_magic_cmd \
-    AR AR_FLAGS CC LTCC LD LN_S NM LTSHELL LTCONFIG_VERSION \
-    reload_flag reload_cmds wl \
-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-    library_names_spec soname_spec \
-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-    predep_objects postdep_objects predeps postdeps compiler_lib_search_path \
-    old_striplib striplib file_magic_cmd export_symbols_cmds \
-    deplibs_check_method allow_undefined_flag no_undefined_flag \
-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    compiler_c_o need_locks exclude_expsyms include_expsyms; do
-
-    case $var in
-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ### testsuite: skip nested quoting test
-      ;;
-    *)
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ### testsuite: skip nested quoting test
-      ;;
-    esac
-  done
-
-  case $ltecho in
-  *'\$0 --fallback-echo"')
-    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-  if test -z "$tagname"; then
-    trap "$rm \"$ofile\"; exit 1" 1 2 15
-    echo "creating $ofile"
-    $rm "$ofile"
-    cat <<EOF > "$ofile"
-#! $SHELL
-
-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-#
-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# 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
-EOF
-  else
-    echo "appending configuration tag \"$tagname\" to $ofile"
-    echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
-  fi
-  cfgfile="$ofile"
-  ;;
-
-*)
-  # Double-quote the variables that need it (for aesthetics).
-  for var in old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \
-    old_MAGIC_CMD old_LD old_LDFLAGS old_LIBS \
-    old_LN_S old_NM old_RANLIB old_STRIP \
-    old_AS old_DLLTOOL old_OBJDUMP \
-    old_OBJEXT old_EXEEXT old_reload_flag \
-    old_deplibs_check_method old_file_magic_cmd; do
-    eval "$var=\\\"\$var\\\""
-  done
-
-  # Just create a config file.
-  cfgfile="$ofile.cfg"
-  if test -z "$tagname"; then
-    trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-    echo "creating $cfgfile"
-    $rm "$cfgfile"
-    cat <<EOF > "$cfgfile"
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-
-### BEGIN LIBTOOL CONFIG
-EOF
-  else
-    echo "appending to $cfgfile"
-    echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
-  fi
-  ;;
-esac
-
-cat <<EOF >> "$cfgfile"
-# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# AR=$old_AR AR_FLAGS=$old_AR_FLAGS LTCC=$old_LTCC CC=$old_CC \\
-# CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
-# MAGIC_CMD=$old_MAGIC_CMD LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
-# LN_S=$old_LN_S NM=$old_NM RANLIB=$old_RANLIB STRIP=$old_STRIP \\
-# AS=$old_AS DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP \\
-# objext=$old_OBJEXT exeext=$old_EXEEXT reload_flag=$old_reload_flag \\
-# deplibs_check_method=$old_deplibs_check_method \\
-# file_magic_cmd=$old_file_magic_cmd \\
-#   $0$ltconfig_args
-#
-# Compiler and other test output produced by $progname, useful for
-# debugging $progname, is in ./config.log if it exists.
-
-# The version of $progname that generated this script.
-LTCONFIG_VERSION=$LTCONFIG_VERSION
-
-# Shell to use when invoking shell scripts.
-SHELL=$LTSHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$need_lc
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$ltecho
-
-# The archiver.
-AR=$AR
-AR_FLAGS=$AR_FLAGS
-
-# A C compiler.
-LTCC=$LTCC
-
-# A language-specific compiler.
-CC=$CC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$with_gcc
-
-# The linker used to build libraries.
-LD=$LD
-
-# Whether we need hard or soft links.
-LN_S=$LN_S
-
-# A BSD-compatible nm program.
-NM=$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=$reload_flag
-reload_cmds=$reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$wl
-
-# Object file suffix (normally "o").
-objext="$objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$pic_flag
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$compiler_c_o
-
-# Must we lock files when doing compilation ?
-need_locks=$need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_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=$link_static_flag
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$RANLIB
-old_archive_cmds=$old_archive_cmds
-old_postinstall_cmds=$old_postinstall_cmds
-old_postuninstall_cmds=$old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$archive_cmds
-archive_expsym_cmds=$archive_expsym_cmds
-postinstall_cmds=$postinstall_cmds
-postuninstall_cmds=$postuninstall_cmds
-
-# Commands to strip libraries.
-old_striplib=$old_striplib
-striplib=$striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$global_symbol_to_cdecl
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# 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=$hardcode_libdir_flag_spec
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME.so 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
-
-# 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=$sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$include_expsyms
-
-EOF
-
-if test -z "$tagname"; then
-  echo '### END LIBTOOL CONFIG' >> "$ofile"
-else
-  echo "### END LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
-fi
-
-case $ltmain in
-*.sh)
-  echo >> "$ofile"
-  if test -z "$tagname"; then
-    case $host_os in
-    aix3*)
-      cat <<\EOF >> "$ofile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-      ;;
-    esac
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      cat <<'EOF' >> "$ofile"
-      # This is a source program that is used to create dlls on Windows
-      # Don't remove nor modify the starting and closing comments
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-      # This is a source program that is used to create import libraries
-      # on Windows for dlls which lack them. Don't remove nor modify the
-      # starting and closing comments
-# /* impgen.c starts here */
-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-#
-#  This file is part of GNU libtool.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#  */
-#
-#  #include <stdio.h>		/* for printf() */
-#  #include <unistd.h>		/* for open(), lseek(), read() */
-#  #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-#  #include <string.h>		/* for strdup() */
-#
-#  /* O_BINARY isn't required (or even defined sometimes) under Unix */
-#  #ifndef O_BINARY
-#  #define O_BINARY 0
-#  #endif
-#
-#  static unsigned int
-#  pe_get16 (fd, offset)
-#       int fd;
-#       int offset;
-#  {
-#    unsigned char b[2];
-#    lseek (fd, offset, SEEK_SET);
-#    read (fd, b, 2);
-#    return b[0] + (b[1]<<8);
-#  }
-#
-#  static unsigned int
-#  pe_get32 (fd, offset)
-#      int fd;
-#      int offset;
-#  {
-#    unsigned char b[4];
-#    lseek (fd, offset, SEEK_SET);
-#    read (fd, b, 4);
-#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-#  }
-#
-#  static unsigned int
-#  pe_as32 (ptr)
-#       void *ptr;
-#  {
-#    unsigned char *b = ptr;
-#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-#  }
-#
-#  int
-#  main (argc, argv)
-#      int argc;
-#      char *argv[];
-#  {
-#      int dll;
-#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-#      unsigned long export_rva, export_size, nsections, secptr, expptr;
-#      unsigned long name_rvas, nexp;
-#      unsigned char *expdata, *erva;
-#      char *filename, *dll_name;
-#
-#      filename = argv[1];
-#
-#      dll = open(filename, O_RDONLY|O_BINARY);
-#      if (dll < 1)
-#  	return 1;
-#
-#      dll_name = filename;
-#
-#      for (i=0; filename[i]; i++)
-#  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-#  	    dll_name = filename + i +1;
-#
-#      pe_header_offset = pe_get32 (dll, 0x3c);
-#      opthdr_ofs = pe_header_offset + 4 + 20;
-#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
-#
-#      if (num_entries < 1) /* no exports */
-#  	return 1;
-#
-#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
-#      export_size = pe_get32 (dll, opthdr_ofs + 100);
-#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-#      secptr = (pe_header_offset + 4 + 20 +
-#  	      pe_get16 (dll, pe_header_offset + 4 + 16));
-#
-#      expptr = 0;
-#      for (i = 0; i < nsections; i++)
-#      {
-#  	char sname[8];
-#  	unsigned long secptr1 = secptr + 40 * i;
-#  	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-#  	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-#  	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-#  	lseek(dll, secptr1, SEEK_SET);
-#  	read(dll, sname, 8);
-#  	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-#  	{
-#  	    expptr = fptr + (export_rva - vaddr);
-#  	    if (export_rva + export_size > vaddr + vsize)
-#  		export_size = vsize - (export_rva - vaddr);
-#  	    break;
-#  	}
-#      }
-#
-#      expdata = (unsigned char*)malloc(export_size);
-#      lseek (dll, expptr, SEEK_SET);
-#      read (dll, expdata, export_size);
-#      erva = expdata - export_rva;
-#
-#      nexp = pe_as32 (expdata+24);
-#      name_rvas = pe_as32 (expdata+32);
-#
-#      printf ("EXPORTS\n");
-#      for (i = 0; i<nexp; i++)
-#      {
-#  	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-#  	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-#      }
-#
-#      return 0;
-#  }
-# /* impgen.c ends here */
-
-EOF
-    ;;
-  esac
-
-
-    # Append the ltmain.sh script.
-    sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
-    # We use sed instead of cat because bash on DJGPP gets confused if
-    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-    # text mode, it properly converts lines to CR/LF.  This bash problem
-    # is reportedly fixed, but why not run on old versions too?
-
-    chmod +x "$ofile"
-  fi
-  ;;
-
-*)
-  # Compile the libtool program.
-  echo "FIXME: would compile $ltmain"
-  ;;
-esac
-
-# Update the list of available tags.
-if test -n "$tagname"; then
-
-  # 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'`
-
-  # Append the new tag name to the list of available tags.
-  available_tags="$available_tags $tagname"
-
-  # Now substitute the updated of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' ${ofile} > ${ofile}.new"; then
-    mv ${ofile}.new ${ofile}
-    chmod +x "$ofile"
-  else
-    rm -f ${ofile}.new
-    echo "$progname: unable to update list of available tagged configurations."
-    exit 1
-  fi
-fi
-
-# Don't cache tagged configuration!
-test -n "$cache_file" && test -z "$tagname" || exit 0
-
-# AC_CACHE_SAVE
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-exit 0
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/admin/ltmain.sh b/admin/ltmain.sh
index 1f5c51a..b36e997 100644
--- a/admin/ltmain.sh
+++ b/admin/ltmain.sh
@@ -1,7 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
+# NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -49,14 +49,14 @@ EOF
 fi
 
 # The name of this program.
-progname=`$echo "$0" | sed 's%^.*/%%'`
+progname=`$echo "$0" | ${SED} 's%^.*/%%'`
 modename="$progname"
 
 # Constants.
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.4a
-TIMESTAMP=" (1.641.2.206mm 2001/04/03 21:47:47)"
+VERSION=1.5a
+TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
 
 default_mode=
 help="Try \`$progname --help' for more information."
@@ -67,10 +67,19 @@ 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//'
+Xsed="${SED}"' -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-SP2NL='tr \040 \012'
-NL2SP='tr \015\012 \040\040'
+# test EBCDIC or ASCII
+case `echo A|tr A '\301'` in
+ A) # EBCDIC based system
+  SP2NL="tr '\100' '\n'"
+  NL2SP="tr '\r\n' '\100\100'"
+  ;;
+ *) # Assume ASCII based system
+  SP2NL="tr '\040' '\012'"
+  NL2SP="tr '\015\012' '\040\040'"
+  ;;
+esac
 
 # NLS nuisances.
 # Only set LANG and LC_ALL to C if already set.
@@ -84,15 +93,12 @@ if test "${LANG+set}" = set; then
   save_LANG="$LANG"; LANG=C; export LANG
 fi
 
-if test "$LTCONFIG_VERSION" != "$VERSION"; then
-  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-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
+  $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
 
@@ -108,8 +114,51 @@ 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
+while test "$#" -gt 0
 do
   arg="$1"
   shift
@@ -131,18 +180,26 @@ do
       # Check whether tagname contains only valid characters
       case $tagname in
       *[!-_A-Za-z0-9,/]*)
-	echo "$progname: invalid tag name: $tagname" 1>&2
+	$echo "$progname: invalid tag name: $tagname" 1>&2
 	exit 1
-        ;;
+	;;
       esac
 
-      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
+      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"
@@ -161,21 +218,25 @@ do
     ;;
 
   --version)
-    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    $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 -n -e '/^### BEGIN LIBTOOL CONFIG/,/^### END LIBTOOL CONFIG/p' < "$0"
+    ${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"
+      ${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"
+    $echo "$progname: enabling shell trace mode"
     set -x
     ;;
 
@@ -184,16 +245,16 @@ do
     ;;
 
   --features)
-    echo "host: $host"
+    $echo "host: $host"
     if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
+      $echo "enable shared libraries"
     else
-      echo "disable shared libraries"
+      $echo "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
+      $echo "enable static libraries"
     else
-      echo "disable static libraries"
+      $echo "disable static libraries"
     fi
     exit 0
     ;;
@@ -203,6 +264,8 @@ do
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
+  --preserve-dup-deps) duplicate_deps="yes" ;;
+
   --quiet | --silent)
     show=:
     ;;
@@ -238,12 +301,19 @@ if test -n "$prevopt"; then
   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 | *++ | gcc* | *-gcc*)
+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
       mode=link
       for arg
       do
@@ -298,158 +368,127 @@ if test -z "$show_help"; then
     modename="$modename: compile"
     # Get the compilation command and the source file.
     base_compile=
-    prev=
-    lastarg=
-    srcfile="$nonopt"
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
     suppress_output=
+    arg_mode=normal
+    libobj=
 
-    user_target=no
     for arg
     do
-      case $prev in
-      "") ;;
-      xcompiler)
-	# Aesthetically quote the previous argument.
-	prev=
-	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-
-	case $arg in
-	# Double-quote args containing other shell metacharacters.
-	# Many Bourne shells cannot handle close brackets correctly
-	# in scan sets, so we specify it separately.
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+      case "$arg_mode" in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
 
-	# Add the previous argument to base_compile.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
+      target )
+	libobj="$arg"
+	arg_mode=normal
 	continue
 	;;
-      esac
 
-      # Accept any command-line options.
-      case $arg in
-      -o)
-	if test "$user_target" != "no"; then
-	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	  exit 1
-	fi
-	user_target=next
-	;;
+      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
-	;;
+	-static)
+	  build_old_libs=yes
+	  continue
+	  ;;
 
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
+	-prefer-pic)
+	  pic_mode=yes
+	  continue
+	  ;;
 
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
+	-prefer-non-pic)
+	  pic_mode=no
+	  continue
+	  ;;
 
-      -Xcompiler)
-	prev=xcompiler
-	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=
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
-	for arg in $args; do
-	  IFS="$save_ifs"
+	-Wc,*)
+	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
 
-	  # Double-quote args containing other shell metacharacters.
-	  # Many Bourne shells cannot handle close brackets correctly
-	  # in scan sets, so we specify it separately.
-	  case $arg in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    arg="\"$arg\""
-	    ;;
-	  esac
-	  lastarg="$lastarg $arg"
-	done
-	IFS="$save_ifs"
-	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+	    # Double-quote args containing other shell metacharacters.
+	    # Many Bourne shells cannot handle close brackets correctly
+	    # in scan sets, so we specify it separately.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    lastarg="$lastarg $arg"
+	  done
+	  IFS="$save_ifs"
+	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
 
-	# Add the arguments to base_compile.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
+	  # Add the arguments to base_compile.
 	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
+	  continue
+	  ;;
 
-      case $user_target in
-      next)
-	# The next one is the -o target name
-	user_target=yes
-	continue
-	;;
-      yes)
-	# We got the output file
-	user_target=set
-	libobj="$arg"
-	continue
+	* )
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
 	;;
-      esac
-
-      # Accept the current argument as the source file.
-      lastarg="$srcfile"
-      srcfile="$arg"
+      esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-
-      # Backslashify any backslashes, double quotes, and dollar signs.
-      # These are the only characters that are still specially
-      # interpreted inside of double-quoted scrings.
       lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
 
+      case $lastarg in
       # Double-quote args containing other shell metacharacters.
       # Many Bourne shells cannot handle close brackets correctly
       # in scan sets, so we specify it separately.
-      case $lastarg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	lastarg="\"$lastarg\""
 	;;
       esac
 
-      # Add the previous argument to base_compile.
-      if test -z "$base_compile"; then
-	base_compile="$lastarg"
-      else
-	base_compile="$base_compile $lastarg"
-      fi
-    done
+      base_compile="$base_compile $lastarg"
+    done # for arg
 
-    case $user_target in
-    set)
-      ;;
-    no)
-      # Get the name of the library object.
-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+    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='[cCFSfmso]'
+    xform='[cCFSifmso]'
     case $libobj in
     *.ada) xform=ada ;;
     *.adb) xform=adb ;;
@@ -457,6 +496,7 @@ if test -z "$show_help"; then
     *.asm) xform=asm ;;
     *.c++) xform=c++ ;;
     *.cc) xform=cc ;;
+    *.ii) xform=ii ;;
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
@@ -481,40 +521,37 @@ if test -z "$show_help"; then
     # command doesn't match the default compiler.
     if test -n "$available_tags" && test -z "$tagname"; then
       case $base_compile in
-      "$CC "*) ;;
       # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
+      # 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
+	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 "*)
-              # 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
-              ;;
-	    "`$echo $CC` "*)
+	    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
+	  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
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
 	;;
       esac
     fi
@@ -550,7 +587,7 @@ if test -z "$show_help"; then
       pic_mode=default
       ;;
     esac
-    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
       # non-PIC code in shared libraries is not supported
       pic_mode=default
     fi
@@ -577,7 +614,7 @@ if test -z "$show_help"; then
       done
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
-	echo "\
+	$echo "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
@@ -591,7 +628,7 @@ compiler."
 	$run $rm $removelist
 	exit 1
       fi
-      echo $srcfile > "$lockfile"
+      $echo $srcfile > "$lockfile"
     fi
 
     if test -n "$fix_srcfile_path"; then
@@ -624,18 +661,18 @@ EOF
 	command="$base_compile $srcfile"
       fi
 
-      if test ! -d ${xdir}$objdir; then
+      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
+	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
 	  exit $status
-        fi
-      fi 
+	fi
+      fi
 
       if test -z "$output_obj"; then
-        # Place PIC objects in $objdir
-        command="$command -o $lobj"
+	# Place PIC objects in $objdir
+	command="$command -o $lobj"
       fi
 
       $run $rm "$lobj" "$output_obj"
@@ -648,8 +685,8 @@ EOF
       fi
 
       if test "$need_locks" = warn &&
-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-	echo "\
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -668,7 +705,7 @@ compiler."
       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
+      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
@@ -718,8 +755,8 @@ EOF
       fi
 
       if test "$need_locks" = warn &&
-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-	echo "\
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -738,7 +775,7 @@ compiler."
       fi
 
       # Just move the object if needed
-      if test -n "$output_obj" && test "x$output_obj" != "x$obj"; then
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
 	$show "$mv $output_obj $obj"
 	if $run $mv $output_obj $obj; then :
 	else
@@ -783,7 +820,7 @@ EOF
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
       # which system we are compiling for in order to pass an extra
-      # flag for every libtool invokation.
+      # flag for every libtool invocation.
       # allow_undefined=no
 
       # FIXME: Unfortunately, there are problems with the above when trying
@@ -810,10 +847,12 @@ EOF
     old_convenience=
     deplibs=
     old_deplibs=
+    add_flags=
     compiler_flags=
     linker_flags=
     dllsearchpath=
     lib_search_path=`pwd`
+    inst_prefix_dir=
 
     avoid_version=no
     dlfiles=
@@ -840,6 +879,7 @@ EOF
     temp_rpath=
     thread_safe=no
     vinfo=
+    vinfo_number=no
 
     # We need to know -static, to get the right output filenames.
     for arg
@@ -870,7 +910,7 @@ EOF
     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 
     # Go through the arguments, transforming them on the way.
-    while test $# -gt 0; do
+    while test "$#" -gt 0; do
       arg="$1"
       base_compile="$base_compile $arg"
       shift
@@ -946,6 +986,11 @@ EOF
 	  prev=
 	  continue
 	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
 	release)
 	  release="-$arg"
 	  prev=
@@ -953,108 +998,108 @@ EOF
 	  ;;
 	objectlist)
 	  if test -f "$arg"; then
-            save_arg=$arg
+	    save_arg=$arg
 	    moreargs=
 	    for fil in `cat $save_arg`
 	    do
 #	      moreargs="$moreargs $fil"
-              arg=$fil
-              # A libtool-controlled object.
+	      arg=$fil
+	      # A libtool-controlled object.
 
 	      # Check to see that this really is a libtool object.
-	      if (sed -e '2q' $arg | egrep "^# 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 (${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"
 
-                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
+		  # 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
+	  arg=$save_arg
 	  prev=
 	  continue
 	  ;;
@@ -1096,13 +1141,21 @@ EOF
 	  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
+      fi # test -n "$prev"
 
       prevarg="$arg"
 
@@ -1143,7 +1196,7 @@ EOF
 
       -export-symbols | -export-symbols-regex)
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: not more than one -exported-symbols argument allowed"
+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
 	  exit 1
 	fi
 	if test "X$arg" = "X-export-symbols"; then
@@ -1154,18 +1207,23 @@ EOF
 	continue
 	;;
 
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
       # so, if we see these flags be careful not to treat them like -L
       -L[A-Z][A-Z]*:*)
 	case $with_gcc/$host in
-	no/*-*-irix*)
+	no/*-*-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.
@@ -1199,30 +1257,38 @@ EOF
 	;;
 
       -l*)
-	if test "$arg" = "-lc"; then
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # These systems don't actually have c library (as such)
+	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
+	  *-*-freebsd*-gnu*)
+	    # prevent being parsed by the freebsd regexp below
 	    ;;
-	  esac
-	elif test "$arg" = "-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have math library (as such)
-	    continue
+	  *-*-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 math library is in the System framework
+	    # 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
@@ -1233,6 +1299,34 @@ EOF
 	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
@@ -1247,9 +1341,7 @@ EOF
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
 	  ;;
-	*)
-	  no_install=yes
-	  ;;
+	*) no_install=yes ;;
 	esac
 	continue
 	;;
@@ -1299,7 +1391,7 @@ EOF
 	;;
 
       -static)
-        # The effects of -static are defined in a previous loop.
+	# 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
@@ -1316,11 +1408,16 @@ EOF
 	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=
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
+	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
 	  case $flag in
@@ -1338,7 +1435,7 @@ EOF
       -Wl,*)
 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
 	arg=
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
+	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
 	  case $flag in
@@ -1364,6 +1461,11 @@ EOF
 	continue
 	;;
 
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
       # Some other compiler flag.
       -* | +*)
 	# Unknown arguments in both finalize_command and compile_command need
@@ -1374,6 +1476,7 @@ EOF
 	  arg="\"$arg\""
 	  ;;
 	esac
+	add_flags="$add_flags $arg"
 	;;
 
       *.$objext)
@@ -1385,78 +1488,78 @@ EOF
 	# A libtool-controlled object.
 
 	# Check to see that this really is a libtool object.
-	if (sed -e '2q' $arg | egrep "^# 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
+	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
+ 	  else
 	    xdir="$xdir/"
 	  fi
 
-          if test "$pic_object" != none; then
-            # Prepend the subdirectory the object is found in.
+	  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
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
 	      else
-	        # If libtool objects are unsupported, then we need to preload.
-	        prev=dlprefiles
+		# 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
+	    if test "$prev" = dlprefiles; then
 	      # Preload the old-style object.
 	      dlprefiles="$dlprefiles $pic_object"
 	      prev=
-            fi
+	    fi
 
-            # A PIC object.
+	    # A PIC object.
 	    libobjs="$libobjs $pic_object"
 	    arg="$pic_object"
-          fi
+	  fi
 
-          # Non-PIC object.
-          if test "$non_pic_object" != none; then
-            # Prepend the subdirectory the object is found in.
+	  # 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.
+	    # 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%/[^/]*$%%'`
@@ -1466,11 +1569,11 @@ EOF
 	      xdir="$xdir/"
 	    fi
 
-            pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-            non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+	    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
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	  fi
 	fi
 	;;
 
@@ -1508,15 +1611,16 @@ EOF
 	  arg="\"$arg\""
 	  ;;
 	esac
+	add_flags="$add_flags $arg"
 	;;
-      esac
+      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
+    done # argument parsing loop
 
     if test -n "$prev"; then
       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
@@ -1530,40 +1634,37 @@ EOF
     # command doesn't match the default compiler.
     if test -n "$available_tags" && test -z "$tagname"; then
       case $base_compile in
-      "$CC "*) ;;
       # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
+      # 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
+	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 "*)
-              # The compiler in $compile_command matches
-              # the one in the tagged configuration.
-              # Assume this is the tagged configuration we want.
-              tagname=$z
-              break
-	      ;;
-	    "`$echo $CC` "*)
+	    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
+	  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
+#         $echo "$modename: using $tagname tagged configuration"
+	fi
 	;;
       esac
     fi
@@ -1595,11 +1696,11 @@ EOF
       output_objdir="$output_objdir/$objdir"
     fi
     # Create the object directory.
-    if test ! -d $output_objdir; then
+    if test ! -d "$output_objdir"; then
       $show "$mkdir $output_objdir"
       $run $mkdir $output_objdir
       status=$?
-      if test $status -ne 0 && test ! -d $output_objdir; then
+      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
 	exit $status
       fi
     fi
@@ -1617,27 +1718,53 @@ EOF
     *) 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
-      case "$libs " in
-      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-      esac
+      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
+    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
-    uninst_deplibs= # uninstalled libtool libraries
-    uninst_path= # paths that contain 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"
@@ -1659,7 +1786,7 @@ EOF
 	newdlprefiles=
 	passes="conv scan dlopen dlpreopen link"
 	;;
-    *)	passes="conv"
+    *)  passes="conv"
 	;;
     esac
     for pass in $passes; do
@@ -1668,14 +1795,14 @@ EOF
 	libs="$deplibs"
 	deplibs=
       fi
-      if test $linkmode = prog; then
+      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
+      if test "$pass" = dlopen; then
 	# Collect dlpreopened libraries
 	save_deplibs="$deplibs"
 	deplibs=
@@ -1685,48 +1812,91 @@ EOF
 	found=no
 	case $deplib in
 	-l*)
-	  if test $linkmode != lib && test $linkmode != prog; then
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
 	    continue
 	  fi
-	  if test $pass = conv; then
+	  if test "$pass" = conv && 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
-	    # Search the libtool library
-	    lib="$searchdir/lib${name}.la"
-	    if test -f "$lib"; then
-	      found=yes
-	      break
-	    fi
+	    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"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
 	    fi
 	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if (${SED} -e '2q' $lib |
+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		  library_names=
+		  old_library=
+		  case $lib in
+		  */* | *\\*) . $lib ;;
+		  *) . ./$lib ;;
+		  esac
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+		    test "X$ladir" = "X$lib" && ladir="."
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+	        ;;
+	      *) ;;
+	      esac
+	    fi
 	  fi
-	  ;;
+	  ;; # -l
 	-L*)
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
-	    test $pass = conv && continue
+	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    ;;
 	  prog)
-	    if test $pass = conv; then
+	    if test "$pass" = conv; then
 	      deplibs="$deplib $deplibs"
 	      continue
 	    fi
-	    if test $pass = scan; then
+	    if test "$pass" = scan; then
 	      deplibs="$deplib $deplibs"
 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    else
@@ -1737,11 +1907,11 @@ EOF
 	  *)
 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
 	    ;;
-	  esac
+	  esac # linkmode
 	  continue
-	  ;;
+	  ;; # -L
 	-R*)
-	  if test $pass = link; then
+	  if test "$pass" = link; then
 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
@@ -1754,28 +1924,30 @@ EOF
 	  ;;
 	*.la) lib="$deplib" ;;
 	*.$libext)
-	  if test $pass = conv; then
+	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
 	    continue
 	  fi
 	  case $linkmode in
 	  lib)
 	    if test "$deplibs_check_method" != pass_all; then
-	      echo
-	      echo "*** Warning: This library needs some functionality provided by $deplib."
-	      echo "*** I have the capability to make that library automatically link in when"
-	      echo "*** you link to this library.  But I can only do this if you have a"
-	      echo "*** shared version of the library, which you do not appear to have."
+	      $echo
+	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+	      $echo "*** I have the capability to make that library automatically link in when"
+	      $echo "*** you link to this library.  But I can only do this if you have a"
+	      $echo "*** shared version of the library, which you do not appear to have"
+	      $echo "*** because the file extensions .$libext of this argument makes me believe"
+	      $echo "*** that it is just a static archive that I should not used here."
 	    else
-	      echo
-	      echo "*** Warning: Linking the shared library $output against the"
-	      echo "*** static library $deplib is not portable!"
+	      $echo
+	      $echo "*** Warning: Linking the shared library $output against the"
+	      $echo "*** static library $deplib is not portable!"
 	      deplibs="$deplib $deplibs"
 	    fi
 	    continue
 	    ;;
 	  prog)
-	    if test $pass != link; then
+	    if test "$pass" != link; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -1783,13 +1955,13 @@ EOF
 	    fi
 	    continue
 	    ;;
-	  esac
-	  ;;
+	  esac # linkmode
+	  ;; # *.$libext
 	*.lo | *.$objext)
-	  if test $pass = conv; then
+	  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
+	  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"
@@ -1805,15 +1977,15 @@ EOF
 	  alldeplibs=yes
 	  continue
 	  ;;
-	esac
-	if test $found = yes || test -f "$lib"; then :
+	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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 	else
 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 	  exit 1
@@ -1829,8 +2001,9 @@ EOF
 	library_names=
 	old_library=
 	# If the library was installed with an old release of libtool,
-	# it will not redefine variable installed.
+	# it will not redefine variables installed, or shouldnotlink
 	installed=yes
+	shouldnotlink=no
 
 	# Read the .la file
 	case $lib in
@@ -1840,14 +2013,25 @@ EOF
 
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test $linkmode != prog && test $linkmode != lib; }; then
+	   { 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
+	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
@@ -1856,21 +2040,14 @@ EOF
 	    # 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"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test $linkmode != prog && test $linkmode != lib; then
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
 	    exit 1
 	  fi
 	  continue
-	fi
+	fi # $pass = conv
 
+    
 	# Get the name of the library we link against.
 	linklib=
 	for l in $old_library $library_names; do
@@ -1882,7 +2059,7 @@ EOF
 	fi
 
 	# This library was specified with -dlopen.
-	if test $pass = dlopen; then
+	if test "$pass" = dlopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
 	    exit 1
@@ -1897,7 +2074,7 @@ EOF
 	    newdlfiles="$newdlfiles $lib"
 	  fi
 	  continue
-	fi
+	fi # $pass = dlopen
 
 	# We need an absolute path.
 	case $ladir in
@@ -1928,12 +2105,12 @@ EOF
 	  dir="$ladir/$objdir"
 	  absdir="$abs_ladir/$objdir"
 	  # Remove this search path later
-	  uninst_path="$uninst_path $abs_ladir"
-	fi
+	  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 "$pass" = dlpreopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
 	    exit 1
@@ -1948,11 +2125,11 @@ EOF
 	  else
 	    newdlprefiles="$newdlprefiles $dir/$linklib"
 	  fi
-	fi
+	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
-	  # link the convenience library
-	  if test $linkmode = lib; 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"
@@ -1963,7 +2140,8 @@ EOF
 	  continue
 	fi
 
-	if test $linkmode = prog && test $pass != link; then
+    
+	if test "$linkmode" = prog && test "$pass" != link; then
 	  newlib_search_path="$newlib_search_path $ladir"
 	  deplibs="$lib $deplibs"
 
@@ -1979,20 +2157,22 @@ EOF
 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
 	    esac
 	    # Need to link against all dependency_libs?
-	    if test $linkalldeplibs = yes; then
+	    if test "$linkalldeplibs" = yes; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      # Need to hardcode shared library paths
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
 	    tmp_libs="$tmp_libs $deplib"
-	  done
+	  done # for deplib
 	  continue
-	fi
+	fi # $linkmode = prog...
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
@@ -2019,7 +2199,6 @@ EOF
 	      esac
 	      ;;
 	    esac
-
 	    case " $sys_lib_dlsearch_path " in
 	    *" $libdir "*) ;;
 	    *)
@@ -2029,7 +2208,7 @@ EOF
 	      esac
 	      ;;
 	    esac
-	  fi
+	  fi # $linkmode,$pass = prog,link...
 
 	  if test "$alldeplibs" = yes &&
 	     { test "$deplibs_check_method" = pass_all ||
@@ -2044,11 +2223,23 @@ EOF
 	if test -n "$library_names" &&
 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	  if test "$installed" = no; then
-	    uninst_deplibs="$uninst_deplibs $lib"
+	    notinst_deplibs="$notinst_deplibs $lib"
 	    need_relink=yes
 	  fi
 	  # This is a shared library
-	  if test $linkmode = lib && test "$hardcode_into_libs" = all; then
+	
+      # 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.
@@ -2084,7 +2275,7 @@ EOF
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin*)
+	      *cygwin* | mingw*)
 		major=`expr $current - $age`
 		versuffix="-$major"
 		;;
@@ -2096,14 +2287,14 @@ EOF
 
 	    # Make a new name for the extract_expsyms_cmds to use
 	    soroot="$soname"
-	    soname=`echo $soroot | sed -e 's/^.*\///'`
-	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
+	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
 	      $show "extracting exported symbol list from \`$soname'"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	      save_ifs="$IFS"; IFS='~'
 	      eval cmds=\"$extract_expsyms_cmds\"
 	      for cmd in $cmds; do
 		IFS="$save_ifs"
@@ -2116,7 +2307,7 @@ EOF
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
 	      $show "generating import library for \`$soname'"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	      save_ifs="$IFS"; IFS='~'
 	      eval cmds=\"$old_archive_from_expsyms_cmds\"
 	      for cmd in $cmds; do
 		IFS="$save_ifs"
@@ -2128,9 +2319,9 @@ EOF
 	    # make sure the library variables are pointing to the new library
 	    dir=$output_objdir
 	    linklib=$newlib
-	  fi
+	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test $linkmode = prog || test "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -2139,6 +2330,22 @@ EOF
 	    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" ;;
@@ -2157,6 +2364,14 @@ EOF
 		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"
@@ -2179,7 +2394,7 @@ EOF
 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
 	      esac
 	    fi
-	    if test $linkmode = prog; then
+	    if test "$linkmode" = prog; then
 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 	    else
@@ -2196,7 +2411,7 @@ EOF
 	    fi
 	  fi
 
-	  if test $linkmode = prog || test "$mode" = relink; then
+	  if test "$linkmode" = prog || test "$mode" = relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -2212,13 +2427,27 @@ EOF
 	      *) 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
+	    if test "$linkmode" = prog; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -2226,7 +2455,7 @@ EOF
 	      test -n "$add" && deplibs="$add $deplibs"
 	    fi
 	  fi
-	elif test $linkmode = prog; then
+	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.
@@ -2243,25 +2472,44 @@ EOF
 	  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 library needs some functionality provided by $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
+	    $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
+	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
+	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
@@ -2275,7 +2523,7 @@ EOF
 	      esac
 	    done
 	    dependency_libs="$temp_deplibs"
-	  fi
+	  #fi
 
 	  newlib_search_path="$newlib_search_path $absdir"
 	  # Link against this library
@@ -2284,13 +2532,15 @@ EOF
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
+	    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
+	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
 	      case $deplib in
@@ -2310,38 +2560,86 @@ EOF
 		  ;;
 		esac
 		if grep "^installed=no" $deplib > /dev/null; then
-		  path="-L$absdir/$objdir"
+		  path="$absdir/$objdir"
 		else
-		  eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -z "$libdir"; then
 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
 		    exit 1
 		  fi
 		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+		    # 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="-L$absdir"
+		  path="$absdir"
 		fi
+		depdepl=
+		case $host in
+		*-*-darwin*)
+		  # we do not want to link against static libs, but need to link against shared
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$path/$depdepl" ; then
+		      depdepl="$path/$depdepl"
+		   fi
+		    # do not add paths which are already there
+		    case " $newlib_search_path " in
+		    *" $path "*) ;;
+		    *) newlib_search_path="$newlib_search_path $path";;
+		    esac
+		    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="$path $deplibs" ;;
+	      *) deplibs="$deplibs $path" ;;
 	      esac
 	    done
-	  fi
-	fi
-      done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
       dependency_libs="$newdependency_libs"
-      if test $pass = dlpreopen; then
+      if test "$pass" = dlpreopen; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
 	  deplibs="$deplib $deplibs"
 	done
       fi
-      if test $pass != dlopen; then
-	if test $pass != conv; then
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
 	  # Make sure lib_search_path contains only unique directories.
 	  lib_search_path=
 	  for dir in $newlib_search_path; do
@@ -2359,14 +2657,34 @@ EOF
 	  vars="compile_deplibs finalize_deplibs"
 	fi
 	for var in $vars dependency_libs; do
-	  # Make sure that $var contains only unique libraries
-	  # and add them in reverse order
+	  # Add libraries to $var in reverse order
 	  eval tmp_libs=\"\$$var\"
 	  new_libs=
 	  for deplib in $tmp_libs; do
-	    case "$deplib" in
+	    # 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" ;;
 	      *)
@@ -2392,10 +2710,23 @@ EOF
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
-	done
+	done # for var
       fi
-    done
-    if test $linkmode = prog; then
+      # 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
@@ -2419,7 +2750,7 @@ EOF
       fi
 
       if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
+	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
       fi
 
       if test -n "$release"; then
@@ -2441,6 +2772,7 @@ EOF
       case $outputname in
       lib*)
 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	eval shared_ext=\"$shrext\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
@@ -2452,6 +2784,7 @@ EOF
 	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$//'`
@@ -2464,9 +2797,9 @@ EOF
 	  $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!"
+	  $echo
+	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+	  $echo "*** objects $objs is not portable!"
 	  libobjs="$libobjs $objs"
 	fi
       fi
@@ -2476,7 +2809,7 @@ EOF
       fi
 
       set dummy $rpath
-      if test $# -gt 2; then
+      if test "$#" -gt 2; then
 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
       fi
       install_libdir="$2"
@@ -2486,15 +2819,15 @@ EOF
 	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.
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
 	  build_libtool_libs=convenience
 	  build_old_libs=yes
 	fi
 
 	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
+	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
 	fi
 
 	if test -n "$release"; then
@@ -2503,7 +2836,7 @@ EOF
       else
 
 	# Parse the version information argument.
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
+	save_ifs="$IFS"; IFS=':'
 	set dummy $vinfo 0 0 0
 	IFS="$save_ifs"
 
@@ -2513,13 +2846,50 @@ EOF
 	  exit 1
 	fi
 
-	current="$2"
-	revision="$3"
-	age="$4"
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+	
+	case $vinfo_number in
+	yes)
+	  number_major="$2"
+	  number_minor="$3"
+	  number_revision="$4"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows)
+	    current=`expr $number_major + $number_minor`
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    current=`expr $number_major + $number_minor - 1`
+	    age="$number_minor"
+	    revision="$number_minor"
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$2"
+	  revision="$3"
+	  age="$4"
+	  ;;
+	esac
 
 	# Check that each of the things are valid numbers.
 	case $current in
-	0 | [1-9] | [1-9][0-9]*) ;;
+	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
@@ -2528,7 +2898,7 @@ EOF
 	esac
 
 	case $revision in
-	0 | [1-9] | [1-9][0-9]*) ;;
+	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
@@ -2537,7 +2907,7 @@ EOF
 	esac
 
 	case $age in
-	0 | [1-9] | [1-9][0-9]*) ;;
+	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
@@ -2545,7 +2915,7 @@ EOF
 	  ;;
 	esac
 
-	if test $age -gt $current; then
+	if test "$age" -gt "$current"; then
 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 	  exit 1
@@ -2578,16 +2948,21 @@ EOF
 	  versuffix=".$current";
 	  ;;
 
-	irix)
+	irix | nonstopux)
 	  major=`expr $current - $age + 1`
-	  verstring="sgi$major.$revision"
+
+	  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 != 0; do
+	  while test "$loop" -ne 0; do
 	    iface=`expr $revision - $loop`
 	    loop=`expr $loop - 1`
-	    verstring="sgi$major.$iface:$verstring"
+	    verstring="$verstring_prefix$major.$iface:$verstring"
 	  done
 
 	  # Before this point, $major must not contain `.'.
@@ -2601,13 +2976,13 @@ EOF
 	  ;;
 
 	osf)
-	  major=`expr $current - $age`
+	  major=.`expr $current - $age`
 	  versuffix=".$current.$age.$revision"
 	  verstring="$current.$age.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
-	  while test $loop != 0; do
+	  while test "$loop" -ne 0; do
 	    iface=`expr $current - $loop`
 	    loop=`expr $loop - 1`
 	    verstring="$verstring:${iface}.0"
@@ -2631,7 +3006,7 @@ EOF
 
 	*)
 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
 	  exit 1
 	  ;;
 	esac
@@ -2639,7 +3014,16 @@ EOF
 	# Clear the version info if we defaulted, and they specified a release.
 	if test -z "$vinfo" && test -n "$release"; then
 	  major=
-	  verstring="0.0"
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
 	  if test "$need_version" = no; then
 	    versuffix=
 	  else
@@ -2669,23 +3053,23 @@ EOF
 
       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/*"`
+	# 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
+	  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
       fi
 
       # Now set the variables for building old libraries.
@@ -2697,10 +3081,10 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-      for path in $uninst_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'`
+      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
@@ -2713,7 +3097,7 @@ EOF
 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
 	  esac
 	done
-	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
+	if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
 	  dependency_libs="$temp_xrpath $dependency_libs"
 	fi
       fi
@@ -2748,11 +3132,24 @@ EOF
 	    # Rhapsody C library is in the System framework
 	    deplibs="$deplibs -framework System"
 	    ;;
-	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
- 	      deplibs="$deplibs -lc"
- 	    fi
+	  *-*-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
@@ -2777,7 +3174,7 @@ EOF
 	  # This might be a little naive.  We might want to check
 	  # whether the library exists or not.  But this is on
 	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behaviour.
+	  # implementing what was already the behavior.
 	  newdeplibs=$deplibs
 	  ;;
 	test_compile)
@@ -2791,63 +3188,87 @@ EOF
 EOF
 	  $rm conftest
 	  $LTCC -o conftest conftest.c $deplibs
-	  if test $? -eq 0 ; then
+	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name="`expr $i : '-l\(.*\)'`"
 	      # If $name is empty we are operating on a -L argument.
-	      if test "$name" != "" -a "$name" != "0"; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		set dummy $deplib_matches
-		deplib_match=$2
-		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		  newdeplibs="$newdeplibs $i"
-		else
-		  droppeddeps=yes
-		  echo
-		  echo "*** Warning: This library needs some functionality provided by $i."
-		  echo "*** I have the capability to make that library automatically link in when"
-		  echo "*** you link to this library.  But I can only do this if you have a"
-		  echo "*** shared version of the library, which you do not appear to have."
+              if test "$name" != "" && test "$name" -ne "0"; then
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+	        fi
+		if test -n "$i" ; then
+		  libname=`eval \\$echo \"$libname_spec\"`
+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		  set dummy $deplib_matches
+		  deplib_match=$2
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    $echo
+		    $echo "*** Warning: dynamic linker does not accept needed library $i."
+		    $echo "*** I have the capability to make that library automatically link in when"
+		    $echo "*** you link to this library.  But I can only do this if you have a"
+		    $echo "*** shared version of the library, which I believe you do not have"
+		    $echo "*** because a test_compile did reveal that the linker did not use it for"
+		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
 		fi
 	      else
 		newdeplibs="$newdeplibs $i"
 	      fi
 	    done
 	  else
-	    # Error occured in the first compile.  Let's try to salvage the situation:
-	    # Compile a seperate program for each library.
+	    # 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" != "" -a "$name" != "0"; then
+	      # 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
+		if test "$?" -eq 0 ; then
 		  ldd_output=`ldd conftest`
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    echo "*** Warning: This library needs some functionality provided by $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which you do not appear to have."
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval \\$echo \"$libname_spec\"`
+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		    set dummy $deplib_matches
+		    deplib_match=$2
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      $echo
+		      $echo "*** Warning: dynamic linker does not accept needed library $i."
+		      $echo "*** I have the capability to make that library automatically link in when"
+		      $echo "*** you link to this library.  But I can only do this if you have a"
+		      $echo "*** shared version of the library, which you do not appear to have"
+		      $echo "*** because a test_compile did reveal that the linker did not use this one"
+		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  echo
-		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "***  make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
+		  $echo
+		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** library that it depends on before this library will be fully"
+		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
 	      else
 		newdeplibs="$newdeplibs $i"
@@ -2861,11 +3282,20 @@ EOF
 	  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" != "" -a "$name" != "0"; then
-	      libname=`eval \\$echo \"$libname_spec\"`
-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		    for potent_lib in $potential_libs; do
+            if test "$name" != "" && test  "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null \
 			 | grep " -> " >/dev/null; then
@@ -2878,28 +3308,88 @@ EOF
 		      # but so what?
 		      potlib="$potent_lib"
 		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | sed 10q \
-			 | egrep "$file_magic_regex" > /dev/null; then
+			 | ${SED} 10q \
+			 | $EGREP "$file_magic_regex" > /dev/null; then
 			newdeplibs="$newdeplibs $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
-		    done
-	      done
+		  done
+		done
+	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		echo
-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have."
+		$echo
+		$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.
@@ -2909,16 +3399,23 @@ EOF
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
-	     grep . >/dev/null; then
-	    echo
+	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+	    -e 's/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	    done
+	  fi
+	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+	    | grep . >/dev/null; then
+	    $echo
 	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	      $echo "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
+	    $echo "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
 	  fi
 	  ;;
@@ -2929,19 +3426,26 @@ EOF
 	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."
+	    $echo
+	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $echo "*** a static module, that should work as long as the dlopening"
+	    $echo "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      $echo
+	      $echo "*** However, this would only work if libtool was able to extract symbol"
+	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $echo "*** not find such a program.  So, this module is probably useless."
+	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
 	    fi
 	    if test "$build_old_libs" = no; then
 	      oldlibs="$output_objdir/$libname.$libext"
@@ -2951,16 +3455,16 @@ EOF
 	      build_libtool_libs=no
 	    fi
 	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test $allow_undefined = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
+	    $echo "*** The inter-library dependencies that have been dropped here will be"
+	    $echo "*** automatically added whenever a program is linked with this library"
+	    $echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      $echo
+	      $echo "*** Since this library must not contain undefined symbols,"
+	      $echo "*** because either the platform does not support them or"
+	      $echo "*** it was explicitly requested with -no-undefined,"
+	      $echo "*** libtool will only create a static version of it."
 	      if test "$build_old_libs" = no; then
 		oldlibs="$output_objdir/$libname.$libext"
 		build_libtool_libs=module
@@ -2982,12 +3486,12 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
-	if test $hardcode_into_libs = yes; then
+	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$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
@@ -3018,7 +3522,11 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -3038,6 +3546,7 @@ EOF
 	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"
@@ -3048,7 +3557,7 @@ EOF
 	else
 	  soname="$realname"
 	fi
-	if test x$dlname = x; then
+	if test -z "$dlname"; then
 	  dlname=$soname
 	fi
 
@@ -3058,23 +3567,6 @@ EOF
 	  linknames="$linknames $link"
 	done
 
-#	# Ensure that we have .o objects for linkers which dislike .lo
-#	# (e.g. aix) in case we are running --disable-static
-#	for obj in $libobjs; do
-#	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-#	  if test "X$xdir" = "X$obj"; then
-#	    xdir="."
-#	  else
-#	    xdir="$xdir"
-#	  fi
-#	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-#	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-#	  if test ! -f $xdir/$oldobj && test "$baseobj" != "$oldobj"; then
-#	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-#	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-#	  fi
-#	done
-
 	# Use standard objects if they are pic
 	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 
@@ -3085,16 +3577,24 @@ EOF
 	    export_symbols="$output_objdir/$libname.exp"
 	    $run $rm $export_symbols
 	    eval cmds=\"$export_symbols_cmds\"
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	    save_ifs="$IFS"; IFS='~'
 	    for cmd in $cmds; do
 	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd" || exit $?
+	      if len=`expr "X$cmd" : ".*"` &&
+	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	        $show "$cmd"
+	        $run eval "$cmd" || exit $?
+	        skipped_export=false
+	      else
+	        # The command line is too long to execute in one step.
+	        $show "using reloadable object file for export list..."
+	        skipped_export=:
+	      fi
 	    done
 	    IFS="$save_ifs"
 	    if test -n "$export_symbols_regex"; then
-	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
 	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
 	    fi
@@ -3105,6 +3605,17 @@ EOF
 	  $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
@@ -3116,7 +3627,7 @@ EOF
 	    $show "$mkdir $gentop"
 	    $run $mkdir "$gentop"
 	    status=$?
-	    if test $status -ne 0 && test ! -d "$gentop"; then
+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
 	      exit $status
 	    fi
 	    generated="$generated $gentop"
@@ -3135,11 +3646,37 @@ EOF
 	      $show "$mkdir $xdir"
 	      $run $mkdir "$xdir"
 	      status=$?
-	      if test $status -ne 0 && test ! -d "$xdir"; then
+	      if test "$status" -ne 0 && test ! -d "$xdir"; then
 		exit $status
 	      fi
+	      # 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
@@ -3152,22 +3689,40 @@ EOF
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink && test "$hardcode_into_libs" = all; then
+	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 len=`expr "X$cmds" : ".*"` &&
-           test $len -le $max_cmd_len; then
-          :
-        else
+
+	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..."
+	  $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
@@ -3180,72 +3735,81 @@ EOF
 	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
 	    save_libobjs=$libobjs
 	  fi
-          save_output=$output
+	  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
+	  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 ||
+	  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
+		 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
+	      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\"
+	  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
+	  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"
+	  $echo "creating a temporary reloadable object file: $output"
 
 	  # Loop through the commands generated above and execute them.
-          IFS="${IFS= 	}"; 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
+	  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
+	  output=$save_output
 
 	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
@@ -3254,26 +3818,26 @@ EOF
 	  # 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
+	  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
-        IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-        for cmd in $cmds; do
-          IFS="$save_ifs"
-          $show "$cmd"
-          $run eval "$cmd" || exit $?
-        done
-        IFS="$save_ifs"
+	  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 && test "$hardcode_into_libs" = all; then
+	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
@@ -3357,7 +3921,7 @@ EOF
 	  $show "$mkdir $gentop"
 	  $run $mkdir "$gentop"
 	  status=$?
-	  if test $status -ne 0 && test ! -d "$gentop"; then
+	  if test "$status" -ne 0 && test ! -d "$gentop"; then
 	    exit $status
 	  fi
 	  generated="$generated $gentop"
@@ -3376,11 +3940,37 @@ EOF
 	    $show "$mkdir $xdir"
 	    $run $mkdir "$xdir"
 	    status=$?
-	    if test $status -ne 0 && test ! -d "$xdir"; then
+	    if test "$status" -ne 0 && test ! -d "$xdir"; then
 	      exit $status
 	    fi
+	    # 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
@@ -3392,7 +3982,7 @@ EOF
 
       output="$obj"
       eval cmds=\"$reload_cmds\"
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
 	IFS="$save_ifs"
 	$show "$cmd"
@@ -3428,27 +4018,13 @@ EOF
 	reload_objs="$libobjs $reload_conv_objs"
 	output="$libobj"
 	eval cmds=\"$reload_cmds\"
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do
 	  IFS="$save_ifs"
 	  $show "$cmd"
 	  $run eval "$cmd" || exit $?
 	done
 	IFS="$save_ifs"
-#     else
-#	# Just create a symlink.
-#	$show $rm $libobj
-#	$run $rm $libobj
-#	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-#	if test "X$xdir" = "X$libobj"; then
-#	  xdir="."
-#	else
-#	  xdir="$xdir"
-#	fi
-#	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-#	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-#	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
-#	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
       fi
 
       if test -n "$gentop"; then
@@ -3461,7 +4037,7 @@ EOF
 
     prog)
       case $host in
-        *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
       esac
       if test -n "$vinfo"; then
 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
@@ -3478,6 +4054,24 @@ EOF
 	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"
 
@@ -3573,6 +4167,12 @@ EOF
       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
@@ -3615,19 +4215,19 @@ extern \"C\" {
 	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
 
 	    # Add our own program objects to the symbol list.
-	    progfiles="$objs$old_deplibs"
+	    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 '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
 	      $run eval '$mv "$nlist"T "$nlist"'
 	    fi
 
 	    if test -n "$export_symbols_regex"; then
-	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
 	      $run eval '$mv "$nlist"T "$nlist"'
 	    fi
 
@@ -3635,9 +4235,9 @@ extern \"C\" {
 	    if test -z "$export_symbols"; then
 	      export_symbols="$output_objdir/$output.exp"
 	      $run $rm $export_symbols
-	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	    else
-	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
 	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
 	      $run eval 'mv "$nlist"T "$nlist"'
 	    fi
@@ -3645,8 +4245,8 @@ extern \"C\" {
 
 	  for arg in $dlprefiles; do
 	    $show "extracting global C symbols from \`$arg'"
-	    name=`echo "$arg" | sed -e 's%^.*/%%'`
-	    $run eval 'echo ": $name " >> "$nlist"'
+	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+	    $run eval '$echo ": $name " >> "$nlist"'
 	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
 	  done
 
@@ -3655,12 +4255,18 @@ extern \"C\" {
 	    test -f "$nlist" || : > "$nlist"
 
 	    if test -n "$exclude_expsyms"; then
-	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
 	      $mv "$nlist"T "$nlist"
 	    fi
 
 	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
+	    if grep -v "^: " < "$nlist" |
+		if sort -k 3 </dev/null >/dev/null 2>&1; then
+		  sort -k 3
+		else
+		  sort +2
+		fi |
+		uniq > "$nlist"S; then
 	      :
 	    else
 	      grep -v "^: " < "$nlist" > "$nlist"S
@@ -3669,7 +4275,7 @@ extern \"C\" {
 	    if test -f "$nlist"S; then
 	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
 	    else
-	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
 	    fi
 
 	    $echo >> "$output_objdir/$dlsyms" "\
@@ -3677,27 +4283,25 @@ extern \"C\" {
 #undef lt_preloaded_symbols
 
 #if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
+# define lt_ptr void *
 #else
-# define lt_ptr_t char *
+# define lt_ptr char *
 # define const
 #endif
 
 /* The mapping between symbol names and symbols. */
 const struct {
   const char *name;
-  lt_ptr_t address;
+  lt_ptr address;
 }
 lt_preloaded_symbols[] =
 {\
 "
 
-	    sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
-		-e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
-		  < "$nlist" >> "$output_objdir/$dlsyms"
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
 
 	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr_t) 0}
+  {0, (lt_ptr) 0}
 };
 
 /* This works around a problem in FreeBSD linker */
@@ -3770,7 +4374,7 @@ static const void *lt_preloaded_setup() {
                    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
+      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"
@@ -3895,7 +4499,7 @@ static const void *lt_preloaded_setup() {
 	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
 	  fi
 	done
-	relink_command="cd `pwd`; $relink_command"
+	relink_command="(cd `pwd`; $relink_command)"
 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
@@ -3915,13 +4519,228 @@ static const void *lt_preloaded_setup() {
 	# win32 will think the script is a binary if it has
 	# a .exe suffix, so we strip it off here.
 	case $output in
-	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
 	esac
 	# test for cygwin because mv fails w/o .exe extensions
 	case $host in
-	  *cygwin*) exeext=.exe ;;
+	  *cygwin*)
+	    exeext=.exe
+	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
 	  *) exeext= ;;
 	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+	    cwrapper=`$echo ${output}.exe`
+	    $rm $cwrappersource $cwrapper
+	    trap "$rm $cwrappersource $cwrapper; exit 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
 
@@ -3939,7 +4758,7 @@ static const void *lt_preloaded_setup() {
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -3951,7 +4770,7 @@ relink_command=\"$relink_command\"
 # This environment variable determines our operation mode.
 if test \"\$libtool_install_magic\" = \"$magic\"; then
   # install mode needs the following variable:
-  uninst_deplibs='$uninst_deplibs'
+  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
@@ -3977,7 +4796,7 @@ else
   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
 
@@ -3990,7 +4809,7 @@ else
     fi
 
     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
   done
 
   # Try to get the absolute directory name.
@@ -3999,12 +4818,12 @@ else
 "
 
 	if test "$fast_install" = yes; then
-	  echo >> $output "\
+	  $echo >> $output "\
   program=lt-'$outputname'$exeext
   progdir=\"\$thisdir/$objdir\"
 
   if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
     file=\"\$\$-\$program\"
@@ -4015,12 +4834,13 @@ else
       $rm \"\$progdir/\$file\"
     fi"
 
-	  echo >> $output "\
+	  $echo >> $output "\
 
     # relink executable if necessary
     if test -n \"\$relink_command\"; then
-      if (eval \$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
@@ -4032,13 +4852,13 @@ else
     $rm \"\$progdir/\$file\"
   fi"
 	else
-	  echo >> $output "\
+	  $echo >> $output "\
   program='$outputname'
   progdir=\"\$thisdir/$objdir\"
 "
 	fi
 
-	echo >> $output "\
+	$echo >> $output "\
 
   if test -f \"\$progdir/\$program\"; then"
 
@@ -4069,14 +4889,6 @@ else
       # Run the actual program with our arguments.
 "
 	case $host in
-	# win32 systems need to use the prog path for dll
-	# lookup to work
-	*-*-cygwin* | *-*-pw32*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-
 	# Backslashes separate directories on plain windows
 	*-*-mingw | *-*-os2*)
 	  $echo >> $output "\
@@ -4086,11 +4898,7 @@ else
 
 	*)
 	  $echo >> $output "\
-      # Export the path to the program.
-      PATH=\"\$progdir:\$PATH\"
-      export PATH
-
-      exec \$program \${1+\"\$@\"}
+      exec \$progdir/\$program \${1+\"\$@\"}
 "
 	  ;;
 	esac
@@ -4102,7 +4910,7 @@ 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
+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
   fi
 fi\
@@ -4125,7 +4933,7 @@ fi\
 	  oldobjs="$libobjs_save"
 	  build_libtool_libs=no
 	else
-	  oldobjs="$objs$old_deplibs $non_pic_objects"
+	  oldobjs="$old_deplibs $non_pic_objects"
 	fi
 	addlibs="$old_convenience"
       fi
@@ -4137,7 +4945,7 @@ fi\
 	$show "$mkdir $gentop"
 	$run $mkdir "$gentop"
 	status=$?
-	if test $status -ne 0 && test ! -d "$gentop"; then
+	if test "$status" -ne 0 && test ! -d "$gentop"; then
 	  exit $status
 	fi
 	generated="$generated $gentop"
@@ -4157,73 +4965,109 @@ fi\
 	  $show "$mkdir $xdir"
 	  $run $mkdir "$xdir"
 	  status=$?
-	  if test $status -ne 0 && test ! -d "$xdir"; then
+	  if test "$status" -ne 0 && test ! -d "$xdir"; then
 	    exit $status
 	  fi
+	  # 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 | $NL2SP`
+	  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
-#	# Ensure that we have .o objects in place in case we decided
-#	# not to build a shared library, and have fallen back to building
-#	# static libs even though --disable-static was passed!
-#	for oldobj in $oldobjs; do
-#	  if test ! -f $oldobj; then
-#	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-#	    if test "X$xdir" = "X$oldobj"; then
-#	      xdir="."
-#	    else
-#	      xdir="$xdir"
-#	    fi
-#	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-#	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-#	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-#	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
-#	  fi
-#	done
-
-        eval cmds=\"$old_archive_cmds\"
-
-        if len=`expr "X$cmds" : ".*"` &&
-             test $len -le $max_cmd_len; then
-          :
-        else
-          # the command line is too long to link in one step, link in parts
-          $echo "using piecewise archive linking..."
+	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
-          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
+	  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
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	    fi
+	  done
 	  RANLIB=$save_RANLIB
-          oldobjs=$objlist
-          eval cmds=\"\$concat_cmds~$old_archive_cmds\"
-        fi
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
+	  fi
+	fi
       fi
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
 	IFS="$save_ifs"
 	$show "$cmd"
@@ -4256,9 +5100,11 @@ fi\
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-
+      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
@@ -4273,7 +5119,7 @@ fi\
 	      case $deplib in
 	      *.la)
 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		if test -z "$libdir"; then
 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
 		  exit 1
@@ -4287,7 +5133,7 @@ fi\
 	    newdlfiles=
 	    for lib in $dlfiles; do
 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 	      if test -z "$libdir"; then
 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 		exit 1
@@ -4298,7 +5144,7 @@ fi\
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 	      if test -z "$libdir"; then
 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 		exit 1
@@ -4311,7 +5157,7 @@ fi\
 	  # place dlname in correct position for cygwin
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
 	  $echo > $output "\
 # $outputname - a libtool library file
@@ -4340,14 +5186,16 @@ 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 $hardcode_into_libs = all &&
-	     test "$installed" = no && test $need_relink = yes; then
+	  if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
 	    $echo >> $output "\
 relink_command=\"$relink_command\""
 	  fi
@@ -4483,7 +5331,7 @@ relink_command=\"$relink_command\""
 
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files
-      if test $# -gt 2; then
+      if test "$#" -gt 2; then
 	$echo "$modename: \`$dest' is not a directory" 1>&2
 	$echo "$help" 1>&2
 	exit 1
@@ -4523,7 +5371,7 @@ relink_command=\"$relink_command\""
 
       *.la)
 	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 	else
 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
 	  $echo "$help" 1>&2
@@ -4557,13 +5405,34 @@ relink_command=\"$relink_command\""
 	test "X$dir" = "X$file/" && dir=
 	dir="$dir$objdir"
 
-	if test "$hardcode_into_libs" = all && test -n "$relink_command"; then
+	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
-	    continue
+	    exit 1
 	  fi
 	fi
 
@@ -4575,7 +5444,7 @@ relink_command=\"$relink_command\""
 	  shift
 
 	  srcname="$realname"
-	  test "$hardcode_into_libs" = all && test -n "$relink_command" && srcname="$realname"T
+	  test -n "$relink_command" && srcname="$realname"T
 
 	  # Install the shared library and build the symlinks.
 	  $show "$install_prog $dir/$srcname $destdir/$realname"
@@ -4585,7 +5454,7 @@ relink_command=\"$relink_command\""
 	    $run eval "$striplib $destdir/$realname" || exit $?
 	  fi
 
-	  if test $# -gt 0; then
+	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
 	    for linkname
 	    do
@@ -4599,7 +5468,7 @@ relink_command=\"$relink_command\""
 	  # Do each command in the postinstall commands.
 	  lib="$destdir/$realname"
 	  eval cmds=\"$postinstall_cmds\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	  save_ifs="$IFS"; IFS='~'
 	  for cmd in $cmds; do
 	    IFS="$save_ifs"
 	    $show "$cmd"
@@ -4671,25 +5540,53 @@ relink_command=\"$relink_command\""
 	  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.
-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  uninst_deplibs=
+	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
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
+	  */* | *\\*) . ${wrapperdot} ;;
+	  *) . ./${wrapperdot} ;;
 	  esac
 
 	  # Check the variables that should have been set.
-	  if test -z "$uninst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+	  if test -z "$notinst_deplibs"; then
+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
 	    exit 1
 	  fi
 
 	  finalize=yes
-	  for lib in $uninst_deplibs; do
+	  for lib in $notinst_deplibs; do
 	    # Check to see that each library is installed.
 	    libdir=
 	    if test -f "$lib"; then
@@ -4707,10 +5604,17 @@ relink_command=\"$relink_command\""
 	  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
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
+	  */* | *\\*) . ${wrapperdot} ;;
+	  *) . ./${wrapperdot} ;;
 	  esac
 
 	  outputname=
@@ -4724,7 +5628,7 @@ relink_command=\"$relink_command\""
 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
 		continue
 	      fi
-	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
 	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
@@ -4742,11 +5646,10 @@ relink_command=\"$relink_command\""
 	    fi
 	  else
 	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
 	  fi
 	fi
 
-
 	# remove .exe since cygwin /usr/bin/install will append another
 	# one anyways
 	case $install_prog,$host in
@@ -4759,12 +5662,11 @@ relink_command=\"$relink_command\""
 	    destfile=$destfile.exe
 	    ;;
 	  *:*.exe)
-	    destfile=`echo $destfile | sed -e 's,.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"
@@ -4788,7 +5690,7 @@ relink_command=\"$relink_command\""
 
       # Do each command in the postinstall commands.
       eval cmds=\"$old_postinstall_cmds\"
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
 	IFS="$save_ifs"
 	$show "$cmd"
@@ -4804,11 +5706,10 @@ relink_command=\"$relink_command\""
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec $SHELL $0 --finish$current_libdirs
-      exit 1
+      exec_cmd='$SHELL $0 --finish$current_libdirs'
+    else
+      exit 0
     fi
-
-    exit 0
     ;;
 
   # libtool finish mode
@@ -4827,7 +5728,7 @@ relink_command=\"$relink_command\""
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
 	  eval cmds=\"$finish_cmds\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	  save_ifs="$IFS"; IFS='~'
 	  for cmd in $cmds; do
 	    IFS="$save_ifs"
 	    $show "$cmd"
@@ -4848,40 +5749,40 @@ relink_command=\"$relink_command\""
     # Exit here if they wanted silent mode.
     exit 0
 
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
+    $echo "----------------------------------------------------------------------"
+    $echo "Libraries have been installed in:"
     for libdir in $libdirs; do
-      echo "   $libdir"
+      $echo "   $libdir"
     done
-    echo
-    echo "If you ever happen to want to link against installed libraries"
-    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
-    echo "flag during linking and do at least one of the following:"
+    $echo
+    $echo "If you ever happen to want to link against installed libraries"
+    $echo "in a given directory, LIBDIR, you must either use libtool, and"
+    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $echo "flag during linking and do at least one of the following:"
     if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
+      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $echo "     during execution"
     fi
     if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
+      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $echo "     during linking"
     fi
     if test -n "$hardcode_libdir_flag_spec"; then
       libdir=LIBDIR
       eval flag=\"$hardcode_libdir_flag_spec\"
 
-      echo "   - use the \`$flag' linker flag"
+      $echo "   - use the \`$flag' linker flag"
     fi
     if test -n "$admincmds"; then
-      echo "   - have your system administrator run these commands:$admincmds"
+      $echo "   - have your system administrator run these commands:$admincmds"
     fi
     if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
     fi
-    echo
-    echo "See any operating system documentation about shared libraries for"
-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    echo "----------------------------------------------------------------------"
+    $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
     ;;
 
@@ -4909,7 +5810,7 @@ relink_command=\"$relink_command\""
       case $file in
       *.la)
 	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 	else
 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 	  $echo "$help" 1>&2
@@ -4980,7 +5881,7 @@ relink_command=\"$relink_command\""
       -*) ;;
       *)
 	# Do a test to see if this is really a libtool program.
-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 	  # If there is no directory component, then add one.
 	  case $file in
 	  */* | *\\*) . $file ;;
@@ -5003,7 +5904,7 @@ relink_command=\"$relink_command\""
 	eval "export $shlibpath_var"
       fi
 
-      # Restore saved enviroment variables
+      # Restore saved environment variables
       if test "${save_LC_ALL+set}" = set; then
 	LC_ALL="$save_LC_ALL"; export LC_ALL
       fi
@@ -5011,11 +5912,8 @@ relink_command=\"$relink_command\""
 	LANG="$save_LANG"; export LANG
       fi
 
-      # Now actually exec the command.
-      eval "exec \$cmd$args"
-
-      $echo "$modename: cannot exec \$cmd$args"
-      exit 1
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
@@ -5032,6 +5930,8 @@ relink_command=\"$relink_command\""
     modename="$modename: $mode"
     rm="$nonopt"
     files=
+    rmforce=
+    exit_status=0
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
@@ -5040,6 +5940,7 @@ relink_command=\"$relink_command\""
     for arg
     do
       case $arg in
+      -f) rm="$rm $arg"; rmforce=yes ;;
       -*) rm="$rm $arg" ;;
       *) files="$files $arg" ;;
       esac
@@ -5053,31 +5954,44 @@ relink_command=\"$relink_command\""
 
     rmdirs=
 
+    origobjdir="$objdir"
     for file in $files; do
       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
       if test "X$dir" = "X$file"; then
 	dir=.
-	objdir="$objdir"
+	objdir="$origobjdir"
       else
-	objdir="$dir/$objdir"
+	objdir="$dir/$origobjdir"
       fi
       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test $mode = uninstall && objdir="$dir"
+      test "$mode" = uninstall && objdir="$dir"
 
       # Remember objdir for removal later, being careful to avoid duplicates
-      if test $mode = clean; then
-        case " $rmdirs " in
+      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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 	  . $dir/$name
 
 	  # Delete the libtool libraries and symlinks.
@@ -5085,17 +5999,20 @@ relink_command=\"$relink_command\""
 	    rmfiles="$rmfiles $objdir/$n"
 	  done
 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 
-	  if test $mode = uninstall; then
+	  if test "$mode" = uninstall; then
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
 	      eval cmds=\"$postuninstall_cmds\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	      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
@@ -5103,11 +6020,14 @@ relink_command=\"$relink_command\""
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
 	      eval cmds=\"$old_postuninstall_cmds\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	      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
@@ -5118,52 +6038,69 @@ relink_command=\"$relink_command\""
 
       *.lo)
 	# Possibly a libtool object, so verify it.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 
-          # Read the .lo file
-          . $dir/$name
+	  # 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
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$pic_object"
-          fi
+	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-          if test -n "$non_pic_object" \
-             && test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$non_pic_object"
-          fi
+	  fi
 	fi
 	;;
 
       *)
-	# Do a test to see if this is a libtool program.
-	if test $mode = clean &&
-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  relink_command=
-	  . $dir/$file
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe) 
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
 
-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	  if test "$fast_install" = yes && test -n "$relink_command"; then
-	    rmfiles="$rmfiles $objdir/lt-$name"
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
 	  fi
 	fi
 	;;
       esac
       $show "$rm $rmfiles"
-      $run $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
+	$show "rmdir $dir"
+	$run rmdir $dir >/dev/null 2>&1
       fi
     done
 
-    exit 0
+    exit $exit_status
     ;;
 
   "")
@@ -5173,11 +6110,18 @@ relink_command=\"$relink_command\""
     ;;
   esac
 
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$generic_help" 1>&2
-  exit 1
+  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 \
@@ -5208,7 +6152,9 @@ MODE must be one of the following:
       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."
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool@gnu.org>."
   exit 0
   ;;
 
@@ -5235,6 +6181,8 @@ 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
@@ -5364,7 +6312,7 @@ Otherwise, only FILE itself is deleted using RM."
   ;;
 esac
 
-echo
+$echo
 $echo "Try \`$modename --help' for more information about other modes."
 
 exit 0
@@ -5380,14 +6328,14 @@ exit 0
 # 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
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
 build_libtool_libs=no
 build_old_libs=yes
-### END LIBTOOL TAG CONFIG: disable-shared
+# ### 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
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script
diff --git a/admin/missing b/admin/missing
index 5f9da90..6a37006 100755
--- a/admin/missing
+++ b/admin/missing
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# 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
@@ -18,6 +18,11 @@
 # 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
@@ -25,6 +30,14 @@ 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.
@@ -65,7 +78,7 @@ Supported PROGRAM values:
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.3 - GNU automake"
+    echo "missing 0.4 - GNU automake"
     ;;
 
   -*)
@@ -74,31 +87,46 @@ Supported PROGRAM values:
     exit 1
     ;;
 
-  aclocal)
+  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.in'.  You might want
+         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.in'.  You might want to install the
+         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.in'.  You might want
+         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.in`
+    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
@@ -111,10 +139,15 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     touch $touch_files
     ;;
 
-  automake)
+  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.in'.
+         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 |
@@ -122,6 +155,34 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 	   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
@@ -176,6 +237,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   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
@@ -196,6 +262,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   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
@@ -222,23 +293,23 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     # Look for gnutar/gtar before invocation to avoid ugly error
     # messages.
     if (gnutar --version > /dev/null 2>&1); then
-       gnutar ${1+"$@"} && exit 0
+       gnutar "$@" && exit 0
     fi
     if (gtar --version > /dev/null 2>&1); then
-       gtar ${1+"$@"} && exit 0
+       gtar "$@" && exit 0
     fi
     firstarg="$1"
     if shift; then
 	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
+	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
 	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
+	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
     fi
diff --git a/admin/mkinstalldirs b/admin/mkinstalldirs
index bb5178e..d2d5f21 100755
--- a/admin/mkinstalldirs
+++ b/admin/mkinstalldirs
@@ -4,37 +4,108 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.7 2001/11/20 09:56:33 joachim Exp $
-
 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
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
+  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
 
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
 
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
+      mkdir "$pathcomp" || lasterr=$?
 
-        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 ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
+  	  if test ! -z "$lasterr"; then
+  	    errstatus=$lasterr
+  	  fi
+  	fi
+      fi
+    fi
 
-     pathcomp="$pathcomp/"
-   done
+    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
new file mode 100755
index 0000000..1544713
--- /dev/null
+++ b/admin/nmcheck
@@ -0,0 +1,371 @@
+#!/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
index 8aa0314..5ea68e4 100755
--- a/admin/ylwrap
+++ b/admin/ylwrap
@@ -17,45 +17,40 @@
 # 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 PROGRAM INPUT [OUTPUT DESIRED]... -- [ARGS]...
-# * PROGRAM is program to run.
+#     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 program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
- /* | [A-Za-z]:*) ;;
- */*) prog="`pwd`/$prog" ;;
-esac
-
 # The input.
 input="$1"
 shift
 case "$input" in
- /* | [A-Za-z]:*)
+ [\\/]* | ?:[\\/]*)
     # Absolute path; do nothing.
     ;;
  *)
-    # Relative path.  Make it absolute.  Why?  Because otherwise any
-    # debugging info in the generated file will point to the wrong
-    # place.  This is really gross.
+    # Relative path.  Make it absolute.
     input="`pwd`/$input"
     ;;
 esac
 
-# We don't want to use the absolute path if the input in the current
-# directory like when making a tar ball.
-input_base=`echo $input | sed -e 's|.*/||'`
-if test -f $input_base && cmp $input_base $input >/dev/null 2>&1; then
-  input=$input_base
-fi
+# 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
@@ -67,6 +62,15 @@ while test "$#" -ne 0; do
    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$$
@@ -74,15 +78,7 @@ trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
 mkdir $dirname || exit 1
 
 cd $dirname
-case "$input" in
- /* | [A-Za-z]:*)
-    # Absolute path; do nothing.
-    ;;
- *)
-    # Make a symbolic link, hard link or hardcopy.
-    ln -s ../"$input" . > /dev/null 2>&1 || ln ../"$input" . > /dev/null 2>&1 || cp ../"$input" .
-    ;;
-esac
+
 $prog ${1+"$@"} "$input"
 status=$?
 
@@ -114,10 +110,15 @@ if test $status -eq 0; then
          # If $2 is an absolute path name, then just use that,
          # otherwise prepend `../'.
          case "$2" in
-	   /* | [A-Za-z]:*) target="$2";;
+	   [\\/]* | ?:[\\/]*) target="$2";;
 	   *) target="../$2";;
 	 esac
-	 mv "$from" "$target" || status=$?
+
+	 # 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
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..c666b57
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+make -f Makefile.cvs
diff --git a/bibletime-doc/INSTALL b/bibletime-doc/INSTALL
deleted file mode 100644
index 0b09b97..0000000
--- a/bibletime-doc/INSTALL
+++ /dev/null
@@ -1,208 +0,0 @@
-Additions for BibleTime 1.1:
----------------------------
-
-These are instructions how to install BibleTime 1.1.
-It's sometimes a little bit tricky to get Bibletime and SWORD working, but
-it's possible.
-
-BibleTime 1.1 requires:
-	-QT 2.2.x or later
-	-KDE 2.x (at least the libraries)
-	-SWORD 1.5.2 or later
-	
-If you don't have the sources already please browse to www.bibletime.de to see
-a list of required packages with their download URLs.	
-		
-Compile BibleTime 1.1:
-----------------------------
-
-export QTDIR=<QT 2.2.x source directory>
-export KDEDIR=<KDE2 directory (where KDE2 is installed)>
-export PATH=$KDEDIR/bin:$PATH
-make -f Makefile.cvs
-./configure					# create makefiles
-make							# compile BibleTime
-make install				# install BibleTime
-
-If something is missing in this file please post to jansorg@gmx.de, my peronal
-eMail adress.
-Please read README for a short description of BibleTime 1.1. The new handbook
-does contain better instructions how to install BibleTime from sources.
-Don't forget to read the new handbook of BibleTime, too.
-It has more information about BibleTime's features and installation.
-
-Joachim <jansorg@gmx.de>
-
-
-______________________________________________________________________________
-**			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/bibletime-doc/INSTALL.in b/bibletime-doc/INSTALL.in
deleted file mode 100644
index b5e6933..0000000
--- a/bibletime-doc/INSTALL.in
+++ /dev/null
@@ -1,208 +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:
-	-QT 2.2.x or later
-	-KDE 2.x (at least the libraries)
-	-SWORD 1.5.2 or later
-	
-If you don't have the sources already please browse to www.bibletime.de to see
-a list of required packages with their download URLs.	
-		
-Compile BibleTime @VERSION@:
-----------------------------
-
-export QTDIR=<QT 2.2.x source directory>
-export KDEDIR=<KDE2 directory (where KDE2 is installed)>
-export PATH=$KDEDIR/bin:$PATH
-make -f Makefile.cvs
-./configure					# create makefiles
-make							# compile BibleTime
-make install				# install BibleTime
-
-If something is missing in this file please post to jansorg@gmx.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.
-Don't forget to read the new handbook of BibleTime, too.
-It has more information about BibleTime's features and installation.
-
-Joachim <jansorg@gmx.de>
-
-
-______________________________________________________________________________
-**			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/bibletime-doc/Makefile.am b/bibletime-doc/Makefile.am
deleted file mode 100644
index c199427..0000000
--- a/bibletime-doc/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = docs po admin .
-
-EXTRA_DIST = \
-README.in README \
-INSTALL.in INSTALL\
-bibletime-doc.spec bibletime-doc.spec.in \
-configure.in.in configure.in \
-Makefile.cvs
-
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in 
-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in 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
-
-MAINTAINERCLEANFILES = configure.files subdirs
-
-dist-hook:
-	cd $(distdir) && $(MAKE) -f Makefile.cvs
diff --git a/bibletime-doc/Makefile.cvs b/bibletime-doc/Makefile.cvs
deleted file mode 100644
index 030b140..0000000
--- a/bibletime-doc/Makefile.cvs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-all:
-	@echo "This Makefile is only for the CVS repository"
-	@echo "This will be deleted before making the distribution"
-	@echo ""
-	@if test ! -d admin; then \
-	   echo "Please recheckout this module!" ;\
-	   echo "for cvs: use checkout once and after that update again" ;\
-	   echo "for cvsup: checkout kde-common from cvsup and" ;\
-	   echo "   link kde-common/admin to ./admin" ;\
-	   exit 1 ;\
-	fi
-	$(MAKE) -f admin/Makefile.common cvs
-
-.SILENT:
diff --git a/bibletime-doc/Makefile.in b/bibletime-doc/Makefile.in
deleted file mode 100644
index 200f828..0000000
--- a/bibletime-doc/Makefile.in
+++ /dev/null
@@ -1,539 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = docs po admin .
-
-EXTRA_DIST =  README.in README INSTALL.in INSTALL bibletime-doc.spec bibletime-doc.spec.in configure.in.in configure.in Makefile.cvs
-
-
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-
-MAINTAINERCLEANFILES = configure.files subdirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES =  README INSTALL bibletime-doc.spec
-DIST_COMMON =  README INSTALL INSTALL.in Makefile.am Makefile.in \
-README.in acinclude.m4 aclocal.m4 bibletime-doc.spec.in configure \
-configure.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=bibletime.m4 stamp-h.in 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --foreign ./Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign ./Makefile
-	cd $(top_srcdir) && perl admin/am_edit Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-README: $(top_builddir)/config.status README.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-INSTALL: $(top_builddir)/config.status INSTALL.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-bibletime-doc.spec: $(top_builddir)/config.status bibletime-doc.spec.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign ./Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in 
-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in 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
-
-dist-hook:
-	cd $(distdir) && $(MAKE) -f Makefile.cvs
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --foreign ./Makefile
-	cd $(top_srcdir) && perl admin/am_edit Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/README b/bibletime-doc/README
deleted file mode 100644
index af90d31..0000000
--- a/bibletime-doc/README
+++ /dev/null
@@ -1,60 +0,0 @@
-In the BibleTime-Doc files:
--------------
-English documentation
-	BibleTime Handbook
-	Bibletime Help Dialog
-	Biblestudy HowTo
-	BibleTime Installation Instructions
-Translated Documentation
-Zipped up last rev documentation (use this to create kbable translation dictionaries)
-.po files for bibletime code translation
-
-
-General introduction:
---------------------
-	This is BibleTime Documentation 1.1 for KDE 2.
-If you find bugs please report them to info@bibletime.de or use our
-online bugreport form on www.bibletime.de.
-
-Please do also send suggestions, criticism and moral support to info@bibletime.de .
-If you have too much money send it to one of the authors ;-)
-
-Read the file INSTALL how to install and compile this version of BibleTime Documentation.
-*Later, see the file in bibletime*   The AUTHORS file contains a list of authors working on BibleTime.
-*Later, this file is to do*          There's also a SPEC file to create RPMs, it's called bibletime.spec.
-
-
-Requirements
-------------
-
-	o Bibletime version 1.x
-	o KDE 2.x
-	o SWORD 1.5.2
-
-Documentation:
---------------
-	We do have a great and really useful handbook now!
-Fred did a great job with it and worked long on it. We hope that you like it. You can read the handbook in the 
-help browser of KDE2. It's in the Applications section.
-
-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.de.
-If you don't live in Europe please have a look at www.crosswire.org.
-
-Translations
-------------
-The BibleTime documentation is created in English, and translated to other languages with the assistance of
-tools developed by the kde documentation project.  If BibleTime is not yet translated into your language
-please consider making the port.  With the latest versions of kde translatiion tools the amount of effort
-required to create a language port has been greatly reduced.  The translation process documentation is
-found in the KDE Translation HowTo, which is posted at <http://i18n.kde.org/translation-howto/index.html>
-
-With the help of our translation team we hope to make BibleTime
-
-
-Thank you!
-The BibleTime Team <info@bibletime.de>
-Joachim <jansorg@gmx.de>
-
diff --git a/bibletime-doc/README.in b/bibletime-doc/README.in
deleted file mode 100644
index 253cfc7..0000000
--- a/bibletime-doc/README.in
+++ /dev/null
@@ -1,60 +0,0 @@
-In the BibleTime-Doc files:
--------------
-English documentation
-	BibleTime Handbook
-	Bibletime Help Dialog
-	Biblestudy HowTo
-	BibleTime Installation Instructions
-Translated Documentation
-Zipped up last rev documentation (use this to create kbable translation dictionaries)
-.po files for bibletime code translation
-
-
-General introduction:
---------------------
-	This is BibleTime Documentation @VERSION@ for KDE 2.
-If you find bugs please report them to info@bibletime.de or use our
-online bugreport form on www.bibletime.de.
-
-Please do also send suggestions, criticism and moral support to info@bibletime.de .
-If you have too much money send it to one of the authors ;-)
-
-Read the file INSTALL how to install and compile this version of BibleTime Documentation.
-*Later, see the file in bibletime*   The AUTHORS file contains a list of authors working on BibleTime.
-*Later, this file is to do*          There's also a SPEC file to create RPMs, it's called bibletime.spec.
-
-
-Requirements
-------------
-
-	o Bibletime version 1.x
-	o KDE 2.x
-	o SWORD 1.5.2
-
-Documentation:
---------------
-	We do have a great and really useful handbook now!
-Fred did a great job with it and worked long on it. We hope that you like it. You can read the handbook in the 
-help browser of KDE2. It's in the Applications section.
-
-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.de.
-If you don't live in Europe please have a look at www.crosswire.org.
-
-Translations
-------------
-The BibleTime documentation is created in English, and translated to other languages with the assistance of
-tools developed by the kde documentation project.  If BibleTime is not yet translated into your language
-please consider making the port.  With the latest versions of kde translatiion tools the amount of effort
-required to create a language port has been greatly reduced.  The translation process documentation is
-found in the KDE Translation HowTo, which is posted at <http://i18n.kde.org/translation-howto/index.html>
-
-With the help of our translation team we hope to make BibleTime
-
-
-Thank you!
-The BibleTime Team <info@bibletime.de>
-Joachim <jansorg@gmx.de>
-
diff --git a/bibletime-doc/acinclude.m4 b/bibletime-doc/acinclude.m4
deleted file mode 100644
index ff58a75..0000000
--- a/bibletime-doc/acinclude.m4
+++ /dev/null
@@ -1,5165 +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. If you decide that you
-dnl really want to modify it, contact coolo@kde.org mentioning that you have
-dnl and that the modified file should be committed to every module.
-dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
-
-dnl ------------------------------------------------------------------------
-dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
-dnl thanks to Raja R Harinath.
-dnl ------------------------------------------------------------------------
-dnl
-ifdef([_AC_PATH_X_DIRECT],[],
-   [AC_DEFUN([_AC_PATH_X_DIRECT],[AC_PATH_X_DIRECT])])
-ifdef([_AC_PATH_X_XMKMF],[],
-   [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])])
-
-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.
-])
-])
-
-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,
-[
-   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, [$qt_bindirs], [UIC=""])
-     if test -z "$UIC" ; then
-       KDE_UIC_ERROR_MESSAGE
-       exit 1
-     fi
-   else
-     UIC="echo uic not available: "
-   fi
-
-   AC_SUBST(MOC)
-   AC_SUBST(UIC)
-])
-
-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_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_result=$1"
-])
-
-AC_DEFUN(KDE_SET_DEFAULT_PATHS,
-[
-if test "$1" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${prefix}/share/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${prefix}/share/config'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${prefix}/share/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${prefix}/share/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
-  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_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 "$kde_have_all_paths" != "yes"; 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_SUBST_PROGRAMS,
-[
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde2/bin /usr/kde/bin /usr/local/kde/bin"
-        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)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
-        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-      
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde2/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)'
-        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)
-
-        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_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-  kde_have_all_paths=
-  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_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(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
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN(KDE_MISC_TESTS,
-[
-   AC_LANG_C
-   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_LANG_C
-   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"))
-   
-   # Solaris 2.6 and others need -lresolv for res_init
-   AC_CHECK_FUNCS(res_init, , [
-     kde_libs_safe="$LIBS"
-     LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-     AC_TRY_LINK(
-[
-#include <resolv.h>
-],
-[ 
-res_init(); 
-],
-        LIBRESOLV="-lresolv"
-        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-        AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-     )
-     LIBS=$kde_libs_safe
-   ])
-
-   LIBSOCKET="$X_EXTRA_LIBS"
-   AC_SUBST(LIBSOCKET)
-   AC_SUBST(LIBRESOLV)
-   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
-])
-
-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([AC_PROG_CPP])dnl
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_MSG_CHECKING(for X)
-AC_LANG_SAVE
-AC_LANG_C
-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
-
-_AC_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"
-  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"
-
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_libraries)
-AC_SUBST(x_includes)
-
-# 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)
-AC_SUBST(LIBSM)
-LDFLAGS="$ac_save_LDFLAGS"
-
-AC_SUBST(X_PRE_LIBS)
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-AC_SUBST(LIB_X11)
-
-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
-
-AC_MSG_CHECKING(for Xinerama)
-
- AC_ARG_WITH(xinerama,
-  [  --with-xinerama         enable support for Xinerama ],
-  [
-    no_xinerama=no
-  ], [
-    no_xinerama=yes
-  ]
-)
-
-kde_save_LDFLAGS="$LDFLAGS"
-kde_save_CFLAGS="$CFLAGS"
-kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
-
-if test "x$no_xinerama" = "xno"; then
-
-  AC_CACHE_VAL(ac_cv_have_xinerama,
-  [
-	  AC_TRY_LINK([#include <X11/Xlib.h>
-  			#include <X11/extensions/Xinerama.h>],
-	  	  [XineramaIsActive(NULL);],
-		  [ac_cv_have_xinerama="yes"],
-		  [ac_cv_have_xinerama="no"])
-  ])
-else
-  ac_cv_have_xinerama=no;
-fi
-
-AC_MSG_RESULT($ac_cv_have_xinerama)
-
-LIBXINERAMA=""
-
-if test "$ac_cv_have_xinerama" = "yes"; then
-  AC_DEFINE(HAVE_XINERAMA, 1, [Define if you want Xinerama support])
-  LIBXINERAMA="-lXinerama"
-fi
-
-AC_SUBST(LIBXINERAMA)
-
-LDFLAGS="$kde_save_LDFLAGS"
-CFLAGS="$kde_save_CFLAGS"
-LIBS="$kde_save_LIBS"
-
-AC_LANG_RESTORE
-
-])
-
-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
-#include <qiconview.h>
-EOF
-fi
-
-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();
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
-EOF
-fi
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-EOF
-])
-
-AC_DEFUN(KDE_USE_QT,
-[
-
-if test -z "$1"; then
-  kde_qtver=2
-  kde_qtsubver=1
-else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9]\+\.\([0-9]\+\).*#\1#'`
-  # following is the check if subversion isn�t found in passed argument
-  if test "$kde_qtsubver" = "$1"; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "$1" | sed -e 's#^\([0-9]\+\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  else
-   # this is the version number fallback to 2.1, unless major version is 1 or 2
-   if test "$kde_qtver" != "2"; then
-    kde_qtver=2
-    kde_qtsubver=1
-   fi
-  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
-  else
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion=$2
-fi
-
-if test -z "$3"; then
-   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
-   else
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-  fi
-else
-   kde_qt_verstring=$3
-fi
-
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-else
-   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"
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-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])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
-  mt,
-  [  --enable-mt             link to threaded Qt (experimental)],
-  kde_use_qt_mt=$enableval,
-  kde_use_qt_mt=no
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-
-  case $host in
-  *-*-linux-*)
-    if test "x$GCC" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread"
-      X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-    else
-      AC_MSG_WARN([Compiler is not gcc. MT support disabled.])
-    fi
-    ;;
-  *)
-    AC_MSG_WARN([MT not yet supported on $host - disabled.])
-    ;;
-  esac
-
-fi
-
-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
-
-  LIBQT_GLOB="libqt.*"
-
-fi
-
-if test -z "$LIBQT"; then
-
-  LIBQT="-lqt"
-  kde_int_qt="-lqt"
-
-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
-
-      case $host in
-      *-*-linux-*)
-        if test "x$GCC" = "xyes"; then
-          LIBQT="-lqt-mt"
-          kde_int_qt="-lqt-mt"
-          LIBQT_GLOB="libqt-mt.*"
-          USING_QT_MT="using -mt"
-        fi
-      ;;
-      esac
-  fi
-
-  kde_qt_was_given=no
-
-else
-  kde_int_qt="$LIBQT"
-fi
-
-if test $kde_qtver = 2; then
-
-  AC_REQUIRE([AC_FIND_PNG])
-  AC_REQUIRE([AC_FIND_JPEG])
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
-    [  --with-qt-dir=DIR       where the root of Qt is installed ],
-    [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib
-       ac_qt_bindir="$withval"/bin
-    ])
-
-AC_ARG_WITH(qt-includes,
-    [  --with-qt-includes=DIR  where the Qt includes are. ],
-    [
-       ac_qt_includes="$withval"
-    ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
-    [  --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 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" = "2"; 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 $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
-
-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"
-LIBS="$LIBS $LIBQT"
-
-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=""
-  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
-    ac_qt_notfound="(libraries)";
-  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.])
-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"; 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
-
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
-
-LIB_QT="$kde_int_qt "'$(LIBPNG) $(LIBJPEG) -lXext $(LIB_X11) $(LIBSM)'
-AC_SUBST(LIB_QT)
-
-])
-
-AC_DEFUN(AC_PATH_QT,
-[
-AC_PATH_QT_1_3
-])
-
-AC_DEFUN(KDE_CHECK_FINAL,
-[
-  AC_ARG_ENABLE(final, [  --enable-final          build size optimized apps (experimental - needs lots of memory)],
-	kde_use_final=$enableval, kde_use_final=no)
-
-  KDE_COMPILER_REPO
-  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_ARG_ENABLE(closure, [  --disable-closure       don't delay template instantiation],
-  	kde_use_closure=$enableval, kde_use_closure=yes)
-
-  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=""
-  fi
-  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-])
-
-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_PREREQ([2.13])
-AC_REQUIRE([AC_PATH_QT])dnl
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${prefix}" != NONE; then
-  kde_includes=${prefix}/include
-  ac_kde_includes=$prefix/include
-
-  if test "${exec_prefix}" != NONE; then
-    kde_libraries=${exec_prefix}/lib
-    ac_kde_libraries=$exec_prefix/lib
-  else
-    kde_libraries=${prefix}/lib
-    ac_kde_libraries=$prefix/lib
-  fi
-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/kde2/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 /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-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
-ac_kde_libraries="$kde_libdir"
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = 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="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
-
-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_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)
-
-AC_SUBST(AUTODIRS)
-])
-
-AC_DEFUN(KDE_CHECK_EXTRA_LIBS,
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes, [  --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, [  --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");
-    return 0;
-    }
-EOF
-
- ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- 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
-
-  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
- kde_cxxflags_safe="$CXXFLAGS"
-])
-
-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_CHECK_KIMGIO,
-[
-   AC_REQUIRE([AC_BASE_PATH_KDE])
-   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-   AC_REQUIRE([AC_FIND_TIFF])
-   AC_REQUIRE([AC_FIND_JPEG])
-   AC_REQUIRE([AC_FIND_PNG])
-   AC_REQUIRE([KDE_CREATE_LIBS_ALIASES])
-
-   if test "$1" = "existance"; then
-     AC_LANG_SAVE
-     AC_LANG_CPLUSPLUS
-     kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries $LIBJPEG $LIBTIFF $LIBPNG $LIBQT -lm"
-     AC_CHECK_LIB(kimgio, kimgioRegister, [
-      LIBKIMGIO_EXISTS=yes],LIBKIMGIO_EXISTS=no)
-      LIBS="$kde_save_LIBS"
-      AC_LANG_RESTORE
-   else
-      LIBKIMGIO_EXISTS=yes
-   fi
-
-   if test "$LIBKIMGIO_EXISTS" = "yes"; then
-     LIB_KIMGIO='-lkimgio'
-   else
-     LIB_KIMGIO=''
-   fi
-   AC_SUBST(LIB_KIMGIO)
-])
-
-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 = 2; then
-   LIB_KDECORE='-lkdecore'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFORMULA='-lkformula'
-   AC_SUBST(LIB_KFORMULA)
-   LIB_KIO='-lkio'
-   AC_SUBST(LIB_KIO)
-   LIB_KSYCOCA='-lksycoca'
-   AC_SUBST(LIB_KSYCOCA)
-   LIB_SMB='-lsmb'
-   AC_SUBST(LIB_SMB)
-   LIB_KFILE='-lkfile'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab'
-   AC_SUBST(LIB_KAB)
-   LIB_KHTML='-lkhtml'
-   AC_SUBST(LIB_KHTML)
-   LIB_KSPELL='-lkspell'
-   AC_SUBST(LIB_KSPELL)
-   LIB_KPARTS='-lkparts'
-   AC_SUBST(LIB_KPARTS)
-   LIB_KWRITE='-lkwrite'
-   AC_SUBST(LIB_KWRITE)
-else
-   LIB_KDECORE='-lkdecore -lXext $(LIB_QT)'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui $(LIB_KDECORE)'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFM='-lkfm $(LIB_KDECORE)'
-   AC_SUBST(LIB_KFM)
-   LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)'
-   AC_SUBST(LIB_KAB)
-fi
-])
-
-AC_DEFUN(AC_PATH_KDE,
-[
-  AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check, [  --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 obsolete
-AC_DEFUN(AC_CHECK_SETENV,
-[
-   AC_OBSOLETE([$0], [; instead use AC_CHECK_FUNCS([setenv unsetenv])])dnl 
-   AC_CHECK_FUNCS([setenv unsetenv])
-])
-
-AC_DEFUN(AC_CHECK_GETDOMAINNAME,
-[
-AC_MSG_CHECKING(for getdomainname)
-AC_CACHE_VAL(ac_cv_func_getdomainname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-char buffer[200];
-getdomainname(buffer, 200);
-],
-ac_cv_func_getdomainname=yes,
-ac_cv_func_getdomainname=no)
-CXXFLAGS="$save_CXXFLAGS"
-LIBS=$kde_safe_LIBS
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_getdomainname)
-
-AC_MSG_CHECKING([if getdomainname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_getdomainname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  ac_cv_proto_getdomainname=no
-else
-  kde_safe_libs=$LIBS
-  LIBS="$LIBS $X_EXTRA_LIBS"
-  AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-
-extern "C" int getdomainname (char *, int);
-],
-[
-char buffer[200];
-getdomainname(buffer, 200);
-],
-  ac_cv_func_getdomainname=yes
-  ac_cv_proto_getdomainname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR([getdomainname unavailable]))
-fi
-LIBS=$kde_safe_libs
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_proto_getdomainname)
-
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME, 1, [Define if you have getdomainname])
-fi
-if eval "test \"`echo $ac_cv_proto_getdomainname`\" = no"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME_PROTO, 1,
-  [Define if you have getdomainname prototype])
-fi
-
-])
-
-AC_DEFUN(AC_CHECK_GETHOSTNAME,
-[
-
-AC_MSG_CHECKING([for gethostname])
-AC_CACHE_VAL(ac_cv_func_gethostname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-char buffer[200];
-gethostname(buffer, 200);
-],
-ac_cv_func_gethostname=yes,
-ac_cv_func_gethostname=no)
-CXXFLAGS="$save_CXXFLAGS"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_gethostname)
-
-AC_MSG_CHECKING([if gethostname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_gethostname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  ac_cv_proto_gethostname=no
-else
-  AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-
-extern "C" int gethostname (char *, int);
-],
-[
-char buffer[200];
-gethostname(buffer, 200);
-],
-  ac_cv_func_gethostname=yes
-  ac_cv_proto_gethostname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR(gethostname unavailable))
-fi
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_proto_gethostname)
-
-if eval "test \"`echo $ac_cv_proto_gethostname`\" = no"; then
-  AC_DEFINE(HAVE_GETHOSTNAME_PROTO, 1,
-  [Define if you have gethostname prototype])
-fi
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  AC_DEFINE(HAVE_GETHOSTNAME, 1, [Define if you have gethostname])
-fi
-])
-
-AC_DEFUN(AC_CHECK_USLEEP,
-[
-AC_MSG_CHECKING([for usleep])
-AC_CACHE_VAL(ac_cv_func_usleep,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-usleep(200);
-],
-ac_cv_func_usleep=yes,
-ac_cv_func_usleep=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_usleep)
-if eval "test \"`echo $ac_cv_func_usleep`\" = yes"; then
-  AC_DEFINE(HAVE_USLEEP, 1, [Define if you have the usleep function])
-fi
-])
-
-AC_DEFUN(AC_CHECK_RANDOM,
-[
-AC_MSG_CHECKING([for random])
-AC_CACHE_VAL(ac_cv_func_random,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
-],
-[
-random();
-],
-ac_cv_func_random=yes,
-ac_cv_func_random=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_random)
-if eval "test \"`echo $ac_cv_func_random`\" = yes"; then
-  AC_DEFINE(HAVE_RANDOM, 1, [Define if you have random])
-fi
-])
-
-AC_DEFUN(AC_FIND_GIF,
-   [AC_MSG_CHECKING([for giflib])
-AC_CACHE_VAL(ac_cv_lib_gif,
-[ac_save_LIBS="$LIBS"
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-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_LANG_C
-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="/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)
-])
-
-AC_DEFUN(AC_FIND_ZLIB,
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-AC_LANG_C
-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>
-],
-            [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_SUBST(LIBZ)
-  AC_MSG_RESULT($ac_cv_lib_z)
-else
-  AC_MSG_ERROR(not found. Check your installation and look into config.log)
-  LIBZ=""
-  AC_SUBST(LIBZ)
-fi
-])
-
-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"
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-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"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_LANG_C
-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_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,
-[
-dnl AC_REQUIRE([AC_CHECK_COMPILERS]) <- breaks with autoconf 2.50
-AC_MSG_CHECKING(whether $CXX supports -$1)
-kde_cache=`echo $1 | sed 'y%.=/+-%___p_%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -$1 -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -$1 -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-])
-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
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-])
-
-AC_DEFUN(AC_CHECK_COMPILERS,
-[
-  AC_ARG_ENABLE(debug,[  --enable-debug          enables debug symbols [default=no]],
-  [
-   if test $enableval = "no"; dnl
-     then
-       kde_use_debug_code="no"
-       kde_use_debug_define=yes
-     else
-       kde_use_debug_code="yes"
-       kde_use_debug_define=no
-   fi
-  ], 
-    [kde_use_debug_code="no"
-      kde_use_debug_define=no
-  ])
-
-  dnl Just for configure --help
-  AC_ARG_ENABLE(dummyoption,[  --disable-debug         disables debug output and debug symbols [default=no]],[],[])
-
-  AC_ARG_ENABLE(strict,[  --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(profile,[  --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 
-
-  if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CFLAGS="-g -O2 $CFLAGS"
-      case $host in
-        *-*-linux-gnu)	
-          CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-        ;;
-      esac
-    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"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $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"])
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      case $host in  dnl
-      *-*-linux-gnu)
-        CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS"
-        ;;
-      esac
-
-      if test "$kde_use_strict_options" = "yes"; then
-        CXXFLAGS="-Wcast-qual -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
-      fi
-
-      if test "$kde_very_strict" = "yes"; then
-        CXXFLAGS="-Wold-style-cast -Wredundant-decls -Wconversion $CXXFLAGS"
-      fi
-    else
-      CXXFLAGS="-O2 $CXXFLAGS"
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG $CXXFLAGS"
-  fi  
-
-  if test "$kde_use_profiling" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(pg,
-    [
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-    ])
-  fi
-    
-  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(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-  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
-
-  # the following is to allow programs, that are known to
-  # have problems when compiled with -O2
-  if test -n "$CXXFLAGS"; then
-      kde_safe_IFS=$IFS
-      IFS=" "
-      NOOPT_CXXFLAGS=""
-      for i in $CXXFLAGS; do
-        case $i in
-          -O*)
-                ;;
-          *)
-                NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS $i"
-                ;;
-        esac
-      done
-      IFS=$kde_safe_IFS
-  fi
-
-  AC_SUBST(NOOPT_CXXFLAGS)
-
-  KDE_CHECK_FINAL
-
-  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-
-  KDE_CXXFLAGS=
-  AC_SUBST(KDE_CXXFLAGS)
-])
-
-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_LANG_SAVE
-AC_LANG_C
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_RESTORE
-
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
-AC_SUBST(KDE_PLUGIN)
-
-AC_ARG_ENABLE(objprelink, [  --enable-objprelink     prelink apps using objprelink (experimental [only tested on linux/386])],
-       kde_use_objprelink=$enableval, kde_use_objprelink=no)
-  if test "x$kde_use_objprelink" = "xyes"; then 
-
-      KDE_FIND_PATH(objprelink, OBJPRELINK, [], [kde_use_objprelink=no])   
-     
-      if test "x$kde_use_objprelink" = "xyes"; then
-      AC_MSG_CHECKING([Patching libtool to run objprelink.])
-      mv libtool libtool.orig
-      cat > libtool <<\EOF
-#! /bin/sh
-for n ; do case $n in
-  *.o)  test -r $n && echo objprelink $n && objprelink $n ;;
-  *.lo) m=`basename $n .lo`".o" && test -r $m && echo objprelink $m && objprelink $m 
-        m=".libs/$m" && test -r $m && echo objprelink $m && objprelink $m ;;
-esac; done
-EOF
-      cat >> libtool libtool.orig
-      rm libtool.orig
-      chmod a+x libtool
-      AC_MSG_RESULT(done)
-	fi
-  fi
-])
-
-AC_DEFUN(KDE_CHECK_TYPES,
-[  AC_CHECK_SIZEOF(int, 4)dnl
-  AC_CHECK_SIZEOF(long, 4)dnl
-  AC_CHECK_SIZEOF(char *, 4)dnl
-  AC_CHECK_SIZEOF(char, 1)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,
-      [  --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
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
-  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_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([argz.h limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv 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="-Wmissing-prototypes -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, [  --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_LANG_C
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-    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, [  --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,
-   [
-    AC_LANG_C
-    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"
-   ])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_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, [  --without-gl            disable 3D GL modes],
-	gl_test=$withval, gl_test="yes")
- if 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_C
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET"
-    CFLAGS="$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 -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET"
-      CFLAGS="$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
-    LDFLAGS="$ac_save_ldflags"
-    CFLAGS="$ac_save_cflags"
-   ])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='-lMesaGL -lMesaGLU $(LIB_X11)'
-       else
-          GLLIB='-lGL -lGLU $(LIB_X11)'
-       fi
-    else
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)'
-       else
-          GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(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])
-
-  AC_ARG_WITH(pam,
-    [  --with-pam[=ARG]        enable support for PAM: ARG=[yes|no|service name]],
-    [ if test "x$withval" = "xyes"; then
-        use_pam=yes
-        pam_service=kde
-      elif test "x$withval" = "xno"; then
-        use_pam=no
-      else
-        use_pam=yes
-        pam_service=$withval
-      fi
-      ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-    ], [
-      AC_CACHE_VAL(ac_cv_path_pam,
-        [ use_pam=no
-          AC_CHECK_LIB(pam, pam_start,
-            [ AC_CHECK_HEADER(security/pam_appl.h, 
-                [ use_pam=yes
-                  pam_service=kde ]) 
-            ], , $LIBDL)
-          ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-        ])
-    ])
-  eval "$ac_cv_path_pam"
-
-  AC_MSG_CHECKING(for PAM)
-  if test "x$use_pam" = xno; then
-    AC_MSG_RESULT(no)
-    PAMLIBS=""
-  else
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-    PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-
-    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], security/pam_appl.h,
-      [ AC_EGREP_HEADER([const struct pam_message], security/pam_appl.h,
-                        [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
-
-  AC_SUBST(PAMLIBS)
-])
-
-dnl DEF_PAM_SERVICE(arg name, full name, define name)
-AC_DEFUN(DEF_PAM_SERVICE, [
-  AC_ARG_WITH($1-pam,
-    [  --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,
-    [  --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
-
-  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,
-[  --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_MICO,
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_MISC_TESTS])
-AC_MSG_CHECKING(for MICO)
-
-if test -z "$MICODIR"; then
-    kde_micodir=/usr/local
- else
-    kde_micodir="$MICODIR"
-fi
-
-AC_ARG_WITH(micodir,
-  [  --with-micodir=micodir  where mico is installed ],
-  kde_micodir=$withval,
-  kde_micodir=$kde_micodir
-)
-
-AC_CACHE_VAL(kde_cv_mico_incdir,
-[
-  mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes"
-AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir)
-
-])
-kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'`
-
-if test ! -r  $kde_micodir/include/CORBA.h; then
-  AC_MSG_ERROR([No CORBA.h found, specify another micodir])
-fi
-
-AC_MSG_RESULT($kde_micodir)
-
-MICO_INCLUDES=-I$kde_micodir/include
-AC_SUBST(MICO_INCLUDES)
-MICO_LDFLAGS=-L$kde_micodir/lib
-AC_SUBST(MICO_LDFLAGS)
-micodir=$kde_micodir
-AC_SUBST(micodir)
-
-AC_MSG_CHECKING([for MICO version])
-AC_CACHE_VAL(kde_cv_mico_version,
-[
-AC_LANG_C
-cat >conftest.$ac_ext <<EOF
-#include <stdio.h>
-#include <mico/version.h>
-int main() {
-
-   printf("MICO_VERSION=%s\n",MICO_VERSION);
-   return (0);
-}
-EOF
-ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest'
-if AC_TRY_EVAL(ac_compile); then
-  if eval `./conftest 2>&5`; then
-    kde_cv_mico_version=$MICO_VERSION
-  else
-    AC_MSG_ERROR([your system is not able to execute a small application to
-    find MICO version! Check $kde_micodir/include/mico/version.h])
-  fi
-else
-  AC_MSG_ERROR([your system is not able to compile a small application to
-  find MICO version! Check $kde_micodir/include/mico/version.h])
-fi
-])
-
-dnl installed MICO version
-mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "x$1" = "x"; then
- req_version="2.3.0"
-else
- req_version=$1
-fi
-
-dnl required MICO version
-req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "$mico_v_maj" -lt "$req_v_maj" || \
-   ( test "$mico_v_maj" -eq "$req_v_maj" && \
-        test "$mico_v_mid" -lt "$req_v_mid" ) || \
-   ( test "$mico_v_mid" -eq "$req_v_mid" && \
-        test "$mico_v_min" -lt "$req_v_min" )
-
-then
-  AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \
-at least is required. You should upgrade MICO.])
-else
-  AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)])
-fi
-
-LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL"
-AC_SUBST(LIBMICO)
-if test -z "$IDL"; then
-  IDL='$(kde_bindir)/cuteidl'
-fi
-AC_SUBST(IDL)
-IDL_DEPENDENCIES='$(kde_includes)/CUTE.h'
-AC_SUBST(IDL_DEPENDENCIES)
-
-idldir="\$(includedir)/idl"
-AC_SUBST(idldir)
-
-])
-
-AC_DEFUN(KDE_CHECK_MINI_STL,
-[
-AC_REQUIRE([KDE_CHECK_MICO])
-
-AC_MSG_CHECKING(if we use mico's mini-STL)
-AC_CACHE_VAL(kde_cv_have_mini_stl,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_cxxflags="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $MICO_INCLUDES"
-AC_TRY_COMPILE(
-[
-#include <mico/config.h>
-],
-[
-#ifdef HAVE_MINI_STL
-#error "nothing"
-#endif
-],
-kde_cv_have_mini_stl=no,
-kde_cv_have_mini_stl=yes)
-CXXFLAGS="$kde_save_cxxflags"
-AC_LANG_RESTORE
-])
-
-if test "x$kde_cv_have_mini_stl" = "xyes"; then
-   AC_MSG_RESULT(yes)
-   $1
-else
-   AC_MSG_RESULT(no)
-   $2
-fi
-])
-
-])
-
-
-AC_DEFUN(KDE_CHECK_LIBPTHREAD,
-[
-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
-[
-    AC_ARG_ENABLE(kernel-threads, [  --enable-kernel-threads Enable the use of the LinuxThreads port on FreeBSD/i386 only.],
-	kde_use_kernthreads=$enableval, kde_use_kernthreads=no)
-
-    if test "$kde_use_kernthreads" = "yes"; then
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_CFLAGS="$CXXFLAGS"
-      CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
-      CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
-      AC_CHECK_HEADERS(pthread/linuxthreads/pthread.h)
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      CFLAGS="$ac_save_CFLAGS"
-      if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
-        kde_use_kernthreads=no
-      else
-        dnl Add proper -I and -l statements
-        AC_CHECK_LIB(lthread, pthread_join, [LIBPTHREAD="-llthread -llgcc_r"]) dnl for FreeBSD
-        if test "x$LIBPTHREAD" = "x"; then
-          kde_use_kernthreads=no
-        else
-          USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
-        fi
-      fi
-    else 
-      USE_THREADS=""
-      if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-pthread"] )
-      fi
-    fi
-
-    case $host_os in
- 	solaris*)
-		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
-                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-                echo "Setting Solaris pthread compilation options"
-    		;;
-        freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                echo "Setting FreeBSD pthread compilation options"
-                ;;
-        aix*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                LIBPTHREAD="$LIBPTHREAD -lc_r"
-                echo "Setting AIX pthread compilation options"
-                ;;
-        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                USE_THREADS="$USE_THREADS -DPIC -fPIC"
-                echo "Setting Linux pthread compilation options"
-                ;;
-	*)
-		;;
-    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
-    kde_check_threading_default=no
-  else
-    kde_check_threading_default=yes
-  fi
-  AC_ARG_ENABLE(threading, [  --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,
-[
-AC_LANG_SAVE
-AC_LANG_C
-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
-AC_LANG_RESTORE
-
-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,
-[  --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 /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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
-
-PYTHONLIB=-L$python_libdir
-kde_orig_LIBPYTHON=$LIBPYTHON
-if test -z "$LIBPYTHON"; then
-  LIBPYTHON=-lpython$version
-fi
-
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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(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(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
-	[AC_MSG_WARN([it seems, Python depends on another library.
-    Pleae use \"make LIBPYTHON='-lpython$version -lotherlib'\" 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.1", [KDE_CHECK_PYTHON_INTERN("2.0",
-        [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
-  ])
-])
-
-AC_DEFUN(KDE_CHECK_STL_SGI,
-[
-    AC_MSG_CHECKING([if STL implementation is SGI like])
-    AC_CACHE_VAL(kde_cv_stl_type_sgi,
-    [
-      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_type_sgi=yes,
-   kde_cv_stl_type_sgi=no)
-])
-
-   AC_MSG_RESULT($kde_cv_stl_type_sgi)
-
-   if test "$kde_cv_stl_type_sgi" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   fi
-])
-
-AC_DEFUN(KDE_CHECK_STL_HP,
-[
-    AC_MSG_CHECKING([if STL implementation is HP like])
-    AC_CACHE_VAL(kde_cv_stl_type_hp,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hello World";
-  astring.remove(0, 6); // now astring is "World"
-  return 0;
-], kde_cv_stl_type_hp=yes,
-   kde_cv_stl_type_hp=no)
-])
-   AC_MSG_RESULT($kde_cv_stl_type_hp)
-
-   if test "$kde_cv_stl_type_hp" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
-   fi
-])
-
-AC_DEFUN(KDE_CHECK_STL,
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-    KDE_CHECK_STL_SGI
-
-    if test "$kde_cv_stl_type_sgi" = "no"; then
-       KDE_CHECK_STL_HP
-
-       if test "$kde_cv_stl_type_hp" = "no"; then
-         AC_MSG_ERROR("no known STL type found")
-       fi
-    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(KDE_CHECK_ANSI,
-[
-])
-
-AC_DEFUN(KDE_CHECK_INSURE,
-[
-  AC_ARG_ENABLE(insure, [  --enable-insure             use insure++ for debugging [default=no]],
-  [
-  if test $enableval = "no"; dnl
-	then ac_use_insure="no"
-	else ac_use_insure="yes"
-   fi
-  ], [ac_use_insure="no"])
-
-  AC_MSG_CHECKING(if we will use Insure++ to debug)
-  AC_MSG_RESULT($ac_use_insure)
-  if test "$ac_use_insure" = "yes"; dnl
-       then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "????
-   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
-
-if test -s $srcdir/inst-apps; then
-  ac_topsubdirs="`cat $srcdir/inst-apps`"
-else
-  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)
-  if test $install_it = "yes"; then
-    TOPSUBDIRS="$TOPSUBDIRS $i"
-  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
-])
-
-AC_DEFUN(KDE_CHECK_NEWLIBS,
-[
-
-])
-
-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_LANG_SAVE
-AC_LANG_C
-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_LANG_RESTORE
-])
-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
-])
-
-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,
-[
-AC_LANG_C
-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] )
-])
-
-dnl -------------------------------------------------------------------------
-dnl See if the compiler supports a template repository         bero@redhat.de
-dnl -------------------------------------------------------------------------
-AC_DEFUN(KDE_COMPILER_REPO,
-[
-  REPO=""
-  NOREPO=""
-
-  KDE_CHECK_COMPILER_FLAG(frepo,
-   [
-     REPO="-frepo"
-     NOREPO="-fno-repo"
-   ])
-
-  if test -z "$REPO"; then
-  KDE_CHECK_COMPILER_FLAG(instances=explicit,
-  [
-     REPO="-instances=explicit"
-     NOREPO="-instances=extern"
-  ])
-  fi
-
-  if test -n "$REPO"; then
-     AC_DEFINE_UNQUOTED(HAVE_TEMPLATE_REPOSITORY, 1,
-		[C++ compiler supports template repository])
-     $1
-  fi
-
-  AC_SUBST(REPO)
-  AC_SUBST(NOREPO)
-])
-
-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)
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN(KDE_CHECK_QWSPRITEFIELD,
-[
-  KDE_CHECK_HEADER(QwSpriteField.h, ,
-  [
-    AC_MSG_WARN([you don't have QwSpriteField.h somewhere. Please install
-       QwSpriteField out of kdesupport.])
-      $1
-  ])
-])
-
-AC_DEFUN(KDE_FAST_CONFIGURE,
-[
-  dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, [  --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
-  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_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_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries"
-     case $host_os in
-      aix*) LIBS="-brtl $LIBS"
-	test "$GCC" = yes && LIBS="-Wl,$LIBS"
-	;;
-     esac
-     AC_CHECK_LIB($1, $2, $3, $4, $5)
-     LIBS="$kde_save_LIBS"
-])
-
-
-
-
-AC_DEFUN(KDE_CHECK_INITGROUPS,
-[ 
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS(initgroups)
-  if test "x$ac_cv_func_initgroups" = "xyes"; then
-    case $host_os in
-      aix*) AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-            AC_MSG_CHECKING([for initgroups prototype])
-            AC_CACHE_VAL(kde_cv_check_initgroups_proto,
-            [ AC_TRY_COMPILE(
-              [ #include <grp.h>
-              ],
-              [ char buffer[10];
-                gid_t id;
-                int x = initgroups(buffer,id);
-              ],
-              kde_cv_check_initgroups_proto=yes,
-              kde_cv_check_initgroups_proto=no)
-            ])
-            AC_MSG_RESULT($kde_cv_check_initgroups_proto)
-            AC_LANG_RESTORE
-            ;;
-      *)
-            kde_cv_check_initgroups_proto=yes
-            ;;
-    esac
-  else
-    kde_cv_check_initgroups_proto=no
-  fi
-  if test "x$kde_cv_check_initgroups_proto" = "xyes"; then
-    kde_check_initgroups_proto=1
-  else
-    kde_check_initgroups_proto=0
-  fi
-  AC_DEFINE_UNQUOTED(HAVE_INITGROUPS_PROTO,$kde_check_initgroups_proto,
-           [initgroups may exist but not its prototype (e.g. AIX<4.3.3:8)])
-])
-
-
-AC_DEFUN(KDE_CHECK_JAVA_DIR,
-[
-AC_MSG_CHECKING([for Java directory])
-
-AC_ARG_WITH(java,
-[  --with-java=javadir     use java installed in javadir, --without-java disables ],
-[  ac_java_dir=$withval
-], ac_java_dir=""
-)
-
-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_cv_java_bindir=no
-   kde_cv_java_includedir=no
-   kde_cv_java_libjvmdir=no
-   kde_cv_java_libhpidir=no
-else
-  if test "x$ac_java_dir" = x; then
-    dnl No option set -> look in $PATH
-    AC_CACHE_VAL(kde_cv_java_bindir,
-    [
-      dnl First look for javac in $PATH. If not found we'll look at the option.
-      KDE_FIND_PATH(javac, JAVAC, [], [])
-      if test -n "$JAVAC"; then
-          kde_cv_java_bindir=`echo $JAVAC | sed -e 's,/javac$,/,'`
-          dnl this substitution might not work - well, we test for jni.h below
-          kde_cv_java_includedir=`echo $kde_cv_java_bindir | sed -e 's,bin/$,include/,'`
-      else
-          kde_cv_java_bindir=no
-      fi
-    ])
-  else
-    dnl config option set
-    kde_cv_java_bindir=$ac_java_dir/bin
-    kde_cv_java_includedir=$ac_java_dir/include
-  fi
-fi
-
-dnl Look for libjvm.so
-kde_cv_java_libjvmdir=`find $kde_cv_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-dnl Look for libhpi.so and avoid green threads
-kde_cv_java_libhpidir=`find $kde_cv_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,'`
-
-dnl At this point kde_cv_java_bindir and kde_cv_java_includedir are either set or "no"
-if test ! "x$kde_cv_java_bindir" = xno; then
-
-  dnl Now check everything's fine under there
-
-  if test ! -x "$kde_cv_java_bindir/javac"; then
-    AC_MSG_ERROR([javac not found under $kde_cv_java_bindir - it seems you passed a wrong --with-java.])
-  fi
-  if test ! -x "$kde_cv_java_bindir/javah"; then
-    AC_MSG_ERROR([javah not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-  if test ! -x "$kde_cv_java_bindir/jar"; then
-    AC_MSG_ERROR([jar not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_includedir/jni.h"; then
-    AC_MSG_ERROR([jni.h not found under $kde_cv_java_includedir. Use --with-java or --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_libjvmdir/libjvm.so"; then
-    AC_MSG_ERROR([libjvm.so not found under $kde_cv_java_libjvmdir. Use --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_libhpidir/libhpi.so"; then
-    AC_MSG_ERROR([libhpi.so not found under $kde_cv_java_libhpidir. Use --without-java.])
-  fi
-
-  jni_includes="-I$kde_cv_java_includedir"
-  dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-  dnl and under linux here..
-  test -d "$kde_cv_java_includedir/linux" && jni_includes="$jni_includes -I$kde_cv_java_includedir/linux"
-  test -d "$kde_cv_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_cv_java_includedir/genunix"
-
-  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
-	    ],[ 
-	    ],[ AC_MSG_ERROR([Incorrect version of $kde_cv_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 ])
-	    ])
-
-  CXXFLAGS="$ac_cxxflags_safe"    
-  AC_LANG_RESTORE
-
-  dnl All tests ok, inform and subst the variables
-  AC_MSG_RESULT([javac/javah/jar in $kde_cv_java_bindir, jni.h in $kde_cv_java_includedir])
-
-  JAVAC=$kde_cv_java_bindir/javac
-  AC_SUBST(JAVAC)
-  JAVAH=$kde_cv_java_bindir/javah
-  AC_SUBST(JAVAH)
-  JAR=$kde_cv_java_bindir/jar
-  AC_SUBST(JAR)
-  AC_SUBST(jni_includes)
-  JVMLIBS="-L$kde_cv_java_libjvmdir -ljvm -L$kde_cv_java_libhpidir -lhpi"
-  AC_SUBST(JVMLIBS)
-fi
-])
-## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-## 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 46 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 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_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)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
-
-# 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_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# 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_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# 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_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# 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_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-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_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  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*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-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_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # 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-gnu*)
-  case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | m68k* | arm* | mips* | hppa* | sh* )
-    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='file_magic NetBSD/[a-z0-9]* demand paged shared library']
-  else
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
-  fi
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-  ;;
-
-openbsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
-    i*86 )
-      changequote(,)dnl
-      lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
-      changequote([, ])dnl
-      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
-  ;;
-
-newsos6)
-  [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
-  ;;
-
-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
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  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*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL 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
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-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])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl 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])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-##	-*- 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/kde2"
-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])
-])
-
diff --git a/bibletime-doc/aclocal.m4 b/bibletime-doc/aclocal.m4
deleted file mode 100644
index 1c941c6..0000000
--- a/bibletime-doc/aclocal.m4
+++ /dev/null
@@ -1,5278 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-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    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. If you decide that you
-dnl really want to modify it, contact coolo@kde.org mentioning that you have
-dnl and that the modified file should be committed to every module.
-dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
-
-dnl ------------------------------------------------------------------------
-dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
-dnl thanks to Raja R Harinath.
-dnl ------------------------------------------------------------------------
-dnl
-ifdef([_AC_PATH_X_DIRECT],[],
-   [AC_DEFUN([_AC_PATH_X_DIRECT],[AC_PATH_X_DIRECT])])
-ifdef([_AC_PATH_X_XMKMF],[],
-   [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])])
-
-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.
-])
-])
-
-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,
-[
-   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, [$qt_bindirs], [UIC=""])
-     if test -z "$UIC" ; then
-       KDE_UIC_ERROR_MESSAGE
-       exit 1
-     fi
-   else
-     UIC="echo uic not available: "
-   fi
-
-   AC_SUBST(MOC)
-   AC_SUBST(UIC)
-])
-
-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_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_result=$1"
-])
-
-AC_DEFUN(KDE_SET_DEFAULT_PATHS,
-[
-if test "$1" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${prefix}/share/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${prefix}/share/config'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${prefix}/share/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${prefix}/share/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
-  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_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 "$kde_have_all_paths" != "yes"; 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_SUBST_PROGRAMS,
-[
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde2/bin /usr/kde/bin /usr/local/kde/bin"
-        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)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
-        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-      
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde2/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)'
-        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)
-
-        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_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-  kde_have_all_paths=
-  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_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(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
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN(KDE_MISC_TESTS,
-[
-   AC_LANG_C
-   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_LANG_C
-   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"))
-   
-   # Solaris 2.6 and others need -lresolv for res_init
-   AC_CHECK_FUNCS(res_init, , [
-     kde_libs_safe="$LIBS"
-     LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-     AC_TRY_LINK(
-[
-#include <resolv.h>
-],
-[ 
-res_init(); 
-],
-        LIBRESOLV="-lresolv"
-        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-        AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-     )
-     LIBS=$kde_libs_safe
-   ])
-
-   LIBSOCKET="$X_EXTRA_LIBS"
-   AC_SUBST(LIBSOCKET)
-   AC_SUBST(LIBRESOLV)
-   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
-])
-
-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([AC_PROG_CPP])dnl
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_MSG_CHECKING(for X)
-AC_LANG_SAVE
-AC_LANG_C
-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
-
-_AC_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"
-  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"
-
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_libraries)
-AC_SUBST(x_includes)
-
-# 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)
-AC_SUBST(LIBSM)
-LDFLAGS="$ac_save_LDFLAGS"
-
-AC_SUBST(X_PRE_LIBS)
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-AC_SUBST(LIB_X11)
-
-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
-
-AC_MSG_CHECKING(for Xinerama)
-
- AC_ARG_WITH(xinerama,
-  [  --with-xinerama         enable support for Xinerama ],
-  [
-    no_xinerama=no
-  ], [
-    no_xinerama=yes
-  ]
-)
-
-kde_save_LDFLAGS="$LDFLAGS"
-kde_save_CFLAGS="$CFLAGS"
-kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
-
-if test "x$no_xinerama" = "xno"; then
-
-  AC_CACHE_VAL(ac_cv_have_xinerama,
-  [
-	  AC_TRY_LINK([#include <X11/Xlib.h>
-  			#include <X11/extensions/Xinerama.h>],
-	  	  [XineramaIsActive(NULL);],
-		  [ac_cv_have_xinerama="yes"],
-		  [ac_cv_have_xinerama="no"])
-  ])
-else
-  ac_cv_have_xinerama=no;
-fi
-
-AC_MSG_RESULT($ac_cv_have_xinerama)
-
-LIBXINERAMA=""
-
-if test "$ac_cv_have_xinerama" = "yes"; then
-  AC_DEFINE(HAVE_XINERAMA, 1, [Define if you want Xinerama support])
-  LIBXINERAMA="-lXinerama"
-fi
-
-AC_SUBST(LIBXINERAMA)
-
-LDFLAGS="$kde_save_LDFLAGS"
-CFLAGS="$kde_save_CFLAGS"
-LIBS="$kde_save_LIBS"
-
-AC_LANG_RESTORE
-
-])
-
-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
-#include <qiconview.h>
-EOF
-fi
-
-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();
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
-EOF
-fi
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-EOF
-])
-
-AC_DEFUN(KDE_USE_QT,
-[
-
-if test -z "$1"; then
-  kde_qtver=2
-  kde_qtsubver=1
-else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9]\+\.\([0-9]\+\).*#\1#'`
-  # following is the check if subversion isn�t found in passed argument
-  if test "$kde_qtsubver" = "$1"; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "$1" | sed -e 's#^\([0-9]\+\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  else
-   # this is the version number fallback to 2.1, unless major version is 1 or 2
-   if test "$kde_qtver" != "2"; then
-    kde_qtver=2
-    kde_qtsubver=1
-   fi
-  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
-  else
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion=$2
-fi
-
-if test -z "$3"; then
-   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
-   else
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-  fi
-else
-   kde_qt_verstring=$3
-fi
-
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-else
-   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"
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-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])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
-  mt,
-  [  --enable-mt             link to threaded Qt (experimental)],
-  kde_use_qt_mt=$enableval,
-  kde_use_qt_mt=no
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-
-  case $host in
-  *-*-linux-*)
-    if test "x$GCC" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread"
-      X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-    else
-      AC_MSG_WARN([Compiler is not gcc. MT support disabled.])
-    fi
-    ;;
-  *)
-    AC_MSG_WARN([MT not yet supported on $host - disabled.])
-    ;;
-  esac
-
-fi
-
-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
-
-  LIBQT_GLOB="libqt.*"
-
-fi
-
-if test -z "$LIBQT"; then
-
-  LIBQT="-lqt"
-  kde_int_qt="-lqt"
-
-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
-
-      case $host in
-      *-*-linux-*)
-        if test "x$GCC" = "xyes"; then
-          LIBQT="-lqt-mt"
-          kde_int_qt="-lqt-mt"
-          LIBQT_GLOB="libqt-mt.*"
-          USING_QT_MT="using -mt"
-        fi
-      ;;
-      esac
-  fi
-
-  kde_qt_was_given=no
-
-else
-  kde_int_qt="$LIBQT"
-fi
-
-if test $kde_qtver = 2; then
-
-  AC_REQUIRE([AC_FIND_PNG])
-  AC_REQUIRE([AC_FIND_JPEG])
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
-    [  --with-qt-dir=DIR       where the root of Qt is installed ],
-    [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib
-       ac_qt_bindir="$withval"/bin
-    ])
-
-AC_ARG_WITH(qt-includes,
-    [  --with-qt-includes=DIR  where the Qt includes are. ],
-    [
-       ac_qt_includes="$withval"
-    ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
-    [  --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 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" = "2"; 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 $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
-
-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"
-LIBS="$LIBS $LIBQT"
-
-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=""
-  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
-    ac_qt_notfound="(libraries)";
-  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.])
-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"; 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
-
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
-
-LIB_QT="$kde_int_qt "'$(LIBPNG) $(LIBJPEG) -lXext $(LIB_X11) $(LIBSM)'
-AC_SUBST(LIB_QT)
-
-])
-
-AC_DEFUN(AC_PATH_QT,
-[
-AC_PATH_QT_1_3
-])
-
-AC_DEFUN(KDE_CHECK_FINAL,
-[
-  AC_ARG_ENABLE(final, [  --enable-final          build size optimized apps (experimental - needs lots of memory)],
-	kde_use_final=$enableval, kde_use_final=no)
-
-  KDE_COMPILER_REPO
-  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_ARG_ENABLE(closure, [  --disable-closure       don't delay template instantiation],
-  	kde_use_closure=$enableval, kde_use_closure=yes)
-
-  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=""
-  fi
-  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-])
-
-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_PREREQ([2.13])
-AC_REQUIRE([AC_PATH_QT])dnl
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${prefix}" != NONE; then
-  kde_includes=${prefix}/include
-  ac_kde_includes=$prefix/include
-
-  if test "${exec_prefix}" != NONE; then
-    kde_libraries=${exec_prefix}/lib
-    ac_kde_libraries=$exec_prefix/lib
-  else
-    kde_libraries=${prefix}/lib
-    ac_kde_libraries=$prefix/lib
-  fi
-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/kde2/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 /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-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
-ac_kde_libraries="$kde_libdir"
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = 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="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
-
-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_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)
-
-AC_SUBST(AUTODIRS)
-])
-
-AC_DEFUN(KDE_CHECK_EXTRA_LIBS,
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes, [  --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, [  --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");
-    return 0;
-    }
-EOF
-
- ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- 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
-
-  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
- kde_cxxflags_safe="$CXXFLAGS"
-])
-
-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_CHECK_KIMGIO,
-[
-   AC_REQUIRE([AC_BASE_PATH_KDE])
-   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-   AC_REQUIRE([AC_FIND_TIFF])
-   AC_REQUIRE([AC_FIND_JPEG])
-   AC_REQUIRE([AC_FIND_PNG])
-   AC_REQUIRE([KDE_CREATE_LIBS_ALIASES])
-
-   if test "$1" = "existance"; then
-     AC_LANG_SAVE
-     AC_LANG_CPLUSPLUS
-     kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries $LIBJPEG $LIBTIFF $LIBPNG $LIBQT -lm"
-     AC_CHECK_LIB(kimgio, kimgioRegister, [
-      LIBKIMGIO_EXISTS=yes],LIBKIMGIO_EXISTS=no)
-      LIBS="$kde_save_LIBS"
-      AC_LANG_RESTORE
-   else
-      LIBKIMGIO_EXISTS=yes
-   fi
-
-   if test "$LIBKIMGIO_EXISTS" = "yes"; then
-     LIB_KIMGIO='-lkimgio'
-   else
-     LIB_KIMGIO=''
-   fi
-   AC_SUBST(LIB_KIMGIO)
-])
-
-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 = 2; then
-   LIB_KDECORE='-lkdecore'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFORMULA='-lkformula'
-   AC_SUBST(LIB_KFORMULA)
-   LIB_KIO='-lkio'
-   AC_SUBST(LIB_KIO)
-   LIB_KSYCOCA='-lksycoca'
-   AC_SUBST(LIB_KSYCOCA)
-   LIB_SMB='-lsmb'
-   AC_SUBST(LIB_SMB)
-   LIB_KFILE='-lkfile'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab'
-   AC_SUBST(LIB_KAB)
-   LIB_KHTML='-lkhtml'
-   AC_SUBST(LIB_KHTML)
-   LIB_KSPELL='-lkspell'
-   AC_SUBST(LIB_KSPELL)
-   LIB_KPARTS='-lkparts'
-   AC_SUBST(LIB_KPARTS)
-   LIB_KWRITE='-lkwrite'
-   AC_SUBST(LIB_KWRITE)
-else
-   LIB_KDECORE='-lkdecore -lXext $(LIB_QT)'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui $(LIB_KDECORE)'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFM='-lkfm $(LIB_KDECORE)'
-   AC_SUBST(LIB_KFM)
-   LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)'
-   AC_SUBST(LIB_KAB)
-fi
-])
-
-AC_DEFUN(AC_PATH_KDE,
-[
-  AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check, [  --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 obsolete
-AC_DEFUN(AC_CHECK_SETENV,
-[
-   AC_OBSOLETE([$0], [; instead use AC_CHECK_FUNCS([setenv unsetenv])])dnl 
-   AC_CHECK_FUNCS([setenv unsetenv])
-])
-
-AC_DEFUN(AC_CHECK_GETDOMAINNAME,
-[
-AC_MSG_CHECKING(for getdomainname)
-AC_CACHE_VAL(ac_cv_func_getdomainname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-char buffer[200];
-getdomainname(buffer, 200);
-],
-ac_cv_func_getdomainname=yes,
-ac_cv_func_getdomainname=no)
-CXXFLAGS="$save_CXXFLAGS"
-LIBS=$kde_safe_LIBS
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_getdomainname)
-
-AC_MSG_CHECKING([if getdomainname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_getdomainname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  ac_cv_proto_getdomainname=no
-else
-  kde_safe_libs=$LIBS
-  LIBS="$LIBS $X_EXTRA_LIBS"
-  AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-
-extern "C" int getdomainname (char *, int);
-],
-[
-char buffer[200];
-getdomainname(buffer, 200);
-],
-  ac_cv_func_getdomainname=yes
-  ac_cv_proto_getdomainname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR([getdomainname unavailable]))
-fi
-LIBS=$kde_safe_libs
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_proto_getdomainname)
-
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME, 1, [Define if you have getdomainname])
-fi
-if eval "test \"`echo $ac_cv_proto_getdomainname`\" = no"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME_PROTO, 1,
-  [Define if you have getdomainname prototype])
-fi
-
-])
-
-AC_DEFUN(AC_CHECK_GETHOSTNAME,
-[
-
-AC_MSG_CHECKING([for gethostname])
-AC_CACHE_VAL(ac_cv_func_gethostname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-char buffer[200];
-gethostname(buffer, 200);
-],
-ac_cv_func_gethostname=yes,
-ac_cv_func_gethostname=no)
-CXXFLAGS="$save_CXXFLAGS"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_gethostname)
-
-AC_MSG_CHECKING([if gethostname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_gethostname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  ac_cv_proto_gethostname=no
-else
-  AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-
-extern "C" int gethostname (char *, int);
-],
-[
-char buffer[200];
-gethostname(buffer, 200);
-],
-  ac_cv_func_gethostname=yes
-  ac_cv_proto_gethostname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR(gethostname unavailable))
-fi
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_proto_gethostname)
-
-if eval "test \"`echo $ac_cv_proto_gethostname`\" = no"; then
-  AC_DEFINE(HAVE_GETHOSTNAME_PROTO, 1,
-  [Define if you have gethostname prototype])
-fi
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  AC_DEFINE(HAVE_GETHOSTNAME, 1, [Define if you have gethostname])
-fi
-])
-
-AC_DEFUN(AC_CHECK_USLEEP,
-[
-AC_MSG_CHECKING([for usleep])
-AC_CACHE_VAL(ac_cv_func_usleep,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-usleep(200);
-],
-ac_cv_func_usleep=yes,
-ac_cv_func_usleep=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_usleep)
-if eval "test \"`echo $ac_cv_func_usleep`\" = yes"; then
-  AC_DEFINE(HAVE_USLEEP, 1, [Define if you have the usleep function])
-fi
-])
-
-AC_DEFUN(AC_CHECK_RANDOM,
-[
-AC_MSG_CHECKING([for random])
-AC_CACHE_VAL(ac_cv_func_random,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
-],
-[
-random();
-],
-ac_cv_func_random=yes,
-ac_cv_func_random=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_random)
-if eval "test \"`echo $ac_cv_func_random`\" = yes"; then
-  AC_DEFINE(HAVE_RANDOM, 1, [Define if you have random])
-fi
-])
-
-AC_DEFUN(AC_FIND_GIF,
-   [AC_MSG_CHECKING([for giflib])
-AC_CACHE_VAL(ac_cv_lib_gif,
-[ac_save_LIBS="$LIBS"
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-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_LANG_C
-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="/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)
-])
-
-AC_DEFUN(AC_FIND_ZLIB,
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-AC_LANG_C
-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>
-],
-            [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_SUBST(LIBZ)
-  AC_MSG_RESULT($ac_cv_lib_z)
-else
-  AC_MSG_ERROR(not found. Check your installation and look into config.log)
-  LIBZ=""
-  AC_SUBST(LIBZ)
-fi
-])
-
-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"
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-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"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_LANG_C
-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_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,
-[
-dnl AC_REQUIRE([AC_CHECK_COMPILERS]) <- breaks with autoconf 2.50
-AC_MSG_CHECKING(whether $CXX supports -$1)
-kde_cache=`echo $1 | sed 'y%.=/+-%___p_%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -$1 -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -$1 -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-])
-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
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-])
-
-AC_DEFUN(AC_CHECK_COMPILERS,
-[
-  AC_ARG_ENABLE(debug,[  --enable-debug          enables debug symbols [default=no]],
-  [
-   if test $enableval = "no"; dnl
-     then
-       kde_use_debug_code="no"
-       kde_use_debug_define=yes
-     else
-       kde_use_debug_code="yes"
-       kde_use_debug_define=no
-   fi
-  ], 
-    [kde_use_debug_code="no"
-      kde_use_debug_define=no
-  ])
-
-  dnl Just for configure --help
-  AC_ARG_ENABLE(dummyoption,[  --disable-debug         disables debug output and debug symbols [default=no]],[],[])
-
-  AC_ARG_ENABLE(strict,[  --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(profile,[  --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 
-
-  if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CFLAGS="-g -O2 $CFLAGS"
-      case $host in
-        *-*-linux-gnu)	
-          CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-        ;;
-      esac
-    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"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $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"])
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      case $host in  dnl
-      *-*-linux-gnu)
-        CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS"
-        ;;
-      esac
-
-      if test "$kde_use_strict_options" = "yes"; then
-        CXXFLAGS="-Wcast-qual -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
-      fi
-
-      if test "$kde_very_strict" = "yes"; then
-        CXXFLAGS="-Wold-style-cast -Wredundant-decls -Wconversion $CXXFLAGS"
-      fi
-    else
-      CXXFLAGS="-O2 $CXXFLAGS"
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG $CXXFLAGS"
-  fi  
-
-  if test "$kde_use_profiling" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(pg,
-    [
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-    ])
-  fi
-    
-  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(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-  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
-
-  # the following is to allow programs, that are known to
-  # have problems when compiled with -O2
-  if test -n "$CXXFLAGS"; then
-      kde_safe_IFS=$IFS
-      IFS=" "
-      NOOPT_CXXFLAGS=""
-      for i in $CXXFLAGS; do
-        case $i in
-          -O*)
-                ;;
-          *)
-                NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS $i"
-                ;;
-        esac
-      done
-      IFS=$kde_safe_IFS
-  fi
-
-  AC_SUBST(NOOPT_CXXFLAGS)
-
-  KDE_CHECK_FINAL
-
-  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-
-  KDE_CXXFLAGS=
-  AC_SUBST(KDE_CXXFLAGS)
-])
-
-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_LANG_SAVE
-AC_LANG_C
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_RESTORE
-
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
-AC_SUBST(KDE_PLUGIN)
-
-AC_ARG_ENABLE(objprelink, [  --enable-objprelink     prelink apps using objprelink (experimental [only tested on linux/386])],
-       kde_use_objprelink=$enableval, kde_use_objprelink=no)
-  if test "x$kde_use_objprelink" = "xyes"; then 
-
-      KDE_FIND_PATH(objprelink, OBJPRELINK, [], [kde_use_objprelink=no])   
-     
-      if test "x$kde_use_objprelink" = "xyes"; then
-      AC_MSG_CHECKING([Patching libtool to run objprelink.])
-      mv libtool libtool.orig
-      cat > libtool <<\EOF
-#! /bin/sh
-for n ; do case $n in
-  *.o)  test -r $n && echo objprelink $n && objprelink $n ;;
-  *.lo) m=`basename $n .lo`".o" && test -r $m && echo objprelink $m && objprelink $m 
-        m=".libs/$m" && test -r $m && echo objprelink $m && objprelink $m ;;
-esac; done
-EOF
-      cat >> libtool libtool.orig
-      rm libtool.orig
-      chmod a+x libtool
-      AC_MSG_RESULT(done)
-	fi
-  fi
-])
-
-AC_DEFUN(KDE_CHECK_TYPES,
-[  AC_CHECK_SIZEOF(int, 4)dnl
-  AC_CHECK_SIZEOF(long, 4)dnl
-  AC_CHECK_SIZEOF(char *, 4)dnl
-  AC_CHECK_SIZEOF(char, 1)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,
-      [  --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
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
-  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_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([argz.h limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv 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="-Wmissing-prototypes -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, [  --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_LANG_C
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-    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, [  --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,
-   [
-    AC_LANG_C
-    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"
-   ])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_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, [  --without-gl            disable 3D GL modes],
-	gl_test=$withval, gl_test="yes")
- if 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_C
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET"
-    CFLAGS="$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 -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET"
-      CFLAGS="$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
-    LDFLAGS="$ac_save_ldflags"
-    CFLAGS="$ac_save_cflags"
-   ])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='-lMesaGL -lMesaGLU $(LIB_X11)'
-       else
-          GLLIB='-lGL -lGLU $(LIB_X11)'
-       fi
-    else
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)'
-       else
-          GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(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])
-
-  AC_ARG_WITH(pam,
-    [  --with-pam[=ARG]        enable support for PAM: ARG=[yes|no|service name]],
-    [ if test "x$withval" = "xyes"; then
-        use_pam=yes
-        pam_service=kde
-      elif test "x$withval" = "xno"; then
-        use_pam=no
-      else
-        use_pam=yes
-        pam_service=$withval
-      fi
-      ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-    ], [
-      AC_CACHE_VAL(ac_cv_path_pam,
-        [ use_pam=no
-          AC_CHECK_LIB(pam, pam_start,
-            [ AC_CHECK_HEADER(security/pam_appl.h, 
-                [ use_pam=yes
-                  pam_service=kde ]) 
-            ], , $LIBDL)
-          ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-        ])
-    ])
-  eval "$ac_cv_path_pam"
-
-  AC_MSG_CHECKING(for PAM)
-  if test "x$use_pam" = xno; then
-    AC_MSG_RESULT(no)
-    PAMLIBS=""
-  else
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-    PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-
-    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], security/pam_appl.h,
-      [ AC_EGREP_HEADER([const struct pam_message], security/pam_appl.h,
-                        [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
-
-  AC_SUBST(PAMLIBS)
-])
-
-dnl DEF_PAM_SERVICE(arg name, full name, define name)
-AC_DEFUN(DEF_PAM_SERVICE, [
-  AC_ARG_WITH($1-pam,
-    [  --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,
-    [  --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
-
-  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,
-[  --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_MICO,
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_MISC_TESTS])
-AC_MSG_CHECKING(for MICO)
-
-if test -z "$MICODIR"; then
-    kde_micodir=/usr/local
- else
-    kde_micodir="$MICODIR"
-fi
-
-AC_ARG_WITH(micodir,
-  [  --with-micodir=micodir  where mico is installed ],
-  kde_micodir=$withval,
-  kde_micodir=$kde_micodir
-)
-
-AC_CACHE_VAL(kde_cv_mico_incdir,
-[
-  mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes"
-AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir)
-
-])
-kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'`
-
-if test ! -r  $kde_micodir/include/CORBA.h; then
-  AC_MSG_ERROR([No CORBA.h found, specify another micodir])
-fi
-
-AC_MSG_RESULT($kde_micodir)
-
-MICO_INCLUDES=-I$kde_micodir/include
-AC_SUBST(MICO_INCLUDES)
-MICO_LDFLAGS=-L$kde_micodir/lib
-AC_SUBST(MICO_LDFLAGS)
-micodir=$kde_micodir
-AC_SUBST(micodir)
-
-AC_MSG_CHECKING([for MICO version])
-AC_CACHE_VAL(kde_cv_mico_version,
-[
-AC_LANG_C
-cat >conftest.$ac_ext <<EOF
-#include <stdio.h>
-#include <mico/version.h>
-int main() {
-
-   printf("MICO_VERSION=%s\n",MICO_VERSION);
-   return (0);
-}
-EOF
-ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest'
-if AC_TRY_EVAL(ac_compile); then
-  if eval `./conftest 2>&5`; then
-    kde_cv_mico_version=$MICO_VERSION
-  else
-    AC_MSG_ERROR([your system is not able to execute a small application to
-    find MICO version! Check $kde_micodir/include/mico/version.h])
-  fi
-else
-  AC_MSG_ERROR([your system is not able to compile a small application to
-  find MICO version! Check $kde_micodir/include/mico/version.h])
-fi
-])
-
-dnl installed MICO version
-mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "x$1" = "x"; then
- req_version="2.3.0"
-else
- req_version=$1
-fi
-
-dnl required MICO version
-req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "$mico_v_maj" -lt "$req_v_maj" || \
-   ( test "$mico_v_maj" -eq "$req_v_maj" && \
-        test "$mico_v_mid" -lt "$req_v_mid" ) || \
-   ( test "$mico_v_mid" -eq "$req_v_mid" && \
-        test "$mico_v_min" -lt "$req_v_min" )
-
-then
-  AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \
-at least is required. You should upgrade MICO.])
-else
-  AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)])
-fi
-
-LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL"
-AC_SUBST(LIBMICO)
-if test -z "$IDL"; then
-  IDL='$(kde_bindir)/cuteidl'
-fi
-AC_SUBST(IDL)
-IDL_DEPENDENCIES='$(kde_includes)/CUTE.h'
-AC_SUBST(IDL_DEPENDENCIES)
-
-idldir="\$(includedir)/idl"
-AC_SUBST(idldir)
-
-])
-
-AC_DEFUN(KDE_CHECK_MINI_STL,
-[
-AC_REQUIRE([KDE_CHECK_MICO])
-
-AC_MSG_CHECKING(if we use mico's mini-STL)
-AC_CACHE_VAL(kde_cv_have_mini_stl,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_cxxflags="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $MICO_INCLUDES"
-AC_TRY_COMPILE(
-[
-#include <mico/config.h>
-],
-[
-#ifdef HAVE_MINI_STL
-#error "nothing"
-#endif
-],
-kde_cv_have_mini_stl=no,
-kde_cv_have_mini_stl=yes)
-CXXFLAGS="$kde_save_cxxflags"
-AC_LANG_RESTORE
-])
-
-if test "x$kde_cv_have_mini_stl" = "xyes"; then
-   AC_MSG_RESULT(yes)
-   $1
-else
-   AC_MSG_RESULT(no)
-   $2
-fi
-])
-
-])
-
-
-AC_DEFUN(KDE_CHECK_LIBPTHREAD,
-[
-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
-[
-    AC_ARG_ENABLE(kernel-threads, [  --enable-kernel-threads Enable the use of the LinuxThreads port on FreeBSD/i386 only.],
-	kde_use_kernthreads=$enableval, kde_use_kernthreads=no)
-
-    if test "$kde_use_kernthreads" = "yes"; then
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_CFLAGS="$CXXFLAGS"
-      CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
-      CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
-      AC_CHECK_HEADERS(pthread/linuxthreads/pthread.h)
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      CFLAGS="$ac_save_CFLAGS"
-      if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
-        kde_use_kernthreads=no
-      else
-        dnl Add proper -I and -l statements
-        AC_CHECK_LIB(lthread, pthread_join, [LIBPTHREAD="-llthread -llgcc_r"]) dnl for FreeBSD
-        if test "x$LIBPTHREAD" = "x"; then
-          kde_use_kernthreads=no
-        else
-          USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
-        fi
-      fi
-    else 
-      USE_THREADS=""
-      if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-pthread"] )
-      fi
-    fi
-
-    case $host_os in
- 	solaris*)
-		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
-                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-                echo "Setting Solaris pthread compilation options"
-    		;;
-        freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                echo "Setting FreeBSD pthread compilation options"
-                ;;
-        aix*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                LIBPTHREAD="$LIBPTHREAD -lc_r"
-                echo "Setting AIX pthread compilation options"
-                ;;
-        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                USE_THREADS="$USE_THREADS -DPIC -fPIC"
-                echo "Setting Linux pthread compilation options"
-                ;;
-	*)
-		;;
-    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
-    kde_check_threading_default=no
-  else
-    kde_check_threading_default=yes
-  fi
-  AC_ARG_ENABLE(threading, [  --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,
-[
-AC_LANG_SAVE
-AC_LANG_C
-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
-AC_LANG_RESTORE
-
-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,
-[  --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 /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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
-
-PYTHONLIB=-L$python_libdir
-kde_orig_LIBPYTHON=$LIBPYTHON
-if test -z "$LIBPYTHON"; then
-  LIBPYTHON=-lpython$version
-fi
-
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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(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(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
-	[AC_MSG_WARN([it seems, Python depends on another library.
-    Pleae use \"make LIBPYTHON='-lpython$version -lotherlib'\" 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.1", [KDE_CHECK_PYTHON_INTERN("2.0",
-        [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
-  ])
-])
-
-AC_DEFUN(KDE_CHECK_STL_SGI,
-[
-    AC_MSG_CHECKING([if STL implementation is SGI like])
-    AC_CACHE_VAL(kde_cv_stl_type_sgi,
-    [
-      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_type_sgi=yes,
-   kde_cv_stl_type_sgi=no)
-])
-
-   AC_MSG_RESULT($kde_cv_stl_type_sgi)
-
-   if test "$kde_cv_stl_type_sgi" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   fi
-])
-
-AC_DEFUN(KDE_CHECK_STL_HP,
-[
-    AC_MSG_CHECKING([if STL implementation is HP like])
-    AC_CACHE_VAL(kde_cv_stl_type_hp,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hello World";
-  astring.remove(0, 6); // now astring is "World"
-  return 0;
-], kde_cv_stl_type_hp=yes,
-   kde_cv_stl_type_hp=no)
-])
-   AC_MSG_RESULT($kde_cv_stl_type_hp)
-
-   if test "$kde_cv_stl_type_hp" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
-   fi
-])
-
-AC_DEFUN(KDE_CHECK_STL,
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-    KDE_CHECK_STL_SGI
-
-    if test "$kde_cv_stl_type_sgi" = "no"; then
-       KDE_CHECK_STL_HP
-
-       if test "$kde_cv_stl_type_hp" = "no"; then
-         AC_MSG_ERROR("no known STL type found")
-       fi
-    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(KDE_CHECK_ANSI,
-[
-])
-
-AC_DEFUN(KDE_CHECK_INSURE,
-[
-  AC_ARG_ENABLE(insure, [  --enable-insure             use insure++ for debugging [default=no]],
-  [
-  if test $enableval = "no"; dnl
-	then ac_use_insure="no"
-	else ac_use_insure="yes"
-   fi
-  ], [ac_use_insure="no"])
-
-  AC_MSG_CHECKING(if we will use Insure++ to debug)
-  AC_MSG_RESULT($ac_use_insure)
-  if test "$ac_use_insure" = "yes"; dnl
-       then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "????
-   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
-
-if test -s $srcdir/inst-apps; then
-  ac_topsubdirs="`cat $srcdir/inst-apps`"
-else
-  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)
-  if test $install_it = "yes"; then
-    TOPSUBDIRS="$TOPSUBDIRS $i"
-  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
-])
-
-AC_DEFUN(KDE_CHECK_NEWLIBS,
-[
-
-])
-
-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_LANG_SAVE
-AC_LANG_C
-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_LANG_RESTORE
-])
-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
-])
-
-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,
-[
-AC_LANG_C
-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] )
-])
-
-dnl -------------------------------------------------------------------------
-dnl See if the compiler supports a template repository         bero@redhat.de
-dnl -------------------------------------------------------------------------
-AC_DEFUN(KDE_COMPILER_REPO,
-[
-  REPO=""
-  NOREPO=""
-
-  KDE_CHECK_COMPILER_FLAG(frepo,
-   [
-     REPO="-frepo"
-     NOREPO="-fno-repo"
-   ])
-
-  if test -z "$REPO"; then
-  KDE_CHECK_COMPILER_FLAG(instances=explicit,
-  [
-     REPO="-instances=explicit"
-     NOREPO="-instances=extern"
-  ])
-  fi
-
-  if test -n "$REPO"; then
-     AC_DEFINE_UNQUOTED(HAVE_TEMPLATE_REPOSITORY, 1,
-		[C++ compiler supports template repository])
-     $1
-  fi
-
-  AC_SUBST(REPO)
-  AC_SUBST(NOREPO)
-])
-
-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)
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN(KDE_CHECK_QWSPRITEFIELD,
-[
-  KDE_CHECK_HEADER(QwSpriteField.h, ,
-  [
-    AC_MSG_WARN([you don't have QwSpriteField.h somewhere. Please install
-       QwSpriteField out of kdesupport.])
-      $1
-  ])
-])
-
-AC_DEFUN(KDE_FAST_CONFIGURE,
-[
-  dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, [  --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
-  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_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_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries"
-     case $host_os in
-      aix*) LIBS="-brtl $LIBS"
-	test "$GCC" = yes && LIBS="-Wl,$LIBS"
-	;;
-     esac
-     AC_CHECK_LIB($1, $2, $3, $4, $5)
-     LIBS="$kde_save_LIBS"
-])
-
-
-
-
-AC_DEFUN(KDE_CHECK_INITGROUPS,
-[ 
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS(initgroups)
-  if test "x$ac_cv_func_initgroups" = "xyes"; then
-    case $host_os in
-      aix*) AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-            AC_MSG_CHECKING([for initgroups prototype])
-            AC_CACHE_VAL(kde_cv_check_initgroups_proto,
-            [ AC_TRY_COMPILE(
-              [ #include <grp.h>
-              ],
-              [ char buffer[10];
-                gid_t id;
-                int x = initgroups(buffer,id);
-              ],
-              kde_cv_check_initgroups_proto=yes,
-              kde_cv_check_initgroups_proto=no)
-            ])
-            AC_MSG_RESULT($kde_cv_check_initgroups_proto)
-            AC_LANG_RESTORE
-            ;;
-      *)
-            kde_cv_check_initgroups_proto=yes
-            ;;
-    esac
-  else
-    kde_cv_check_initgroups_proto=no
-  fi
-  if test "x$kde_cv_check_initgroups_proto" = "xyes"; then
-    kde_check_initgroups_proto=1
-  else
-    kde_check_initgroups_proto=0
-  fi
-  AC_DEFINE_UNQUOTED(HAVE_INITGROUPS_PROTO,$kde_check_initgroups_proto,
-           [initgroups may exist but not its prototype (e.g. AIX<4.3.3:8)])
-])
-
-
-AC_DEFUN(KDE_CHECK_JAVA_DIR,
-[
-AC_MSG_CHECKING([for Java directory])
-
-AC_ARG_WITH(java,
-[  --with-java=javadir     use java installed in javadir, --without-java disables ],
-[  ac_java_dir=$withval
-], ac_java_dir=""
-)
-
-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_cv_java_bindir=no
-   kde_cv_java_includedir=no
-   kde_cv_java_libjvmdir=no
-   kde_cv_java_libhpidir=no
-else
-  if test "x$ac_java_dir" = x; then
-    dnl No option set -> look in $PATH
-    AC_CACHE_VAL(kde_cv_java_bindir,
-    [
-      dnl First look for javac in $PATH. If not found we'll look at the option.
-      KDE_FIND_PATH(javac, JAVAC, [], [])
-      if test -n "$JAVAC"; then
-          kde_cv_java_bindir=`echo $JAVAC | sed -e 's,/javac$,/,'`
-          dnl this substitution might not work - well, we test for jni.h below
-          kde_cv_java_includedir=`echo $kde_cv_java_bindir | sed -e 's,bin/$,include/,'`
-      else
-          kde_cv_java_bindir=no
-      fi
-    ])
-  else
-    dnl config option set
-    kde_cv_java_bindir=$ac_java_dir/bin
-    kde_cv_java_includedir=$ac_java_dir/include
-  fi
-fi
-
-dnl Look for libjvm.so
-kde_cv_java_libjvmdir=`find $kde_cv_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-dnl Look for libhpi.so and avoid green threads
-kde_cv_java_libhpidir=`find $kde_cv_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,'`
-
-dnl At this point kde_cv_java_bindir and kde_cv_java_includedir are either set or "no"
-if test ! "x$kde_cv_java_bindir" = xno; then
-
-  dnl Now check everything's fine under there
-
-  if test ! -x "$kde_cv_java_bindir/javac"; then
-    AC_MSG_ERROR([javac not found under $kde_cv_java_bindir - it seems you passed a wrong --with-java.])
-  fi
-  if test ! -x "$kde_cv_java_bindir/javah"; then
-    AC_MSG_ERROR([javah not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-  if test ! -x "$kde_cv_java_bindir/jar"; then
-    AC_MSG_ERROR([jar not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_includedir/jni.h"; then
-    AC_MSG_ERROR([jni.h not found under $kde_cv_java_includedir. Use --with-java or --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_libjvmdir/libjvm.so"; then
-    AC_MSG_ERROR([libjvm.so not found under $kde_cv_java_libjvmdir. Use --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_libhpidir/libhpi.so"; then
-    AC_MSG_ERROR([libhpi.so not found under $kde_cv_java_libhpidir. Use --without-java.])
-  fi
-
-  jni_includes="-I$kde_cv_java_includedir"
-  dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-  dnl and under linux here..
-  test -d "$kde_cv_java_includedir/linux" && jni_includes="$jni_includes -I$kde_cv_java_includedir/linux"
-  test -d "$kde_cv_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_cv_java_includedir/genunix"
-
-  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
-	    ],[ 
-	    ],[ AC_MSG_ERROR([Incorrect version of $kde_cv_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 ])
-	    ])
-
-  CXXFLAGS="$ac_cxxflags_safe"    
-  AC_LANG_RESTORE
-
-  dnl All tests ok, inform and subst the variables
-  AC_MSG_RESULT([javac/javah/jar in $kde_cv_java_bindir, jni.h in $kde_cv_java_includedir])
-
-  JAVAC=$kde_cv_java_bindir/javac
-  AC_SUBST(JAVAC)
-  JAVAH=$kde_cv_java_bindir/javah
-  AC_SUBST(JAVAH)
-  JAR=$kde_cv_java_bindir/jar
-  AC_SUBST(JAR)
-  AC_SUBST(jni_includes)
-  JVMLIBS="-L$kde_cv_java_libjvmdir -ljvm -L$kde_cv_java_libhpidir -lhpi"
-  AC_SUBST(JVMLIBS)
-fi
-])
-
-# serial 46 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 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_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)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
-
-# 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_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# 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_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# 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_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# 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_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-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_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  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*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-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_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # 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-gnu*)
-  case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | m68k* | arm* | mips* | hppa* | sh* )
-    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='file_magic NetBSD/[a-z0-9]* demand paged shared library']
-  else
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
-  fi
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-  ;;
-
-openbsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
-    i*86 )
-      changequote(,)dnl
-      lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
-      changequote([, ])dnl
-      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
-  ;;
-
-newsos6)
-  [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
-  ;;
-
-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
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  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*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL 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
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-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])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl 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])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-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/kde2"
-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])
-])
-
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN(AM_MAINTAINER_MODE,
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
diff --git a/bibletime-doc/admin/ChangeLog b/bibletime-doc/admin/ChangeLog
deleted file mode 100644
index 20e979b..0000000
--- a/bibletime-doc/admin/ChangeLog
+++ /dev/null
@@ -1,748 +0,0 @@
-2000-11-30  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: Added kde_moduledir which points to $prefix/lib/kde2/
-
-2000-07-24  Alex Zepeda  <jazepeda@pacbell.net>
-
-	* acinclude.m4.in: Remove the test for malloc.h
-
-2000-04-05  Michael Matz  <matz@ifh.de>
-
-        * config.pl : added kludge for compiling regexp's even if
-	perl < 5.005 is installed
-	* conf.change.pl : added support for autoconf 2.14.1
-
-2000-03-27  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in, Makefile.common: changed inst-apps semantics
-	If present, only the subdirs it lists will be configured and compiled.
-	If absent, then subdirs is used (and inst-apps isn't generated anymore)
-
-2000-03-22  David Faure  <faure@kde.org>
-
-	* am_edit: Added support for KDE_ICON = AUTO
-
-2000-03-18  David Faure  <faure@kde.org>
-
-	* Makefile.common: Rewrote the list-of-Makefiles generation to make it
-	simpler and nicer, using create_makefiles' way of doing it.
-	Added support for COMPILE_LAST and COMPILE_FIRST in toplevel Makefile.am
-
-2000-01-05  David Faure  <faure@kde.org>
-
-	* Makefile.common: hacked around autoconf bug (setting INSTALL to ".."
-	when calling a subconfigure and INSTALL is already set).
-
-1999-12-15  Waldo Bastian  <bastian@kde.org>
-
-        * acinclude.m4.in: Test whether Qt compiles AND LINKS without flags.
-
-1999-06-24  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: generate correct Makefile entries for kde-i18n toplevel directories
-	* am_edit:
-
-1999-06-14  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: remove idl generated files on make clean
-
-1999-06-09  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: skipping programs with variables in sources for final
-
-1999-06-07  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: added support for idl files
-
-1999-06-02  Stephan Kulow  <coolo@kde.org>
-
-	* Makefile.common: preserve comments in .pot files to make it
-		possible for programmers and translators to comment them
-
-1999-06-02  Simon Hausmann <hausmann@kde.org>
-
-        * acinclude.m4.in: added kde_servicetypesdir
-
-1999-06-02  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: removed LIB_KFM and LIB_KDEUTIL aliases
-
-1999-05-28  Simon Hausmann <hausmann@kde.org>
-
-	* acinclude.m4.in: added kde_servicesdir
-
-1999-05-27  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: lots of changes for better support of --enable-final
-
-1999-05-22  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added support for --with-dmalloc
-
-1999-05-19  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added support for --enable-final
-
-	* am_edit: added support for --enable-final
-	
-1999-05-06  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: change the meaning of --disable-debug
-
-1999-05-04  Helge Deller <deller@gmx.de>
-
-	* acinclude.m4.in: the test for the X-includes/directories failed,
-	when compile & link work without special directories (as on HP-UX).
-
-1999-04-20  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: adding DESTDIR replacement for rm and uninstall-local
-	too. Seems very useless, but makes testing for uninstall easier
-
-1999-04-01  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: Added -lkfile to $(LIB_KIO)
-
-1999-03-30  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: Added AC_CHECK_KDEMAXPATHLEN, which defines KDEMAXPATHLEN.
-
-1999-03-29  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added LIB_X11 to XPMLIB and GLLIB, because
-	on SCO, they need it _after_ themselves.
-
-1999-03-28  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added LIB_KFM to LIB_KAB alias
-
-1999-03-26  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: made LIB_KFILE use LIB_KIO instead of LIB_KFM
-	added LIB_KFORMULA
-
-1999-03-20  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: check for libXext - for Russel :)
-
-1999-03-16  Stephan Kulow  <coolo@kde.org>
-
-	* acinclud3.m4.in: extend the MICO test with a list of possible
-	places where to find CORBA.h
-
-1999-03-15  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: move $QTINC and $QTLIB in search path
-
-1999-03-14  Stephan Kulow  <coolo@kde.org>
-
-	* am_edit: install-root is obsolute. Use DESTDIR always
-
-1999-03-03  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixing a bug, that $QTDIR was taken before --with-qt*
-	* acinclude.m4.in: added KDE_USE_QT, that you can choose if to
-	use QT 2.0 or KDE 1.0
-	
-	* Makefile.common: added target package-merge
-
-	* am_edit: many fixes to the POFILES handeling of am_edit
-
-1999-03-02  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: first look at libjpeg6b (from kdesupport) then
-	for libjpeg
-
-	* config.*, libtool.*: update to the latest FSF tools
-
-1999-02-23  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: error when Sparc CC is used. Better use it in
-	configure and tell him the story then letting him find it while
-	compiling
-
-	* acinclude.m4.in: adding KDE_CHECK_EXTRA_LIBS to all possible tests,
-	so that --with-extra-includes is used when needed.
-
-	* acinclude.m4.in: configure looks for giflib30, so it should say so
-
-	* acinclude.m4.in: don't overwrite x include parameters. Patch by
-	Ari Lemmke <ari.lemmke@regex.fi> (bug report 741)
-	
-1999-02-20  Stephan Kulow <coolo@kde.org>
-
-	* acinclude.m4.in: fixing KDE_CHECK_PATHS for rechecking. In case
-	of defaults (kdelibs) configure didn't cache the results
-
-1999-02-18  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added AC_CHECK_S_ISSOCK, to fix #706.
-
-1999-02-17  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added AC_CHECK_RANDOM, just like
-	AC_CHECK_USLEEP, to enable the fake if necessary.
-
-1999-02-13  Kurt Granroth <granroth@kde.org>
-
-        * acinclude.m4.in: look for QT-2.0
-
-1999-02-05  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: in macro KDE_FIND_PATH treat user given dirs
-	and $PATH dirs the same. Added seperate test for to find binary
-	($5) to replace findperl
-
-1999-01-28  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added patch by jbb to be a little bit more precise about
-	the number of sourcefiles that include the moc file if it's != 1.
-	Besides that automoc will fail with exit code, so the Makefile.cvs
-	process does stop in case a problem accoured.
-
-	* automoc: don't hardcode header suffix, but allow *.h, *.hh and *.H
-	
-1999-01-27  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: try qobjcoll.h and qapplication.h before saying
-	OK to qt headers. (I could kill SuSE for splitting into qt-dev
-	and qt-compat)
-
-1991-01-23  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added fixes by JB <jb.nz@writeme.com>
-
-1999-01-21  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added --help and --path (for use in dist-hook)
-
-1999-01-20  Alex Zepeda  <garbanzo@hooked.net>
-	
-	* ltconfig: added entries for FreeBSD 4.x
-
-1999-01-19  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added a distclean-metasources target which deletes all
-	moc files and let distclean depend on it
-
-1999-01-18  Stephan Kulow  <coolo@kde.org>
-
-        * automoc: several fixes (ignore comment lines + join lines
-         with \ )
-	
-	* automoc: support META_INCLUDES in case the header files are
-	not in the same dir as the sources.
-
-1999-01-17  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: several fixes.
-
-1999-01-16  Stephan Kulow  <coolo@kde.org>
-
-	* automoc: added support for included MOC files.
-
-	* acinclude.m4.in: use srcdir for the subdirs stuff as well
-
-	* automoc: added better command line parsing and some preparation
-	for handling "normal" moc files
-
-	* acinclude.m4.in: added aliases for libkio and libkdeutil
-
-1999-01-15  Harri Porten  <porten@kde.org>
-
-	* automoc: Carved in stone syntax for Makefile.in:
-	{program}_METASOURCES = USE_AUTOMOC [{suffix}]
-
-1999-01-15  Stephan Kulow  <coolo@kde.org>
-
-	* Makefile.common: set top_srcdir to .
-
-1999-01-14  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't use config.h.bot any longer
-
-1999-01-08  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added KDE_CHECK_NEWLIBS
-
-	* acinclude.m4.in: test for Qt even if both --with-qt-headers and
-	--with-qt-libraries are given. They may be wrong.
-	
-1999-01-06  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: change the MOC test so it can be used for other
-	tools as well
-
-1998-12-28  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: look for QT-1.42 since kpanel needs it
-
-1998-12-27  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added /usr/lib for libpython test
-	
-	* acinclude.m4.in: take my email address out of it and added a
-	reference to www.kde.org/faq
-
-	* acinclude.m4.in: use Qt >= 1.4
-
-	* acinclude.m4.in: added KDE_CHECK_NAMESPACES
-	
-1998-12-18  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: test for directories to exist before saying yes
-	to compilation :)
-
-1998-12-14  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added CPLUSPLUS for the kimgio test. It's
-	only important for shaman right now, but at least there it is :)
-
-1998-12-12  Stephan Kulow  <coolo@kde.org>
-
-	* Makefile.cvs: added common Makefile.cvs
-
-	* acinclude.m4.in: Thomas.Schwarz@pro-sieben.de reported a very ugly
-	bug in AC_PROG_CXXCPP, so I added my own version
-	
-	* acinclude.m4.in: added KDE_CREATE_SUBDIRS_LIST to simplify
-	most toplevel configures
-
-1998-12-11  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added call to AC_PROG_CXXCPP. Not really sure why
-	it never caused problems
-
-	* acinclude.m4.in: moved LIBTIFF alias
-
-	* acinclude.m4.in: only test for the existance of libkimgio if the
-	user wants to. For 99% of the applications it doesn't matter if
-	configure can find libkimgio :)
-	
-1998-12-10  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: some changes to the python check to handle $LIBDL
-
-1998-12-09  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: make Alex's tiff test a real one
-	
-	* acinclude.m4.in: fix the LIB_TIFF alias to really expand
-
-1998-12-08  Alex Zepeda  <garbanzo@hooked.net>
-
-	* acinclude.m4.in: Fix tiff test to use libtiff34 if it exists.
-	This is what the FreeBSD port installs to for whatever reason.
-
-	* acinclude.m4.in: s/kde/KDE/ (at least in some of the
-	descriptions, obviously no variable names were touched.
-
-1998-12-08  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: moved the LIB_QT alias to the Qt check
-	
-	* acinclude.m4.in: unset KDEDIR before running conftest
-	
-	* acinclude.m4.in: fixed mean typo
-	
-	* acinclude.m4.in: added the copyright header for the gettext
-	tests, so that people know we're legal ;)
-
-	* acinclude.m4.in: set language to C++ before testing QIMGIO	
-
-1998-12-07  Alex Zepeda  <garbanzo@hooked.net>
-
-	* acinclude.m4.in: Fix PNG test to use correct ANSI C code, and
-	not trip up gcc.
-
-1998-12-07  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't hardcode -ldl
-	
-	* acinclude.m4.in: move the LIB_X11 alias to the X test to make it
-	useful for kdesupport as well
-	
-	* acinclude.m4.in: give the word CHECK_KIMGIO a meaning in really
-	checking for it
-
-	* acinclude.m4.in: simple fix to prevent kimgio test from compiling
-	KDE application in kdelibs
-
-1998-12-05  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: let KDE_CHECK_KIMGIO depend on AC_PATH_KDE,
-	otherwise most tests fail. It didn't mean anything to 90% of the
-	packages since they test for KDE before kimgio, but for shaman
-	it does
-
-	* ltconfig: the real fix for the Solaris && gcc problem.
-	Thanks Kurt for reporting it and Alexandre for fixing it :)
-
-1998-12-04  Stephan Kulow  <coolo@kde.org>
-
-	* libtool.*: update again
-
-	* acinclude.m4.in: changed the function to test for libnsl to
-	inet_ntoa since UnixWare 7's version did not have gethostbyname,
-	but needs libnsl
-
-1998-12-02  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixed the MOC test (again) to use the PATH variable
-	correctly (with the correct seperator)
-
-	* config.guess: update from the soon to be released autoconf-2.13
-
-1998-12-01  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixes for the MOC test. Use PATH now when found
-
-1998-11-30  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: extended the MOC test. It checks now for the
-	first line of the output of "moc --help" and looks for Qt in it.
-
-1998-11-27  Stephan Kulow  <coolo@kde.org>
-
-	* ltconfig: another libtool update. Fixes an ugly bug on Solaris,
-	when GNU ld is in path before Solaris ld, but gcc uses the later
-
-1998-11-26  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: made the Qt test more advance to check for qt
-	1.41 - I still need to make it better, but there shouldn't be too
-	many qt releases in a row, would there? ;)
-
-	* ltconfig: libtool update with better BSD/OS support
-
-1998-11-22  Stephan Kulow  <coolo@kde.org>
-
-	* ltconfig: cool - libtool uses g++ now to link libraries on Solaris.
-	This means, static objects become usuable on that plattforms (some
-	others as well).
-
-1998-11-20  Stephan Kulow  <coolo@kde.org>
-
-	* ltmain.sh: updated libtool from their CVS - fixes bugs we haven't
-	found and adds some more features, that we do not need ;-)
-
-1998-11-19  David Faure  <faure@kde.org>
-
-	* acinclude.m4.in: added AC_CHECK_UTMP_FILE, taken from kdebase
-
-1998-11-16  Harri Porten  <porten@kde.org>
-
-	* automoc: take care of "ar" object files, too.
-
-1998-11-16  Stephan Kulow  <coolo@kde.org>
-
-	* libtool.m4.in: revised my --silent patch. The solution
-	Alexandre suggested is much better.
-
-1998-11-15  Stephan Kulow  <coolo@kde.org>
-
-	* ltconfig.in: done some tweakings to support -export-dynamic
-	with egcs
-
-	* config.sub: wow - BeOS support :)
-
-1998-11-14  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't use rpath for test program, if rpath is
-	disabled for applications
-
-	* ltconfig: patched libtool to make it silent without making
-	ltconfig silent
-
-	* acinclude.m4.in: make libtool silent again
-
-	* libtool.m4.in: update to libtool-981114 (untested stuff, but
-	we have to test it to make it tested - sounds that logical? :-)
-
-	* libtool.m4.in: moved the self stricked libtool tests to "our"
-	file.
-
-	* acinclude.m4.in: moved ChangeLog of kdebase which I used to
-	maintain acinclude.m4.in logs to kde-common/admin. Hopefully I
-	will maintain it more often from now on :)
-
-1998-07-27  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixed some things in the MOC test
-
-	* acinclude.m4.in: fixed this damn msgfmt test
-
-1998-06-02  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: ignore msgfmt, if not GNU gettext
-
-1998-05-28  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixed KDE_CHECK_STL. Checks for HP and SGI type
-
-	* acinclude.m4.in: embraced every variable with "" to make
-	it consistent
-
-	* acinclude.m4.in: various fixes for the koffice checks
-	(mico, ministl and python)
-
-1998-05-16  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't use KDE_CHECK_QT_DIRECT, when
-	--with-qt-libs are given
-
-1998-04-21  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: cool, I found the trick to suppress the ls
-	errors
-
-1998-04-20  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: rewrote the qt checking test, since it
-	didn't work under FreeBSD, since it relied on the .so link.
-	The new version is a little bit buggy, but I need some testing
-	to make it perfect
-
-	* acinclude.m4.in: fixed the side effects of the PAM test
-
-1998-04-18  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: hopefully fixed the PAM test (I rewrote it)
-
-1998-04-16  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: extended the getsockname test inspired
-	by a patch by Martin Baulig
-
-	* configure.in: added test for utmp file
-
-	* acinclude.m4.in: made --without-pam default
-	
-
-1998-04-06  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: don't test compiling, linking, running in
-	one step. This proved to be too dangerous for my mail box.
-	
-1998-03-21  Stephan Kulow  <coolo@kde.org>
-
-	* libtool.m4.in: created some new macros to work around this
-	ugly (because long) help of configure --enable-shared/static
-
-1998-03-05  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: set language to C++ before trying the ksize_t
-	test
-
-	* configure.in: sorted the Makefile entries alphabeticly (and all
-	together: we love xemacs! we love xemacs! ;)
-	
-	* configure.in: added sk
-
-	* acinclude.m4.in: substitute x_libraries to fix the empty -rpath
-	
-1998-03-03  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: add a rpath for every shared library, that is
-	linked too (especially X11 libraries)
-	
-Tue Feb 24 22:04:59 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added kde_sounddir and set kde_minidir to
-	kde_icondir/mini to break not too much
-
-Sun Feb 15 18:25:50 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: added bugfix by Bob Miller <kbob@engr.sgi.com>
-	(correct reset of IFS)
-	
-Wed Feb 11 00:53:11 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: made shadow under Linux default, since the
-	binaries will work also under non-shadow systems. The only problem
-	left is PAM, so I disabled shadow in case, PAM is present
-
-Tue Feb 10 16:46:32 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: added test for nice to find out, if the option
-	-nice works for the screensavers
-
-	* acinclude.m4.in: port to LynxOS. For this I moved all library
-	search routines in KDE_MISC_TESTS, so I don't need to write this
-	in every package
-
-	* README: some grammar fixes
-
-	* acinclude.m4.in: search for the libs in the exec_prefix, when
-	it's present
-	
-Sun Feb  8 14:07:23 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: updated all packages
-
-	* libtool.m4.in: applied patch for libtool.m4.in to show the
-	correct default for shared and static
-	
-
-Sat Feb  7 10:56:00 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: good news - KDE is relocatable again.
-
-	* libtool.m4.in: updated to latest libtool 1.0i
-
-Fri Feb  6 21:26:51 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: added a AC_PROVIDE for AC_PROG_CC and
-	AC_PROG_CPP to KDE_CHECK_COMPILERS
-
-Thu Feb  5 16:27:47 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: put $QTDIR/bin before /usr/bin in the path to
-	look for moc. I don't know why, but I got a report, that configure
-	found /usr/bin/moc under Solaris
-
-Fri Jan 30 15:47:50 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: export LIBRARY_PATH after reset to the saved
-	value
-	
-	* acinclude.m4.in: unset the LIBRARY_PATH to get a relieable
-	result when trying to find, if Qt compiles without -L
-
-Sat Jan 24 00:45:52 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: fixed another bug in AC_PATH_KDE
-
-Thu Jan 22 14:46:15 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: fixed an ugly bug in AC_BASE_PATH_KDE
-
-	* kappfinder/kappfinder.in: let kappfinder create by configure to
-	allow the use of the kde_ paths
-
-Wed Jan 21 22:19:35 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in: - added a install_root prefix to all paths, if
-	set, to enable package managers to move the whole installation at once
-	- added --with-install-root to set the install_root prefix
-
-Tue Jan 20 22:41:04 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: added NOOPT_CXXFLAGS to allow kioslave to be
-	compiled without -O2
-
-Mon Jan 19 21:55:21 1998  Stephan Kulow  <coolo@kde.org>
-
-	* configure.in: some little fixes for the Makefiles
-
-	* acinclude.m4.in: --prefix will no longer override the search for
-	libraries. If they are present somewhere, they are used (through
-	the methodes in KApplication)
-
-Mon Jan 12 00:30:36 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in fixed an ugly bug, that accoured, when
-	qt_libraries is not set (empty/equals X11/not necessary)
-	
-	* acinclude.m4.in moved the remove of the files after the error
-	detection
-	
-
-Sun Jan 11 17:27:53 1998  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in added a new macro KDE_CHECK_QT_DIRECT to unset
-	the Qt library path, if a Qt program compiles without them
-		
-	* acinclude.m4.in added a return value in the CREATE_KFSSTND
-	macro. Perhaps this has caused the problems
-
-Sat Jan 10 17:40:44 1998  Stephan Kulow  <coolo@kde.org>
-
-	* ChangeLog started to maintain a ChangeLog file again
-	* acinclude.m4.in the AC_CREATE_KFSSTND to get better debug output
-	to find the problem
-	
-
-Old logs, Stephan Kulow made:
-	
-0.1 : first steps with libkde
-0.2 : first release with libkde, khtmlw, kdehelp, acli, kwm, kpanel
-0.3 : added kfm and bugfixes
-0.4 : updated khtmlw, kdehelp, kwm, changed install in all subdirs
-0.5 : support libtool (chooseable shared libs)
-0.6 : split libkde in kdecore and kdeui
-0.6.1 : Bugfixes
-0.7 : added code from Janos Farkas (configure)
-    : added @{kde,qt}_{includes,libraries}@
-0.7.1: Bugfixes
-0.7.2: Bugfixes
-0.7.3: added @all_includes@ and @all_libraries@
-       replaced all incompatible flags like $(CC) and -DHAVE_UNISTD_H
-0.7.4: changed support for libkde (back in it's own)
-       added kpat
-       updated kpanel, kwm, kghostview
-0.8: removed a bug in kghostview
-	lifted installation process of several apps
-	splitt kdebase into kdelibs and kdeapps	
-	updated khtmlw, kfm and kdehelp
-	added kcalc and kpaint
-	updated kdisplay
-	added kscreensaver
-	added --enable-kscreensaver
-	added --enable-debug (and @CXXFLAGS@ to all Makefile.ins)
-	updated kwm to 0.4.7
-	added make uninstall to every app
-	added kvt
-	added khexdit
-	added .kdelnk for kmines, kedit, ktetris
-	put kwm, kfind's .kdelnk in the right directories
-	replaced --enable-kscreensaver by --disable-kscreensaver
-	updated kpanel to 0.15
-	some bugfixes (thanks Marco)
-	some bugfixes (thanks Martin)
-	changed acinclude.m4, because aclocal won't
-	updated kwm to 0.4.8 (patched it again for Qt-1.2)
-	updated kvt to 0.13 (patch from Matthias)
-	patched kvt and kwm
-	updated kwm to 0.5.0
-	updated kvt for 0.14 (again and again :-)
-	updated kview to 0.10
-	updated kfm to 0.6.3
- 	patched kscreensaver for FreeBSD (thanks Marc)
-0.9: updated kdisplay to 0.5.3
-	added klogout
-	patches from Matthias
-	updated kfm to 0.6.4
-	updated kghostview to 0.4
-	added QTINC and QTLIB
-	updated kdehelp to 0.4.11
-	patched kfm to support ktoolbar
-	updated kedit to kedit+
-	added kfontmanager 0.2.1
-0.9.1: changed kpaint's make style
-	bugfixing
-	updated kmines to 0.6.5
-	updated ktetris to 0.2.4
-	changed to Makefiles to depend on Makefile.in
-	changed the Makefiles to let install depend on all
-	added kjots-0.2.2
-	updated kjots-0.2.3
-	updated kfm to 0.6.6
-	updated kjots-0.2.4
-	updated kpaint-0.2
-	updated kedit to 0.5
-	updated kfontmanager to 0.2.2
-	updated kfm to 0.6.7
-	updated ktetris to 0.2.5
-	updated kjots to 0.2.5
-0.10: added HAVE_SQRTL
-	added HAVE_CRYPT_H
-	updated kfind
-	updated kfm to kfm-0.8.1
-	re-introduced automake to kdebase
-	bugfixes for the configure.in
-	added XPM, GL and PAM tests to configure
-	added morph3d to kscreensavers
-	updated kfind to 0.3.2
-	added some patches for SGI
-... lost the time to maintain a Changelog ;)
diff --git a/bibletime-doc/admin/Makefile.am b/bibletime-doc/admin/Makefile.am
deleted file mode 100644
index 1023a46..0000000
--- a/bibletime-doc/admin/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST=ChangeLog Makefile.common acinclude.m4.in am_edit am_edit.py conf.change.pl config.guess config.pl config.sub configure.in.min debianrules depcomp install-sh libtool.m4.in ltcf-c.sh ltcf-cxx.sh ltconfig ltmain.sh missing mkinstalldirs ylwrap
-
diff --git a/bibletime-doc/admin/Makefile.common b/bibletime-doc/admin/Makefile.common
deleted file mode 100644
index beec064..0000000
--- a/bibletime-doc/admin/Makefile.common
+++ /dev/null
@@ -1,295 +0,0 @@
-
-SHELL=/bin/sh
-
-cvs:
-	@if grep '$$(top_srcdir)/acinclude.m4:' Makefile.am >/dev/null; then \
-	  echo "*** Creating acinclude.m4" ;\
-	  rm -f acinclude.m4 configure.files ;\
-	  $(MAKE) -f Makefile.am top_srcdir=. acinclude.m4 ;\
-	fi
-	@echo "!!! If you get recursion errors from autoconf, it is advisable to set the"
-	@echo "    environment variable M4 to something including \"--nesting-limit=500\""
-	@if test -r configure.in.in; then \
-	  rm -f subdirs configure.in ;\
-	  echo "*** Creating list of subdirectories" ;\
-	  $(MAKE) -f Makefile.am top_srcdir=. subdirs ;\
-	  echo "*** Creating configure.in" ;\
-	  $(MAKE) -f Makefile.am top_srcdir=. configure.in ;\
-	fi
-	@echo "*** Creating aclocal.m4"
-	@aclocal
-	@echo "*** Creating configure"
-	@autoconf
-	@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\
-	  || mv \$$CONFIG_STATUS.bak \$$CONFIG_STATUS;\
-	  \n  rm -f \$$CONFIG_STATUS.bak;\nfi\
-	  \n" if /^\s*chmod\s+.*\+x\s+.*CONFIG_STATUS/;' configure ;\
-	fi
-	@if grep '} \$$ac_kw foo' configure >/dev/null 2>&1; then perl -p -i -e "s/ac_kw foo/ac_kw int foo/" configure; fi
-#David's hack for autoconf bug when $INSTALL is set
-	@perl -pi -e 'if (/\[\/\$$\]\*. INSTALL=/) { print $$_ ; $$_ = "\"\") ;;\n"; }' configure
-	@if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then \
-	  echo "*** Creating config.h template" ;\
-		autoheader ;\
-	fi
-	@echo "*** Creating Makefile templates"
-	@automake
-	@echo "*** Postprocessing Makefile templates"
-	@perl admin/am_edit
-	@if egrep "^cvs-local:" Makefile.am >/dev/null; then \
-	  $(MAKE) -f Makefile.am cvs-local ;\
-	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:	
-	@if grep -e '$$(top_srcdir)/acinclude.m4:' Makefile.am >/dev/null; then \
-	  $(MAKE) -f Makefile.am top_srcdir=. acinclude.m4 ;\
-	fi
-	@if test -r configure.in.in; then \
-	  $(MAKE) -f Makefile.am top_srcdir=. subdirs configure.in; \
-	fi ;\
-	aclocal; \
-	autoheader; \
-	automake --foreign --include-deps; \
-	perl admin/am_edit; \
-	autoconf; \
-	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\
-	  || mv \$$CONFIG_STATUS.bak \$$CONFIG_STATUS;\
-	  \n  rm -f \$$CONFIG_STATUS.bak;\nfi\
-	  \n" if /^\s*chmod\s+.*\+x\s+.*CONFIG_STATUS/;' configure ;\
-	fi ;\
-	touch stamp-h.in; \
-	if grep -e "^cvs-local:" Makefile.am >/dev/null; then \
-	  $(MAKE) -f Makefile.am cvs-local ;\
-	fi ;\
-	if grep "ac_kw foo" configure >/dev/null 2>&1; then perl -p -i -e "s/ac_kw foo/ac_kw int foo/" configure; fi ;\
-	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 -e "^cvs-dist-local:" Makefile.am >/dev/null; then \
-	  $(MAKE) -f Makefile.am cvs-dist-local ;\
-	fi
-
-cvs-clean:
-	@if test ! -d CVS; then \
-	  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;\
-	pwd=`pwd` ;\
-	dirs=`find . -type d | grep -v CVS | sed -e "s#^./##"` ;\
-	for i in $$dirs; do \
-	  if test ! -d "$$pwd/$$i/CVS"; then \
-	    echo "D $$i" ;\
-	    rm -rf "$$pwd/$$i"; \
-	    continue; \
-	  fi ;\
-	  cd $$pwd/$$i ;\
-	  for f in * .*; do \
-	    if test ! -d "$$f"; then \
-	      if grep "^/$$f/" CVS/Entries > /dev/null; then \
-		a="b"; \
-	      else \
-	        echo "F $$i/$$f"; \
-		rm -f "$$pwd/$$i/$$f"; \
-	      fi; \
-	    fi ; \
-	  done; \
-	done
-
-
-# The Makefiles have to be sorted for slashes, since configure creates
-# only one directory per Makefile not the whole hierarchy
-configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs
-	@rm -f configure.in configure.in.new ;\
-	cat `cat configure.files | egrep -v "^configure.in.bot"` >> configure.in.new ;\
-	echo "KDE_CREATE_SUBDIRSLIST" >> configure.in.new ;\
-	echo "AC_OUTPUT( \\" >> configure.in.new ;\
-	mfs=`find . -type d -print | fgrep -v "/." | sed -e "s#\./##" -e "/^debian/d" | sort`; \
-	for i in $$mfs; do \
-	  topleveldir=`echo $$i| sed -e "s#/.*##"`; \
-	  if test -f $$topleveldir/configure.in; then \
-		continue; \
-	  fi ;\
-	  if test ! -f $$i/Makefile.am; then \
-		continue; \
-	  fi ;\
-	  if test -s inst-apps; then \
-	    if test -z "`grep \"^$$topleveldir\" inst-apps`"; then \
-		continue; \
-	    fi ;\
-	  fi ;\
-	  echo "$$i/Makefile \\" >> configure.in.new ;\
-	done ;\
-	egrep '^dnl AC_OUTPUT\(.*\)' `cat configure.files` | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#\1 \\\\#" >> configure.in.new ;\
-	echo ")" >> configure.in.new
-	@modulename= ;\
-	if test -f configure.in.in; then \
-	   if head -2 configure.in.in | egrep "^#MIN_CONFIG$$" > /dev/null; then \
-	      line=`egrep "^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 "$$modulename" || test "$$modulename" = "@MODULENAME@"; then \
-	   modulename=`pwd`; modulename=`basename $$modulename`; \
-	fi ;\
-	if test -z "$$VERSION" || test "$$VERSION" = "@VERSION@"; then \
-	     VERSION="\"2.2.1\"";  \
-	fi ;\
-	sed -e "s#@MODULENAME@#$$modulename#" configure.in.new | \
-		sed -e "s#@VERSION@#$$VERSION#" > configure.in
-	@if test -f configure.in.bot ; then cat configure.in.bot >> configure.in ; fi
-	@rm -f configure.in.new
-
-configure.files: subdirs
-	@admindir=NO ;\
-	for i in . .. ../.. ../../..; do \
-	  if test -x $$i/admin; then admindir=$$i/admin; break; fi; \
-	done ;\
-	rm -rf configure.files ;\
-	if test -f configure.in.in && head -2 configure.in.in | egrep "^#MIN_CONFIG$$" > /dev/null; then \
-		echo $$admindir/configure.in.min >> configure.files  ;\
-	fi
-	@test -f configure.in.in && echo configure.in.in >> configure.files
-	@list=`find . -name "configure.in.in" | sort`; \
-	for i in $$list; do if test -f $$i && test ! `dirname $$i` = "." ; then \
-	  echo $$i >> configure.files ;\
-	fi; done
-	@if test -f configure.in.mid ; then echo configure.in.mid >> configure.files ; fi
-	@if test -f configure.in.bot ; then echo configure.in.bot >> configure.files ; fi
-
-subdirs:
-	@files=`ls -1 | sort`; \
-	dirs= ;\
-	lib_dirs= ;\
-	first_dirs= ;\
-	last_dirs= ;\
-	compilefirst=`grep '^COMPILE_FIRST[ ]*=' Makefile.am | \
-		sed -e 's#^COMPILE_FIRST[ ]*=[ ]*#|#' | sed -e 's#$$#|#' | sed -e 's# #|#g'`;\
-	compilelast=`grep '^COMPILE_LAST[ ]*=' Makefile.am | \
-		sed -e 's#^COMPILE_LAST[ ]*=[ ]*#|#' | sed -e 's#$$#|#' | sed -e 's# #|#g'`;\
-	for i in $$files; do if test -d $$i; then \
-	    if test -f $$i/Makefile.am; then \
-		if echo $$compilefirst | grep "|$$i|" >/dev/null; then \
-			first_dirs="$$first_dirs $$i" ;\
-		elif echo $$compilelast | grep "|$$i|" >/dev/null; then \
-			last_dirs="$$last_dirs $$i" ; \
-		else dirs="$$dirs $$i" ;\
-		fi ;\
-	     fi ;\
-	   fi; \
-	done ;\
-	rm -f SUBDIRS ;\
-	for i in $$dirs; do \
-	echo $$i >> ./SUBDIRS; \
-	done
-	@if test -r subdirs && diff subdirs SUBDIRS > /dev/null; then \
-	  rm -f SUBDIRS; \
-	fi
-	@test -r SUBDIRS && mv SUBDIRS subdirs || true
-
-package-merge:
-	@catalogs='$(POFILES)'; \
-	for cat in $$catalogs; do \
-	echo $$cat $$name; \
-	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 ; \
-	  cp 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 > rc.cpp ;\
-	   else \
-		candidates=`ls -1 *.rc *.ui 2>/dev/null` ;\
-		if test -n "$$candidates"; then \
-		    echo "$$subdir has *.rc or *.ui 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>) { if (/^messages:/) { $$mes=1; print $$_; next; } if ($$mes) { if (/$$\\(XGETTEXT\)/ && / -o/) { s/ -o \$$\(podir\)/ _translatorinfo.cpp -o \$$\(podir\)/ } print $$_; } else { print $$_; } }' < Makefile.am > _transMakefile ;\
-	   $(MAKE) -s -f _transMakefile podir=$$podir EXTRACTRC="$$EXTRACTRC" PREPARETIPS="$$PREPARETIPS" \
-	   XGETTEXT="$${XGETTEXT:-xgettext} -C -ki18n \
-	   -kI18N_NOOP -ktranslate -kaliasLocale \
-	   -x $${includedir:-$$KDEDIR/include}/kde.pot" \
-	   messages ) >$$tmpname 2>&1 ;\
-	   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 \
-	  if test ! -f po/$$i; then echo "disappeared: $$i"; fi ;\
-	done
-	@for  i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do \
-	   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
-
-test:
-	perl -e '$$mes=0; while (<STDIN>) { if (/^messages:/) { $$mes=1; print $$_; next; } if ($$mes) { if (! /^\t/) { exit(0); } if (/$$\\(XGETTEXT\)/ && / -o/) { s/ -o/ _translatorinfo.cpp -o/ } print $$_;  } }' < Makefile.am
-
-.SILENT:
diff --git a/bibletime-doc/admin/Makefile.in b/bibletime-doc/admin/Makefile.in
deleted file mode 100644
index 2165335..0000000
--- a/bibletime-doc/admin/Makefile.in
+++ /dev/null
@@ -1,358 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = ChangeLog Makefile.common acinclude.m4.in am_edit am_edit.py conf.change.pl config.guess config.pl config.sub configure.in.min debianrules depcomp install-sh libtool.m4.in ltcf-c.sh ltcf-cxx.sh ltconfig ltmain.sh missing mkinstalldirs ylwrap
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  ChangeLog Makefile.am Makefile.in config.guess config.sub \
-install-sh ltcf-c.sh ltcf-cxx.sh ltconfig ltmain.sh missing \
-mkinstalldirs ylwrap
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu admin/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu admin/Makefile
-	cd $(top_srcdir) && perl admin/am_edit admin/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = admin
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu admin/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu admin/Makefile
-	cd $(top_srcdir) && perl admin/am_edit admin/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/admin/acinclude.m4.in b/bibletime-doc/admin/acinclude.m4.in
deleted file mode 100644
index 7823796..0000000
--- a/bibletime-doc/admin/acinclude.m4.in
+++ /dev/null
@@ -1,4141 +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. If you decide that you
-dnl really want to modify it, contact coolo@kde.org mentioning that you have
-dnl and that the modified file should be committed to every module.
-dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
-
-dnl ------------------------------------------------------------------------
-dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
-dnl thanks to Raja R Harinath.
-dnl ------------------------------------------------------------------------
-dnl
-ifdef([_AC_PATH_X_DIRECT],[],
-   [AC_DEFUN([_AC_PATH_X_DIRECT],[AC_PATH_X_DIRECT])])
-ifdef([_AC_PATH_X_XMKMF],[],
-   [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])])
-
-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.
-])
-])
-
-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,
-[
-   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, [$qt_bindirs], [UIC=""])
-     if test -z "$UIC" ; then
-       KDE_UIC_ERROR_MESSAGE
-       exit 1
-     fi
-   else
-     UIC="echo uic not available: "
-   fi
-
-   AC_SUBST(MOC)
-   AC_SUBST(UIC)
-])
-
-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_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_result=$1"
-])
-
-AC_DEFUN(KDE_SET_DEFAULT_PATHS,
-[
-if test "$1" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${prefix}/share/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${prefix}/share/config'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${prefix}/share/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${prefix}/share/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
-  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_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 "$kde_have_all_paths" != "yes"; 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_SUBST_PROGRAMS,
-[
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde2/bin /usr/kde/bin /usr/local/kde/bin"
-        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)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
-        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-      
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde2/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)'
-        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)
-
-        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_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-  kde_have_all_paths=
-  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_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(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
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN(KDE_MISC_TESTS,
-[
-   AC_LANG_C
-   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_LANG_C
-   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"))
-   
-   # Solaris 2.6 and others need -lresolv for res_init
-   AC_CHECK_FUNCS(res_init, , [
-     kde_libs_safe="$LIBS"
-     LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-     AC_TRY_LINK(
-[
-#include <resolv.h>
-],
-[ 
-res_init(); 
-],
-        LIBRESOLV="-lresolv"
-        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-        AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-     )
-     LIBS=$kde_libs_safe
-   ])
-
-   LIBSOCKET="$X_EXTRA_LIBS"
-   AC_SUBST(LIBSOCKET)
-   AC_SUBST(LIBRESOLV)
-   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
-])
-
-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([AC_PROG_CPP])dnl
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_MSG_CHECKING(for X)
-AC_LANG_SAVE
-AC_LANG_C
-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
-
-_AC_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"
-  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"
-
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_libraries)
-AC_SUBST(x_includes)
-
-# 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)
-AC_SUBST(LIBSM)
-LDFLAGS="$ac_save_LDFLAGS"
-
-AC_SUBST(X_PRE_LIBS)
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-AC_SUBST(LIB_X11)
-
-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
-
-AC_MSG_CHECKING(for Xinerama)
-
- AC_ARG_WITH(xinerama,
-  [  --with-xinerama         enable support for Xinerama ],
-  [
-    no_xinerama=no
-  ], [
-    no_xinerama=yes
-  ]
-)
-
-kde_save_LDFLAGS="$LDFLAGS"
-kde_save_CFLAGS="$CFLAGS"
-kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
-
-if test "x$no_xinerama" = "xno"; then
-
-  AC_CACHE_VAL(ac_cv_have_xinerama,
-  [
-	  AC_TRY_LINK([#include <X11/Xlib.h>
-  			#include <X11/extensions/Xinerama.h>],
-	  	  [XineramaIsActive(NULL);],
-		  [ac_cv_have_xinerama="yes"],
-		  [ac_cv_have_xinerama="no"])
-  ])
-else
-  ac_cv_have_xinerama=no;
-fi
-
-AC_MSG_RESULT($ac_cv_have_xinerama)
-
-LIBXINERAMA=""
-
-if test "$ac_cv_have_xinerama" = "yes"; then
-  AC_DEFINE(HAVE_XINERAMA, 1, [Define if you want Xinerama support])
-  LIBXINERAMA="-lXinerama"
-fi
-
-AC_SUBST(LIBXINERAMA)
-
-LDFLAGS="$kde_save_LDFLAGS"
-CFLAGS="$kde_save_CFLAGS"
-LIBS="$kde_save_LIBS"
-
-AC_LANG_RESTORE
-
-])
-
-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
-#include <qiconview.h>
-EOF
-fi
-
-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();
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
-EOF
-fi
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-EOF
-])
-
-AC_DEFUN(KDE_USE_QT,
-[
-
-if test -z "$1"; then
-  kde_qtver=2
-  kde_qtsubver=1
-else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9]\+\.\([0-9]\+\).*#\1#'`
-  # following is the check if subversion isn�t found in passed argument
-  if test "$kde_qtsubver" = "$1"; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "$1" | sed -e 's#^\([0-9]\+\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  else
-   # this is the version number fallback to 2.1, unless major version is 1 or 2
-   if test "$kde_qtver" != "2"; then
-    kde_qtver=2
-    kde_qtsubver=1
-   fi
-  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
-  else
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion=$2
-fi
-
-if test -z "$3"; then
-   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
-   else
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-  fi
-else
-   kde_qt_verstring=$3
-fi
-
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-else
-   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"
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-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])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
-  mt,
-  [  --enable-mt             link to threaded Qt (experimental)],
-  kde_use_qt_mt=$enableval,
-  kde_use_qt_mt=no
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-
-  case $host in
-  *-*-linux-*)
-    if test "x$GCC" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread"
-      X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-    else
-      AC_MSG_WARN([Compiler is not gcc. MT support disabled.])
-    fi
-    ;;
-  *)
-    AC_MSG_WARN([MT not yet supported on $host - disabled.])
-    ;;
-  esac
-
-fi
-
-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
-
-  LIBQT_GLOB="libqt.*"
-
-fi
-
-if test -z "$LIBQT"; then
-
-  LIBQT="-lqt"
-  kde_int_qt="-lqt"
-
-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
-
-      case $host in
-      *-*-linux-*)
-        if test "x$GCC" = "xyes"; then
-          LIBQT="-lqt-mt"
-          kde_int_qt="-lqt-mt"
-          LIBQT_GLOB="libqt-mt.*"
-          USING_QT_MT="using -mt"
-        fi
-      ;;
-      esac
-  fi
-
-  kde_qt_was_given=no
-
-else
-  kde_int_qt="$LIBQT"
-fi
-
-if test $kde_qtver = 2; then
-
-  AC_REQUIRE([AC_FIND_PNG])
-  AC_REQUIRE([AC_FIND_JPEG])
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
-    [  --with-qt-dir=DIR       where the root of Qt is installed ],
-    [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib
-       ac_qt_bindir="$withval"/bin
-    ])
-
-AC_ARG_WITH(qt-includes,
-    [  --with-qt-includes=DIR  where the Qt includes are. ],
-    [
-       ac_qt_includes="$withval"
-    ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
-    [  --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 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" = "2"; 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 $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
-
-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"
-LIBS="$LIBS $LIBQT"
-
-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=""
-  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
-    ac_qt_notfound="(libraries)";
-  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.])
-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"; 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
-
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
-
-LIB_QT="$kde_int_qt "'$(LIBPNG) $(LIBJPEG) -lXext $(LIB_X11) $(LIBSM)'
-AC_SUBST(LIB_QT)
-
-])
-
-AC_DEFUN(AC_PATH_QT,
-[
-AC_PATH_QT_1_3
-])
-
-AC_DEFUN(KDE_CHECK_FINAL,
-[
-  AC_ARG_ENABLE(final, [  --enable-final          build size optimized apps (experimental - needs lots of memory)],
-	kde_use_final=$enableval, kde_use_final=no)
-
-  KDE_COMPILER_REPO
-  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_ARG_ENABLE(closure, [  --disable-closure       don't delay template instantiation],
-  	kde_use_closure=$enableval, kde_use_closure=yes)
-
-  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=""
-  fi
-  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-])
-
-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_PREREQ([2.13])
-AC_REQUIRE([AC_PATH_QT])dnl
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${prefix}" != NONE; then
-  kde_includes=${prefix}/include
-  ac_kde_includes=$prefix/include
-
-  if test "${exec_prefix}" != NONE; then
-    kde_libraries=${exec_prefix}/lib
-    ac_kde_libraries=$exec_prefix/lib
-  else
-    kde_libraries=${prefix}/lib
-    ac_kde_libraries=$prefix/lib
-  fi
-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/kde2/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 /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-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
-ac_kde_libraries="$kde_libdir"
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = 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="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
-
-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_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)
-
-AC_SUBST(AUTODIRS)
-])
-
-AC_DEFUN(KDE_CHECK_EXTRA_LIBS,
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes, [  --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, [  --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");
-    return 0;
-    }
-EOF
-
- ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- 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
-
-  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
- kde_cxxflags_safe="$CXXFLAGS"
-])
-
-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_CHECK_KIMGIO,
-[
-   AC_REQUIRE([AC_BASE_PATH_KDE])
-   AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-   AC_REQUIRE([AC_FIND_TIFF])
-   AC_REQUIRE([AC_FIND_JPEG])
-   AC_REQUIRE([AC_FIND_PNG])
-   AC_REQUIRE([KDE_CREATE_LIBS_ALIASES])
-
-   if test "$1" = "existance"; then
-     AC_LANG_SAVE
-     AC_LANG_CPLUSPLUS
-     kde_save_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries $LIBJPEG $LIBTIFF $LIBPNG $LIBQT -lm"
-     AC_CHECK_LIB(kimgio, kimgioRegister, [
-      LIBKIMGIO_EXISTS=yes],LIBKIMGIO_EXISTS=no)
-      LIBS="$kde_save_LIBS"
-      AC_LANG_RESTORE
-   else
-      LIBKIMGIO_EXISTS=yes
-   fi
-
-   if test "$LIBKIMGIO_EXISTS" = "yes"; then
-     LIB_KIMGIO='-lkimgio'
-   else
-     LIB_KIMGIO=''
-   fi
-   AC_SUBST(LIB_KIMGIO)
-])
-
-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 = 2; then
-   LIB_KDECORE='-lkdecore'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFORMULA='-lkformula'
-   AC_SUBST(LIB_KFORMULA)
-   LIB_KIO='-lkio'
-   AC_SUBST(LIB_KIO)
-   LIB_KSYCOCA='-lksycoca'
-   AC_SUBST(LIB_KSYCOCA)
-   LIB_SMB='-lsmb'
-   AC_SUBST(LIB_SMB)
-   LIB_KFILE='-lkfile'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab'
-   AC_SUBST(LIB_KAB)
-   LIB_KHTML='-lkhtml'
-   AC_SUBST(LIB_KHTML)
-   LIB_KSPELL='-lkspell'
-   AC_SUBST(LIB_KSPELL)
-   LIB_KPARTS='-lkparts'
-   AC_SUBST(LIB_KPARTS)
-   LIB_KWRITE='-lkwrite'
-   AC_SUBST(LIB_KWRITE)
-else
-   LIB_KDECORE='-lkdecore -lXext $(LIB_QT)'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui $(LIB_KDECORE)'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFM='-lkfm $(LIB_KDECORE)'
-   AC_SUBST(LIB_KFM)
-   LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)'
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)'
-   AC_SUBST(LIB_KAB)
-fi
-])
-
-AC_DEFUN(AC_PATH_KDE,
-[
-  AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check, [  --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 obsolete
-AC_DEFUN(AC_CHECK_SETENV,
-[
-   AC_OBSOLETE([$0], [; instead use AC_CHECK_FUNCS([setenv unsetenv])])dnl 
-   AC_CHECK_FUNCS([setenv unsetenv])
-])
-
-AC_DEFUN(AC_CHECK_GETDOMAINNAME,
-[
-AC_MSG_CHECKING(for getdomainname)
-AC_CACHE_VAL(ac_cv_func_getdomainname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-char buffer[200];
-getdomainname(buffer, 200);
-],
-ac_cv_func_getdomainname=yes,
-ac_cv_func_getdomainname=no)
-CXXFLAGS="$save_CXXFLAGS"
-LIBS=$kde_safe_LIBS
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_getdomainname)
-
-AC_MSG_CHECKING([if getdomainname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_getdomainname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  ac_cv_proto_getdomainname=no
-else
-  kde_safe_libs=$LIBS
-  LIBS="$LIBS $X_EXTRA_LIBS"
-  AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-
-extern "C" int getdomainname (char *, int);
-],
-[
-char buffer[200];
-getdomainname(buffer, 200);
-],
-  ac_cv_func_getdomainname=yes
-  ac_cv_proto_getdomainname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR([getdomainname unavailable]))
-fi
-LIBS=$kde_safe_libs
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_proto_getdomainname)
-
-if eval "test \"`echo $ac_cv_func_getdomainname`\" = yes"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME, 1, [Define if you have getdomainname])
-fi
-if eval "test \"`echo $ac_cv_proto_getdomainname`\" = no"; then
-  AC_DEFINE(HAVE_GETDOMAINNAME_PROTO, 1,
-  [Define if you have getdomainname prototype])
-fi
-
-])
-
-AC_DEFUN(AC_CHECK_GETHOSTNAME,
-[
-
-AC_MSG_CHECKING([for gethostname])
-AC_CACHE_VAL(ac_cv_func_gethostname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-if test "$GCC" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-char buffer[200];
-gethostname(buffer, 200);
-],
-ac_cv_func_gethostname=yes,
-ac_cv_func_gethostname=no)
-CXXFLAGS="$save_CXXFLAGS"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_gethostname)
-
-AC_MSG_CHECKING([if gethostname needs custom prototype])
-AC_CACHE_VAL(ac_cv_proto_gethostname,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  ac_cv_proto_gethostname=no
-else
-  AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-
-extern "C" int gethostname (char *, int);
-],
-[
-char buffer[200];
-gethostname(buffer, 200);
-],
-  ac_cv_func_gethostname=yes
-  ac_cv_proto_gethostname=yes,
-  AC_MSG_RESULT([fatal error])
-  AC_MSG_ERROR(gethostname unavailable))
-fi
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_proto_gethostname)
-
-if eval "test \"`echo $ac_cv_proto_gethostname`\" = no"; then
-  AC_DEFINE(HAVE_GETHOSTNAME_PROTO, 1,
-  [Define if you have gethostname prototype])
-fi
-if eval "test \"`echo $ac_cv_func_gethostname`\" = yes"; then
-  AC_DEFINE(HAVE_GETHOSTNAME, 1, [Define if you have gethostname])
-fi
-])
-
-AC_DEFUN(AC_CHECK_USLEEP,
-[
-AC_MSG_CHECKING([for usleep])
-AC_CACHE_VAL(ac_cv_func_usleep,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
-#include <unistd.h>
-],
-[
-usleep(200);
-],
-ac_cv_func_usleep=yes,
-ac_cv_func_usleep=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_usleep)
-if eval "test \"`echo $ac_cv_func_usleep`\" = yes"; then
-  AC_DEFINE(HAVE_USLEEP, 1, [Define if you have the usleep function])
-fi
-])
-
-AC_DEFUN(AC_CHECK_RANDOM,
-[
-AC_MSG_CHECKING([for random])
-AC_CACHE_VAL(ac_cv_func_random,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_libs_safe="$LIBS"
-LIBS="$LIBS $LIBUCB"
-AC_TRY_LINK([
-#include <stdlib.h>
-],
-[
-random();
-],
-ac_cv_func_random=yes,
-ac_cv_func_random=no)
-LIBS="$ac_libs_safe"
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($ac_cv_func_random)
-if eval "test \"`echo $ac_cv_func_random`\" = yes"; then
-  AC_DEFINE(HAVE_RANDOM, 1, [Define if you have random])
-fi
-])
-
-AC_DEFUN(AC_FIND_GIF,
-   [AC_MSG_CHECKING([for giflib])
-AC_CACHE_VAL(ac_cv_lib_gif,
-[ac_save_LIBS="$LIBS"
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-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_LANG_C
-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="/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)
-])
-
-AC_DEFUN(AC_FIND_ZLIB,
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-AC_LANG_C
-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>
-],
-            [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_SUBST(LIBZ)
-  AC_MSG_RESULT($ac_cv_lib_z)
-else
-  AC_MSG_ERROR(not found. Check your installation and look into config.log)
-  LIBZ=""
-  AC_SUBST(LIBZ)
-fi
-])
-
-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"
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-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"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_LANG_C
-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_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,
-[
-dnl AC_REQUIRE([AC_CHECK_COMPILERS]) <- breaks with autoconf 2.50
-AC_MSG_CHECKING(whether $CXX supports -$1)
-kde_cache=`echo $1 | sed 'y%.=/+-%___p_%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -$1 -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -$1 -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-])
-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
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-])
-
-AC_DEFUN(AC_CHECK_COMPILERS,
-[
-  AC_ARG_ENABLE(debug,[  --enable-debug          enables debug symbols [default=no]],
-  [
-   if test $enableval = "no"; dnl
-     then
-       kde_use_debug_code="no"
-       kde_use_debug_define=yes
-     else
-       kde_use_debug_code="yes"
-       kde_use_debug_define=no
-   fi
-  ], 
-    [kde_use_debug_code="no"
-      kde_use_debug_define=no
-  ])
-
-  dnl Just for configure --help
-  AC_ARG_ENABLE(dummyoption,[  --disable-debug         disables debug output and debug symbols [default=no]],[],[])
-
-  AC_ARG_ENABLE(strict,[  --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(profile,[  --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 
-
-  if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CFLAGS="-g -O2 $CFLAGS"
-      case $host in
-        *-*-linux-gnu)	
-          CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-        ;;
-      esac
-    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"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $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"])
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      case $host in  dnl
-      *-*-linux-gnu)
-        CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS"
-        ;;
-      esac
-
-      if test "$kde_use_strict_options" = "yes"; then
-        CXXFLAGS="-Wcast-qual -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
-      fi
-
-      if test "$kde_very_strict" = "yes"; then
-        CXXFLAGS="-Wold-style-cast -Wredundant-decls -Wconversion $CXXFLAGS"
-      fi
-    else
-      CXXFLAGS="-O2 $CXXFLAGS"
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG $CXXFLAGS"
-  fi  
-
-  if test "$kde_use_profiling" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(pg,
-    [
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-    ])
-  fi
-    
-  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(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-  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
-
-  # the following is to allow programs, that are known to
-  # have problems when compiled with -O2
-  if test -n "$CXXFLAGS"; then
-      kde_safe_IFS=$IFS
-      IFS=" "
-      NOOPT_CXXFLAGS=""
-      for i in $CXXFLAGS; do
-        case $i in
-          -O*)
-                ;;
-          *)
-                NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS $i"
-                ;;
-        esac
-      done
-      IFS=$kde_safe_IFS
-  fi
-
-  AC_SUBST(NOOPT_CXXFLAGS)
-
-  KDE_CHECK_FINAL
-
-  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-
-  KDE_CXXFLAGS=
-  AC_SUBST(KDE_CXXFLAGS)
-])
-
-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_LANG_SAVE
-AC_LANG_C
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_RESTORE
-
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
-AC_SUBST(KDE_PLUGIN)
-
-AC_ARG_ENABLE(objprelink, [  --enable-objprelink     prelink apps using objprelink (experimental [only tested on linux/386])],
-       kde_use_objprelink=$enableval, kde_use_objprelink=no)
-  if test "x$kde_use_objprelink" = "xyes"; then 
-
-      KDE_FIND_PATH(objprelink, OBJPRELINK, [], [kde_use_objprelink=no])   
-     
-      if test "x$kde_use_objprelink" = "xyes"; then
-      AC_MSG_CHECKING([Patching libtool to run objprelink.])
-      mv libtool libtool.orig
-      cat > libtool <<\EOF
-#! /bin/sh
-for n ; do case $n in
-  *.o)  test -r $n && echo objprelink $n && objprelink $n ;;
-  *.lo) m=`basename $n .lo`".o" && test -r $m && echo objprelink $m && objprelink $m 
-        m=".libs/$m" && test -r $m && echo objprelink $m && objprelink $m ;;
-esac; done
-EOF
-      cat >> libtool libtool.orig
-      rm libtool.orig
-      chmod a+x libtool
-      AC_MSG_RESULT(done)
-	fi
-  fi
-])
-
-AC_DEFUN(KDE_CHECK_TYPES,
-[  AC_CHECK_SIZEOF(int, 4)dnl
-  AC_CHECK_SIZEOF(long, 4)dnl
-  AC_CHECK_SIZEOF(char *, 4)dnl
-  AC_CHECK_SIZEOF(char, 1)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,
-      [  --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
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
-  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_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([argz.h limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv 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="-Wmissing-prototypes -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, [  --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_LANG_C
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-    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, [  --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,
-   [
-    AC_LANG_C
-    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"
-   ])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_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, [  --without-gl            disable 3D GL modes],
-	gl_test=$withval, gl_test="yes")
- if 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_C
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET"
-    CFLAGS="$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 -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET"
-      CFLAGS="$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
-    LDFLAGS="$ac_save_ldflags"
-    CFLAGS="$ac_save_cflags"
-   ])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='-lMesaGL -lMesaGLU $(LIB_X11)'
-       else
-          GLLIB='-lGL -lGLU $(LIB_X11)'
-       fi
-    else
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)'
-       else
-          GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(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])
-
-  AC_ARG_WITH(pam,
-    [  --with-pam[=ARG]        enable support for PAM: ARG=[yes|no|service name]],
-    [ if test "x$withval" = "xyes"; then
-        use_pam=yes
-        pam_service=kde
-      elif test "x$withval" = "xno"; then
-        use_pam=no
-      else
-        use_pam=yes
-        pam_service=$withval
-      fi
-      ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-    ], [
-      AC_CACHE_VAL(ac_cv_path_pam,
-        [ use_pam=no
-          AC_CHECK_LIB(pam, pam_start,
-            [ AC_CHECK_HEADER(security/pam_appl.h, 
-                [ use_pam=yes
-                  pam_service=kde ]) 
-            ], , $LIBDL)
-          ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
-        ])
-    ])
-  eval "$ac_cv_path_pam"
-
-  AC_MSG_CHECKING(for PAM)
-  if test "x$use_pam" = xno; then
-    AC_MSG_RESULT(no)
-    PAMLIBS=""
-  else
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-    PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-
-    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], security/pam_appl.h,
-      [ AC_EGREP_HEADER([const struct pam_message], security/pam_appl.h,
-                        [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
-
-  AC_SUBST(PAMLIBS)
-])
-
-dnl DEF_PAM_SERVICE(arg name, full name, define name)
-AC_DEFUN(DEF_PAM_SERVICE, [
-  AC_ARG_WITH($1-pam,
-    [  --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,
-    [  --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
-
-  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,
-[  --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_MICO,
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_MISC_TESTS])
-AC_MSG_CHECKING(for MICO)
-
-if test -z "$MICODIR"; then
-    kde_micodir=/usr/local
- else
-    kde_micodir="$MICODIR"
-fi
-
-AC_ARG_WITH(micodir,
-  [  --with-micodir=micodir  where mico is installed ],
-  kde_micodir=$withval,
-  kde_micodir=$kde_micodir
-)
-
-AC_CACHE_VAL(kde_cv_mico_incdir,
-[
-  mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes"
-AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir)
-
-])
-kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'`
-
-if test ! -r  $kde_micodir/include/CORBA.h; then
-  AC_MSG_ERROR([No CORBA.h found, specify another micodir])
-fi
-
-AC_MSG_RESULT($kde_micodir)
-
-MICO_INCLUDES=-I$kde_micodir/include
-AC_SUBST(MICO_INCLUDES)
-MICO_LDFLAGS=-L$kde_micodir/lib
-AC_SUBST(MICO_LDFLAGS)
-micodir=$kde_micodir
-AC_SUBST(micodir)
-
-AC_MSG_CHECKING([for MICO version])
-AC_CACHE_VAL(kde_cv_mico_version,
-[
-AC_LANG_C
-cat >conftest.$ac_ext <<EOF
-#include <stdio.h>
-#include <mico/version.h>
-int main() {
-
-   printf("MICO_VERSION=%s\n",MICO_VERSION);
-   return (0);
-}
-EOF
-ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest'
-if AC_TRY_EVAL(ac_compile); then
-  if eval `./conftest 2>&5`; then
-    kde_cv_mico_version=$MICO_VERSION
-  else
-    AC_MSG_ERROR([your system is not able to execute a small application to
-    find MICO version! Check $kde_micodir/include/mico/version.h])
-  fi
-else
-  AC_MSG_ERROR([your system is not able to compile a small application to
-  find MICO version! Check $kde_micodir/include/mico/version.h])
-fi
-])
-
-dnl installed MICO version
-mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "x$1" = "x"; then
- req_version="2.3.0"
-else
- req_version=$1
-fi
-
-dnl required MICO version
-req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
-req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
-req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
-
-if test "$mico_v_maj" -lt "$req_v_maj" || \
-   ( test "$mico_v_maj" -eq "$req_v_maj" && \
-        test "$mico_v_mid" -lt "$req_v_mid" ) || \
-   ( test "$mico_v_mid" -eq "$req_v_mid" && \
-        test "$mico_v_min" -lt "$req_v_min" )
-
-then
-  AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \
-at least is required. You should upgrade MICO.])
-else
-  AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)])
-fi
-
-LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL"
-AC_SUBST(LIBMICO)
-if test -z "$IDL"; then
-  IDL='$(kde_bindir)/cuteidl'
-fi
-AC_SUBST(IDL)
-IDL_DEPENDENCIES='$(kde_includes)/CUTE.h'
-AC_SUBST(IDL_DEPENDENCIES)
-
-idldir="\$(includedir)/idl"
-AC_SUBST(idldir)
-
-])
-
-AC_DEFUN(KDE_CHECK_MINI_STL,
-[
-AC_REQUIRE([KDE_CHECK_MICO])
-
-AC_MSG_CHECKING(if we use mico's mini-STL)
-AC_CACHE_VAL(kde_cv_have_mini_stl,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_cxxflags="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $MICO_INCLUDES"
-AC_TRY_COMPILE(
-[
-#include <mico/config.h>
-],
-[
-#ifdef HAVE_MINI_STL
-#error "nothing"
-#endif
-],
-kde_cv_have_mini_stl=no,
-kde_cv_have_mini_stl=yes)
-CXXFLAGS="$kde_save_cxxflags"
-AC_LANG_RESTORE
-])
-
-if test "x$kde_cv_have_mini_stl" = "xyes"; then
-   AC_MSG_RESULT(yes)
-   $1
-else
-   AC_MSG_RESULT(no)
-   $2
-fi
-])
-
-])
-
-
-AC_DEFUN(KDE_CHECK_LIBPTHREAD,
-[
-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
-[
-    AC_ARG_ENABLE(kernel-threads, [  --enable-kernel-threads Enable the use of the LinuxThreads port on FreeBSD/i386 only.],
-	kde_use_kernthreads=$enableval, kde_use_kernthreads=no)
-
-    if test "$kde_use_kernthreads" = "yes"; then
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_CFLAGS="$CXXFLAGS"
-      CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
-      CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
-      AC_CHECK_HEADERS(pthread/linuxthreads/pthread.h)
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      CFLAGS="$ac_save_CFLAGS"
-      if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
-        kde_use_kernthreads=no
-      else
-        dnl Add proper -I and -l statements
-        AC_CHECK_LIB(lthread, pthread_join, [LIBPTHREAD="-llthread -llgcc_r"]) dnl for FreeBSD
-        if test "x$LIBPTHREAD" = "x"; then
-          kde_use_kernthreads=no
-        else
-          USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
-        fi
-      fi
-    else 
-      USE_THREADS=""
-      if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-pthread"] )
-      fi
-    fi
-
-    case $host_os in
- 	solaris*)
-		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
-                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-                echo "Setting Solaris pthread compilation options"
-    		;;
-        freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                echo "Setting FreeBSD pthread compilation options"
-                ;;
-        aix*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                LIBPTHREAD="$LIBPTHREAD -lc_r"
-                echo "Setting AIX pthread compilation options"
-                ;;
-        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                USE_THREADS="$USE_THREADS -DPIC -fPIC"
-                echo "Setting Linux pthread compilation options"
-                ;;
-	*)
-		;;
-    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
-    kde_check_threading_default=no
-  else
-    kde_check_threading_default=yes
-  fi
-  AC_ARG_ENABLE(threading, [  --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,
-[
-AC_LANG_SAVE
-AC_LANG_C
-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
-AC_LANG_RESTORE
-
-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,
-[  --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 /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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
-
-PYTHONLIB=-L$python_libdir
-kde_orig_LIBPYTHON=$LIBPYTHON
-if test -z "$LIBPYTHON"; then
-  LIBPYTHON=-lpython$version
-fi
-
-python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-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(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(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
-	[AC_MSG_WARN([it seems, Python depends on another library.
-    Pleae use \"make LIBPYTHON='-lpython$version -lotherlib'\" 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.1", [KDE_CHECK_PYTHON_INTERN("2.0",
-        [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
-  ])
-])
-
-AC_DEFUN(KDE_CHECK_STL_SGI,
-[
-    AC_MSG_CHECKING([if STL implementation is SGI like])
-    AC_CACHE_VAL(kde_cv_stl_type_sgi,
-    [
-      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_type_sgi=yes,
-   kde_cv_stl_type_sgi=no)
-])
-
-   AC_MSG_RESULT($kde_cv_stl_type_sgi)
-
-   if test "$kde_cv_stl_type_sgi" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   fi
-])
-
-AC_DEFUN(KDE_CHECK_STL_HP,
-[
-    AC_MSG_CHECKING([if STL implementation is HP like])
-    AC_CACHE_VAL(kde_cv_stl_type_hp,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hello World";
-  astring.remove(0, 6); // now astring is "World"
-  return 0;
-], kde_cv_stl_type_hp=yes,
-   kde_cv_stl_type_hp=no)
-])
-   AC_MSG_RESULT($kde_cv_stl_type_hp)
-
-   if test "$kde_cv_stl_type_hp" = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
-   fi
-])
-
-AC_DEFUN(KDE_CHECK_STL,
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-    KDE_CHECK_STL_SGI
-
-    if test "$kde_cv_stl_type_sgi" = "no"; then
-       KDE_CHECK_STL_HP
-
-       if test "$kde_cv_stl_type_hp" = "no"; then
-         AC_MSG_ERROR("no known STL type found")
-       fi
-    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(KDE_CHECK_ANSI,
-[
-])
-
-AC_DEFUN(KDE_CHECK_INSURE,
-[
-  AC_ARG_ENABLE(insure, [  --enable-insure             use insure++ for debugging [default=no]],
-  [
-  if test $enableval = "no"; dnl
-	then ac_use_insure="no"
-	else ac_use_insure="yes"
-   fi
-  ], [ac_use_insure="no"])
-
-  AC_MSG_CHECKING(if we will use Insure++ to debug)
-  AC_MSG_RESULT($ac_use_insure)
-  if test "$ac_use_insure" = "yes"; dnl
-       then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "????
-   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
-
-if test -s $srcdir/inst-apps; then
-  ac_topsubdirs="`cat $srcdir/inst-apps`"
-else
-  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)
-  if test $install_it = "yes"; then
-    TOPSUBDIRS="$TOPSUBDIRS $i"
-  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
-])
-
-AC_DEFUN(KDE_CHECK_NEWLIBS,
-[
-
-])
-
-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_LANG_SAVE
-AC_LANG_C
-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_LANG_RESTORE
-])
-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
-])
-
-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,
-[
-AC_LANG_C
-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] )
-])
-
-dnl -------------------------------------------------------------------------
-dnl See if the compiler supports a template repository         bero@redhat.de
-dnl -------------------------------------------------------------------------
-AC_DEFUN(KDE_COMPILER_REPO,
-[
-  REPO=""
-  NOREPO=""
-
-  KDE_CHECK_COMPILER_FLAG(frepo,
-   [
-     REPO="-frepo"
-     NOREPO="-fno-repo"
-   ])
-
-  if test -z "$REPO"; then
-  KDE_CHECK_COMPILER_FLAG(instances=explicit,
-  [
-     REPO="-instances=explicit"
-     NOREPO="-instances=extern"
-  ])
-  fi
-
-  if test -n "$REPO"; then
-     AC_DEFINE_UNQUOTED(HAVE_TEMPLATE_REPOSITORY, 1,
-		[C++ compiler supports template repository])
-     $1
-  fi
-
-  AC_SUBST(REPO)
-  AC_SUBST(NOREPO)
-])
-
-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)
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN(KDE_CHECK_QWSPRITEFIELD,
-[
-  KDE_CHECK_HEADER(QwSpriteField.h, ,
-  [
-    AC_MSG_WARN([you don't have QwSpriteField.h somewhere. Please install
-       QwSpriteField out of kdesupport.])
-      $1
-  ])
-])
-
-AC_DEFUN(KDE_FAST_CONFIGURE,
-[
-  dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, [  --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
-  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_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_LIBS="$LIBS"
-     LIBS="$LIBS $all_libraries"
-     case $host_os in
-      aix*) LIBS="-brtl $LIBS"
-	test "$GCC" = yes && LIBS="-Wl,$LIBS"
-	;;
-     esac
-     AC_CHECK_LIB($1, $2, $3, $4, $5)
-     LIBS="$kde_save_LIBS"
-])
-
-
-
-
-AC_DEFUN(KDE_CHECK_INITGROUPS,
-[ 
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS(initgroups)
-  if test "x$ac_cv_func_initgroups" = "xyes"; then
-    case $host_os in
-      aix*) AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-            AC_MSG_CHECKING([for initgroups prototype])
-            AC_CACHE_VAL(kde_cv_check_initgroups_proto,
-            [ AC_TRY_COMPILE(
-              [ #include <grp.h>
-              ],
-              [ char buffer[10];
-                gid_t id;
-                int x = initgroups(buffer,id);
-              ],
-              kde_cv_check_initgroups_proto=yes,
-              kde_cv_check_initgroups_proto=no)
-            ])
-            AC_MSG_RESULT($kde_cv_check_initgroups_proto)
-            AC_LANG_RESTORE
-            ;;
-      *)
-            kde_cv_check_initgroups_proto=yes
-            ;;
-    esac
-  else
-    kde_cv_check_initgroups_proto=no
-  fi
-  if test "x$kde_cv_check_initgroups_proto" = "xyes"; then
-    kde_check_initgroups_proto=1
-  else
-    kde_check_initgroups_proto=0
-  fi
-  AC_DEFINE_UNQUOTED(HAVE_INITGROUPS_PROTO,$kde_check_initgroups_proto,
-           [initgroups may exist but not its prototype (e.g. AIX<4.3.3:8)])
-])
-
-
-AC_DEFUN(KDE_CHECK_JAVA_DIR,
-[
-AC_MSG_CHECKING([for Java directory])
-
-AC_ARG_WITH(java,
-[  --with-java=javadir     use java installed in javadir, --without-java disables ],
-[  ac_java_dir=$withval
-], ac_java_dir=""
-)
-
-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_cv_java_bindir=no
-   kde_cv_java_includedir=no
-   kde_cv_java_libjvmdir=no
-   kde_cv_java_libhpidir=no
-else
-  if test "x$ac_java_dir" = x; then
-    dnl No option set -> look in $PATH
-    AC_CACHE_VAL(kde_cv_java_bindir,
-    [
-      dnl First look for javac in $PATH. If not found we'll look at the option.
-      KDE_FIND_PATH(javac, JAVAC, [], [])
-      if test -n "$JAVAC"; then
-          kde_cv_java_bindir=`echo $JAVAC | sed -e 's,/javac$,/,'`
-          dnl this substitution might not work - well, we test for jni.h below
-          kde_cv_java_includedir=`echo $kde_cv_java_bindir | sed -e 's,bin/$,include/,'`
-      else
-          kde_cv_java_bindir=no
-      fi
-    ])
-  else
-    dnl config option set
-    kde_cv_java_bindir=$ac_java_dir/bin
-    kde_cv_java_includedir=$ac_java_dir/include
-  fi
-fi
-
-dnl Look for libjvm.so
-kde_cv_java_libjvmdir=`find $kde_cv_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-dnl Look for libhpi.so and avoid green threads
-kde_cv_java_libhpidir=`find $kde_cv_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,'`
-
-dnl At this point kde_cv_java_bindir and kde_cv_java_includedir are either set or "no"
-if test ! "x$kde_cv_java_bindir" = xno; then
-
-  dnl Now check everything's fine under there
-
-  if test ! -x "$kde_cv_java_bindir/javac"; then
-    AC_MSG_ERROR([javac not found under $kde_cv_java_bindir - it seems you passed a wrong --with-java.])
-  fi
-  if test ! -x "$kde_cv_java_bindir/javah"; then
-    AC_MSG_ERROR([javah not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-  if test ! -x "$kde_cv_java_bindir/jar"; then
-    AC_MSG_ERROR([jar not found under $kde_cv_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_includedir/jni.h"; then
-    AC_MSG_ERROR([jni.h not found under $kde_cv_java_includedir. Use --with-java or --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_libjvmdir/libjvm.so"; then
-    AC_MSG_ERROR([libjvm.so not found under $kde_cv_java_libjvmdir. Use --without-java.])
-  fi
-  if test ! -r "$kde_cv_java_libhpidir/libhpi.so"; then
-    AC_MSG_ERROR([libhpi.so not found under $kde_cv_java_libhpidir. Use --without-java.])
-  fi
-
-  jni_includes="-I$kde_cv_java_includedir"
-  dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-  dnl and under linux here..
-  test -d "$kde_cv_java_includedir/linux" && jni_includes="$jni_includes -I$kde_cv_java_includedir/linux"
-  test -d "$kde_cv_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_cv_java_includedir/genunix"
-
-  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
-	    ],[ 
-	    ],[ AC_MSG_ERROR([Incorrect version of $kde_cv_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 ])
-	    ])
-
-  CXXFLAGS="$ac_cxxflags_safe"    
-  AC_LANG_RESTORE
-
-  dnl All tests ok, inform and subst the variables
-  AC_MSG_RESULT([javac/javah/jar in $kde_cv_java_bindir, jni.h in $kde_cv_java_includedir])
-
-  JAVAC=$kde_cv_java_bindir/javac
-  AC_SUBST(JAVAC)
-  JAVAH=$kde_cv_java_bindir/javah
-  AC_SUBST(JAVAH)
-  JAR=$kde_cv_java_bindir/jar
-  AC_SUBST(JAR)
-  AC_SUBST(jni_includes)
-  JVMLIBS="-L$kde_cv_java_libjvmdir -ljvm -L$kde_cv_java_libhpidir -lhpi"
-  AC_SUBST(JVMLIBS)
-fi
-])
diff --git a/bibletime-doc/admin/am_edit b/bibletime-doc/admin/am_edit
deleted file mode 100644
index f7a0e86..0000000
--- a/bibletime-doc/admin/am_edit
+++ /dev/null
@@ -1,1937 +0,0 @@
-#!/usr/bin/perl
-
-# 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 :
-#    ...
-#
-# 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>
-#
-# I've puddled around with automoc and produced something different
-# 1999-02-01 John Birch <jb.nz@writeme.com>
-#       * Rewritten automoc to cater for more than just moc file expansion
-#         Version 0.01 does the same as automoc at this stage.
-# 1999-02-18 jb
-#       * We must always write a Makefile.in file out even if we fail
-#         because we need the "perl autokmake" in the AUTOMAKE so that a
-#         "make" will regenerate the Makefile.in correctly.
-#         Reworked moc file checking so that missing includes in cpp
-#         will work and includes in cpp when using use_automoc will also
-#         work.
-# 1999-02-23 jb
-#       * Added POFILE processing and changed the USE_AUTOMOC tag to
-#         AUTO instead.
-# ... See ChangeLog for more logs
-
-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 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_SUBDIRS();
-sub tag_ICON();
-sub tag_CLOSURE();
-sub tag_DIST();
-
-# 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;
-
-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",
-	        "Current Maintainer Stephan Kulow\n\n";
-        exit 0;
-    }
-    elsif (/^--verbose$|^-v$/)
-    {
-        $verbose = 1;       # Oh is there a problem...?
-    }
-    elsif (/^-p(.+)$|^--path=(.+)$/)
-    {
-        $thisProg = "$1/".basename($thisProg) if($1);
-        $thisProg = "$2/".basename($thisProg) if($2);
-        warn ("$thisProg doesn't exist\n")      if (!(-f $thisProg));
-        $pathoption=1;
-    }
-    elsif (/^--help$|^-h$/)
-    {
-        print STDOUT "Usage $thisProg [OPTION] ... [dir/Makefile.in]...\n",
-                "\n",
-                "Patches dir/Makefile.in generated from automake\n",
-                "(where dir can be a full or relative directory name)",
-                "\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",
-	        "  --no-final         don't patch for --enable-final\n",
-                "                     called from is not the one to be used\n";
-	
-        exit 0;
-    }
-    elsif (/^--no-final$/)
-    {
-	$use_final = 0;
-        $thisProg .= " --no-final";
-    }
-    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 user enter input files\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 %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 $allidls = "";
-    local $alluis = "";
-    local $idl_output = "";# lists all idl generated files for cleantarget
-    local $ui_output = "";# lists all uic generated files for cleantarget
-
-    local %depedmocs = ();
-    
-    local $metasourceTags = 0;
-    local $dep_files      = "";
-    local $dep_finals     = "";
-    local %target_adds    = (); # the targets to add
-    local $kdelang        = "";
-    local @cleanfiles     = ();
-    local $cleanMoc       = "";
-    local $closure_output = "";
-
-    $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;
-        $depedmocs{$program} = "";
-        $important{$program} = "";
-	tag_IDLFILES();             # Sorts out idl rules
-	tag_CLOSURE();
-        tag_METASOURCES ();         # Sorts out the moc rules
-	tag_UIFILES();             # Sorts out ui rules
-        if ($sources_changed{$program}) {
-            my $lookup = "$program" . '_SOURCES\s*=\s*(.*)';
-            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();
-
-    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 ($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_meta_classes();
-    tag_FINAL() if (!$kdeopts{"nofinal"});
-
-    my $final_lines = "final:\n\t\$(MAKE) ";
-    my $nofinal_lines = "no-final:\n\t\$(MAKE) ";
-
-    foreach $program (@programs) {
-        
-        my $lookup = "$program\_OBJECTS.*=[^\n]*";
-        
-        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)\" ";
-            $nofinal_lines .= "$program\_OBJECTS=\"\$($program\_nofinal\_OBJECTS)\" ";
-        } else {
-            $new = "$program\_OBJECTS = " . $realObjs{$program};
-        }
-        substituteLine ($lookup, $new);
-    }
-    appendLines($final_lines . "all-am");
-    appendLines($nofinal_lines . "all-am");
-    
-    my $lookup = 'DEP_FILES\s*=([^\n]*)';
-    if ($MakefileData =~ /\n$lookup\n/o) {
-        $depfiles = $1;
-        
-        if ($dep_finals) {
-            $lines  = "\@KDE_USE_FINAL_TRUE\@DEP_FILES = $dep_files $dep_finals \034\t$depfiles\n";
-            $lines .= "\@KDE_USE_FINAL_FALSE\@DEP_FILES = $dep_files $depfiles\n";
-        } else {
-            $lines = "DEP_FILES = $dep_files $depfiles\n";
-        }
-        
-        substituteLine($lookup, $lines);
-    }
-    
-    my $cvs_lines = "cvs-clean:\n";
-    $cvs_lines .= "\t\$(MAKE) -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 ";
-
-    # 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";
-      my $lookup = "install-data-am:\s*(.*)";
-      if ($MakefileData =~ /\n$lookup\n/) {
-        my $newdeps = $1;
-	$newdeps =~ s/\s*install-kde_moduleLTLIBRARIES\s*/ /g;
-	substituteLine($lookup, "install-data-am: " . $newdeps);
-      }
-    }
-    
-    my $lines = "";
-
-    foreach $add (keys %target_adds) {
-        my $lookup = quotemeta($add) . ":\s*(.*)";
-        if ($MakefileData =~ /\n$lookup\n/) {
-            substituteLine($lookup, "$add: " . $target_adds{$add} . $1);
-        } else {
-            $lines .= "$add: " . $target_adds{$add} . "\n";
-        }
-    }
-    if ($lines) {
-        appendLines($lines);
-    }
-
-    my $found = 1;
-    
-    while ($found) {
-        if ($MakefileData =~ m/\n(.*)\$\(CXXFLAGS\)(.*)\n/) {
-            my $vor = $1;   # "vor" means before in German
-            my $nach = $2; # "nach" means after in German
-            my $lookup = quotemeta("$1\$(CXXFLAGS)$2");
-            my $replacement = "$1\$(KCXXFLAGS)$2";
-            $MakefileData =~ s/$lookup/$replacement/;
-            $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
-            $replacement = "$vor\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$nach";
-            substituteLine($lookup, $replacement);
-        } else {
-            $found = 0;
-        }
-    }
-
-    $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=link) (\$\(CXXLD\).*\$\(KCXXFLAGS\))';
-    
-    if ($MakefileData =~ m/$lookup/ ) {
-        $MakefileData =~ s/$lookup/$1 --tag=CXX $2/;
-    }
-
-    $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=compile) (\$\(CXX\).*\$\(KCXXFLAGS\))';
-    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;
-}
-
-#-----------------------------------------------------------------------------
-
-# 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 "Could not open $makefileDir/$makefile: $!\n";
-    # 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.
-    $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{"nofinal"} = !$use_final; # default
-
-    if ($MakefileData =~ /\nKDE_OPTIONS\s*=\s*([^\n]*)\n/) {
-        local @kde_options = split(/[\s\034]/, $1);
-        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 @list=split(' ', $1);
-	foreach $ext (@list) {
-	    if ($ext =~ /^\.$cppExt$/) {
-		$cxxsuffix = $ext;
-		$cxxsuffix =~ s/\.//g;
-		print STDOUT "will use suffix $cxxsuffix\n" if ($verbose);
-		last;
-	    }
-	}
-    }
-                                                     
-    while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=[ \t\034]*([^\n]*)\n/g) {
-        
-        my $program = $1;
-        my $objs = $2; # safe them
-        
-        my $ocv = 0;
-        
-        my @objlist = split(/[\s\034]+/, $objs);
-        foreach $obj (@objlist) {
-            if ($obj =~ /\$\((\S+)\)/ ) {
-                my $variable = $1;
-                if ($variable !~ 'OBJEXT') {
-                    $ocv = 1;
-                }
-            }
-        }
-        
-        next if ($ocv);
-        
-        $program =~ s/^am_// if ($program =~ /^am_/);
-        
-        print STDOUT "found program $program\n" if ($verbose);
-        push(@programs, $program);
-        
-        $realObjs{$program} = $objs;
-        
-        if ($MakefileData =~ /\n$program\_SOURCES\s*=\s*(.*)\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 = '\nDEPDIR\s*=.*';
-    if ($MakefileData !~ /($lookup)\n/o) {
-        $lookup = '\nbindir\s*=.*';
-        if ($MakefileData =~ /($lookup)\n/) {
-            substituteLine ($lookup, "DEPDIR = .deps\n$1");
-        }
-    } else {
-        print STDERR "$printname defines DEPDIR. This means you're using automake > 1.4 - this is not supported!\n";
-    }
-
-    my @marks = ('MAINTAINERCLEANFILES', 'CLEANFILES', 'DISTCLEANFILES');
-    foreach $mark (@marks) {
-        while ($MakefileData =~ /\n($mark)\s*=\s*([^\n]*)/g) {
-            foreach $file (split('[\034\s]', $2)) {
-                $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*=\s*(.*)';
-    return 1    if ($MakefileData !~ /($lookup)\n/o);
-    print STDOUT "META_INCLUDE processing <$1>\n"       if ($verbose);
-
-    my $headerStr = $2;
-    removeLine ($lookup, $1);
-
-    $headerStr =~ tr/\034/ /;
-    my @headerlist = split(' ', $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 $mocsources = "";
-        
-        my @progsources = split(/[\s\034]+/, $sources{$program});
-        my %sourcelist = ();
-        
-        foreach $source (@progsources) {
-            my $suffix = $source;
-            $suffix =~ s/^.*\.([^\.]+)$/$1/;
-            
-            if (defined($sourcelist{$suffix})) {
-                $sourcelist{$suffix} .= " " . $source;
-            } else {
-                $sourcelist{$suffix} .= $source;
-            }
-        }
-        
-        foreach $suffix (keys %sourcelist) {
-            
-            # See if this file contains c++ code. (ie Just check the files suffix against
-            my $suffix_is_cxx = 0;
-            if($suffix =~ /($cppExt)$/) {
-              $cxx_suffix = $1;
-              $suffix_is_cxx = 1;
-            }
-            
-            my $mocfiles_in = ($suffix eq $cxxsuffix) &&
-              defined($depedmocs{$program});
-            
-            my @sourcelist = split(/[\s\034]+/, $sourcelist{$suffix});
-            
-            if ((@sourcelist == 1 && !$mocfiles_in) || $suffix_is_cxx != 1 ) {
-                
-                # we support IDL on our own
-                if ($suffix =~ /^skel$/ || $suffix =~ /^stub/ || $suffix =~ /^h$/
-                    || $suffix =~ /^ui$/ ) {
-                    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 ";
-                }
-            }
-            
-            $handling = "$program.all_$suffix.$suffix: \$(srcdir)/Makefile.in " . $source_deps . " ";
-            
-            if ($mocfiles_in) {
-                $handling .= $depedmocs{$program};
-                foreach $mocfile (split(' ', $depedmocs{$program})) {
-                    if ($mocfile =~ m/\.$suffix$/) {
-                        $mocsources .= " " . $mocfile;
-                    }
-                }
-            }
-            
-            $handling .= "\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} . " $mocsources; 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");
-            $finalObjs{$program} .= "$program.all_$suffix.";
-            if ($program =~ /_la$/) {
-                $finalObjs{$program} .= "lo ";
-            } else {
-                $finalObjs{$program} .= "o ";
-            }
-        }
-    }
-    
-    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";
-        }
-    }
-}
-
-# 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 @deped            = ();  # 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/o);
-	    $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;
-        $depedmocs{$program} = join (".moc.$cxxsuffix " , @newObs) . ".moc.$cxxsuffix";
-        foreach $file (@newObs) {
-            $dep_files .= " \$(DEPDIR)/$file.moc.P";
-        }
-    }
-    if (@deped) {
-        $depedmocs{$program} .= " ";
-        $depedmocs{$program} .= join('.moc ', @deped) . ".moc";
-        $depedmocs{$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+&&\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;
-    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);
-
-  my $lines = "SUBDIRS =$subdirs\n";
-  substituteLine('SUBDIRS\s*=.*', $lines);
-  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$/);
-        
-        if ($source =~ m/\.stub$/ || $skel) {
-            
-            my $qs = quotemeta($source);
-            $sources{$program} =~ s/$qs//;
-            $sources_changed{$program} = 1;
-            
-            print STDOUT "adding IDL file $source\n" if ($verbose);
-            
-            $source =~ s/\.(stub|skel)$//;
-            
-            my $sourcename;
-            
-            if ($skel) {
-                $sourcename = "$source\_skel";
-            } else {
-                $sourcename = "$source\_stub";
-            }
-            
-            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/) {
-                
-                $dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOPIDL_DEPENDENCIES)\n";
-                $dep_lines .= "\t\$(DCOPIDL) $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; /bin/false )\n";
-                
-                $allidls .= $source . "_kidl ";
-            }
-            
-            if ($allidls !~ /$sourcename/) {
-                
-                if ($skel) {
-                    $dep_lines .= "$sourcename.$cxxsuffix: $source.kidl\n";
-                    $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub $source.kidl\n";
-                } else {
-                    $target_adds{"$sourcename.$cxxsuffix"} .= "$sourcename.h ";
-                    $dep_lines .= "$sourcename.h: $source.kidl\n";
-                    $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-skel $source.kidl\n";
-                }
-                
-                $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_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 $dep_lines = "";
-    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 ($alluis !~ /$source/) {
-
-                $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";
-                    $dep_lines .= "\t\$(UIC) -tr i18n -i $source.h $sourcedir$source.ui | sed -e \"s,i18n( \\\"\\\" ),QString::null,g\" >> $source.$cxxsuffix || rm -f $source.$cxxsuffix\n";
-                } else {
-                    $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix || rm -f $source.$cxxsuffix\n";
-                }
-                $dep_lines .= "\techo '#include \"$source.moc\"' >> $source.$cxxsuffix\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";
-
-                $alluis .= "$source ";
-                $depedmocs{$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_lines) {
-        appendLines($dep_lines);
-    }
-}
-
-sub tag_ICON()
-{
-    my $lookup = '([^\s]*)_ICON\s*=\s*([^\n]*)';
-    my $install = "";
-    my $uninstall = "";
-
-    while ($MakefileData =~ /\n$lookup/og) {
-        my $destdir;
-        if ($1 eq "KDE") {
-            $destdir = "kde_icondir";
-        } else {
-            $destdir = $1 . "dir";
-        }
-        my $iconauto = ($2 =~ /AUTO\s*$/);
-        my @appnames = ();
-        if ( ! $iconauto ) {
-            my @_appnames = split(" ", $2);
-            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/);
-              } else {
-                  foreach $appname (@appnames) {
-                      push(@files, $entry)
-                        if ($entry =~ /-$appname\.xpm/ || $entry =~ /-$appname\.png/);
-                  }
-              }
-        }
-        closedir (THISDIR);
-        
-        my %directories = ();
-        
-        foreach $file (@files) {
-            my $newfile = $file;
-            my $prefix = $file;
-            $prefix =~ s/\.(png|xpm)$//;
-            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',
-               'hisc' => 'hicolor/scalable'
-              );
-            
-            $newfile =~ s@.*-($appname\.(png|xpm?))@$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/o) {
-    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*=\s*(.*)';
-	if ($MakefileData =~ /\n$lookup\n/o) {
-	  $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  test ! -f \$\$base.gmo || \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\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  test ! -f \$\$base.gmo || \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\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/o);
-    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, ".");
-	next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^#.*#$/);
-	$pofiles =  join(" ", grep(/\.po$/, readdir(THISDIR)));
-        closedir (THISDIR);
-        print STDOUT "pofiles found = $pofiles\n"   if ($verbose);
-	if (-f "charset" && -f "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 = "\n" . $_[0] . ":";
-  if ($MakefileData =~ /($lookup)/) {
-
-    my $install = $MakefileData;
-    $install =~ s/\n/\035/g;
-    $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);
-  }
-}
-
-#---------------------------------------------------------------------------
-sub tag_CLOSURE () {
-    return if ($program !~ /_la$/);
-    
-    my $lookup = quotemeta($realname{$program}) . ":.*?\n\t.*?\\((.*?)\\) .*\n";
-    $MakefileData =~ m/$lookup/;
-    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_DIST () {
-    my %foundfiles = ();
-    opendir (THISDIR, ".");
-    foreach $entry (readdir(THISDIR)) {
-        next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile$$/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/);
-        next if (! -f $entry);
-        next if ($entry =~ /\.moc/ || $entry =~ /\.lo$/ || $entry =~ /\.la$/ || $entry =~ /\.o/);
-        $foundfiles{$entry} = 1;
-    }
-    closedir (THISDIR);
-
-    my @marks = ("EXTRA_DIST", "DIST_COMMON", '\S*_SOURCES', '\S*_HEADERS', 'MAINTAINERCLEANFILES', 'CLEANFILES', 'DISTCLEANFILES', '\S*_OBJECTS');
-    foreach $mark (@marks) {
-        while ($MakefileData =~ /\n($mark)\s*=\s*([^\n]*)/g) {
-            foreach $file (split('[\034\s]', $2)) {
-                $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");
-    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 *=(.*)";
-        if ($MakefileData =~ /\n$lookup\n/o) {
-            substituteLine($lookup, "KDE_DIST=$KDE_DIST\n\nDISTFILES=$1 \$(KDE_DIST)\n");
-        }
-    }
-}
-
-#-----------------------------------------------------------------------------
-# Returns 0 if the line was processed - 1 otherwise.
-# Errors are logged in the global $errorflags
-sub tag_DOCFILES ()
-{
-#    if ($MakefileData =~ /\nSUBDIRS\s*=/) { # subdirs
-#      $MakefileData =~ /\n(.*-recursive:\s*)\n/;
-#      my $orig_rules = $1;
-#      my $rules = $orig_rules;
-#      $rules =~ s/:\s*$//;
-#      substituteLine($orig_rules, "$rules docs-recursive:");
-#      appendLines("docs: docs-recursive docs-am\n");
-#    } else {
-#      appendLines("docs: docs-am\n");
-#    }
-    $target_adds{"all"} .= "docs-am ";
-
-    my $lookup = 'KDE_DOCS\s*=\s*([^\n]*)';
-    goto nodocs    if ($MakefileData !~ /\n$lookup/o);
-    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 =~ /^\#.*\#$/);
-	  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 .= "\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 ! -e \$(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 ! -e \$\$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 ()
-{
-    my @list = ();
-    foreach $dir (@headerdirs)
-    {
-        opendir (SRCDIR, "$dir");
-        @hFiles = grep { /.+\.$hExt$/o } readdir(SRCDIR);
-        closedir SRCDIR;
-        foreach $hf (@hFiles)
-        {
-            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
-            if ( $hfData =~ /{([^}]*)Q_OBJECT/s ) {              ## handle " { friend class blah; Q_OBJECT "
-                push (@list, $hf) unless $1 =~ m://[^\n]*Q_OBJECT[^\n]*$:s;  ## handle "// 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(@deped, $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))
-        {
-            $target_adds{"\$(srcdir)/$cppFile"} .= "$mocFile.moc ";
-            appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile.moc\n");
-            $cleanMoc .= " $mocFile.moc";
-        }
-        else
-        {
-            appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile$mocExt\n");
-            $cleanMoc .= " $mocFile$mocExt";
-        }
-    }
-}
-
-sub make_meta_classes ()
-{
-    return if ($kdeopts{"qtonly"});
-
-    my $cppFile;
-    my $hFile;
-    my $moc_class_headers = "";
-    foreach $program (@programs) {
-	my $mocs = "";
-	my @progsources = split(/[\s\034]+/, $sources{$program});
-	my @depmocs = split(' ', $depedmocs{$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))
-	{
-	    undef $cppFile;
-	    ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
-	    $dir =~ s#^\.#\$(srcdir)#;
-	    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 %depedmocs. 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);
-	    my $sourcename = $program."_meta_unload";
-	    my $ext = ($program =~ /_la$/) ? ".lo" : ".o";
-	    my $srcfile = $sourcename.".$cxxsuffix";
-	    my $objfile = $sourcename.$ext;
-	    $moc_class_headers .= " $srcfile";
-	    my $appl;
-	    $appl  = "$srcfile: $mocs\n";
-	    $appl .= "\t\@echo 'creating $srcfile'\n";
-	    $appl .= "\t\@-rm -f $srcfile\n";
-	    $appl .= "\t\@echo 'static const char * _metalist_$program\[\] = {' > $srcfile\n";
-	    $appl .= "\t\@cat $mocs | grep 'char.*className' | ";
-	    $appl .=  "sed -e 's/.*[^A-Za-z0-9_:]\\([A-Za-z0-9_:]*\\)::className.*\$\$/\\\"\\1\\\",/' | sort | uniq >> $srcfile\n";
-	    $appl .= "\t\@echo '0};' >> $srcfile\n";
-	    $appl .= "\t\@echo '#include <kunload.h>' >> $srcfile\n";
-	    $appl .= "\t\@echo '_UNLOAD($program)' >> $srcfile\n";
-		$appl .= "\n";
-	    
-	    $realObjs{$program} .= " \034" . $objfile . " ";
-	    $sources{$program} .= " $srcfile";
-            $sources_changed{$program} = 1;
-            $dep_files .= " \$(DEPDIR)/$sourcename.P";
-	    appendLines ($appl);
-	}
-	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";
-
-    print FILEOUT "\# $progId - " . '$Revision: 1.1.1.1 $ '  . "\n";
-    $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
-    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
-      $new =~ s/\034/\\\n/g;
-      my $newCount = ($new =~ tr/\n//) + 1;
-      $MakefileData =~ s/\n$lookup/\n#>- $old\n#>\+ $newCount\n$new/;
-    } else {
-      print STDERR "Warning: substitution of \"$lookup\" in $printname failed\n";
-    }
-}
-
-#-----------------------------------------------------------------------------
-
-# Slap new lines on the back of the file.
-sub appendLines ($)
-{
-  my ($new) = @_;
-  $new =~ s/\034/\\\n/g;        # Fix continuation lines
-  my $newCount = ($new =~ tr/\n//) + 1;
-  $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/;
-    }
-}
-
-#-----------------------------------------------------------------------------
diff --git a/bibletime-doc/admin/am_edit.py b/bibletime-doc/admin/am_edit.py
deleted file mode 100644
index a1bb520..0000000
--- a/bibletime-doc/admin/am_edit.py
+++ /dev/null
@@ -1,330 +0,0 @@
-import getopt, string, posixpath, sys, os, os.path, re
-
-# Some global globals...
-verbose     = 0
-thisProg    = posixpath.basename(sys.argv[0])
-if not thisProg: # happy only when running in xemacs ;/
-    thisProg = 'am_edit.py'
-cppsuffixes = ['cpp', 'cc', 'cxx', 'C', 'c++']
-hExt        = ['h', 'H', 'hh', 'hxx', 'h++']
-progId      = "KDE tags expanded automatically by " + thisProg
-use_final   = 1
-dryrun      = 0
-pathoption  = 0
-topdir      = os.path.abspath(os.curdir) + "/"
-foreigndirs = []
-
-class Makefile:
-    def __init__(self, file):
-        # some useful globals for the subroutines called here
-        self.headerdirs = ['.']
-        self.haveAutomocTag   = 0
-
-        self.programs = []
-
-        # lists the objects compiled into $program
-        self.realobjs = {}
-        # lists the sources used for $program
-        self.sources = {}
-        # lists the objects compiled when final
-        self.finalObjs = {}
-        # the binary name of program variable
-        self.realname = {}
-        # lists the idl files used for $program
-        self.idlfiles = {}
-        # lists all idl generated files for cleantarget
-        self.idl_output = ""
-
-        self.depedmocs = {}
-
-        self.dep_files      = ""
-        self.dep_finals     = ""
-        # the targets to add
-        self.target_adds    = {}
-        self.kdelang        = ""
-        self.makefile       = file
-        self.makefileDir    = os.path.dirname(self.makefile)
-        self.options        = {}
-
-
-    NoMakefileAmFound = "found Makefile.in without Makefile.am"
-
-    def findLine(self, line):
-        import types
-        if type(line) is types.StringType:
-            regexp = re.compile(line)
-        else:
-            regexp = line
-        for line in self.lines:
-            match = regexp.match(line)
-            if match:
-                return match
-    
-    def substituteLine(self, old, new):
-        import types
-        if type(old) is types.StringType:
-            regexp = re.compile(old)
-        else:
-            regexp = old
-            
-        for index in range(len(self.lines)):
-            line = self.lines[index]
-            match = regexp.match(line)
-            if match:
-                line = '#>- ' + line
-                newlines = string.split(new, '\n')
-                self.lines[index:index+1] = [line, '#>+ %d' % len(newlines)] + newlines
-                return
-
-    def addTarget(self, target, dependson):
-        if not self.target_adds.has_key(target):
-            self.target_adds[target] = [dependson]
-        else:
-            self.target_adds[target].append(dependson)
-            
-    def appendLines(self, newlines):
-        lines = string.split(newlines, '\n') + ['\n']
-        self.lines.extend(['#>+ %d' % len(lines)] + lines)
-        
-    def restore(self):
-        index = 0
-        while index < len(self.lines):
-            line = self.lines[index]
-            if line[0:3] == '#>+':
-                # the +1 is the comment itself
-                linec = string.atoi(line[3:]) + 1
-                del self.lines[index:index+linec]
-                continue
-            if line[0:3] == '#>-':
-                self.lines[index] = self.lines[index][4:]
-            index = index + 1
-        
-    def initialize(self):
-        global foreigndirs
-
-        os.chdir(self.makefileDir)
-        self.printname = string.replace(self.makefile, topdir, "")
-        self.makefile = os.path.basename(self.makefile)
-
-        if not posixpath.exists("Makefile.am"):
-            raise self.NoMakefileAmFound, self.makefileDir
-
-        for dir in foreigndirs:
-            if dir.match(self.makefileDir):
-                print 'leaving ' + self.makefileDir
-                return 0
-
-        f = open(self.makefile)
-        self.lines = []
-      
-        while 1:
-            line = f.readline()
-            if not line: break
-            self.lines.append(string.rstrip(line))
-
-        f.close()
-        
-        # take out the 
-        self.restore()
-        
-        optionline = re.compile('^\s*(\w+)\s*=\s*([^\n]*)$')
-        linecontinued = re.compile('\\\s*\n')
-        lastline = ''
-
-        index = 0
-        while index < len(self.lines):
-            line = self.lines[index]
-            if linecontinued.search(line):
-                self.lines[index] = linecontinued.sub(' ', line) + self.lines[index+1]
-                continue
-            else:
-                index = index + 1
-
-            match = optionline.search(line)
-            if match:
-                self.options[match.group(1)] = match.group(2)
-
-        if self.options.has_key('KDE_OPTIONS'):
-            options = string.split(self.options['KDE_OPTIONS'])
-            if 'foreign' in options:
-                foreigndirs.append(re.compile(self.makefileDir + "/.*"))
-                return 0
-
-        self.cxxsuffix = ""
-        suffixes = re.compile('^\.SUFFIXES:(.*)$')
-
-        for line in self.lines:
-            match = suffixes.match(line)
-            if match:
-                existing_suffixes = string.split(match.group(1))
-                for suffix in existing_suffixes:
-                    # leave out the .
-                    if suffix[1:] in cppsuffixes:
-                        self.cxxsuffix = suffix[1:]
-                        break
-                if self.cxxsuffix:
-                    break
-
-        search_real_programs = {}
-
-        for option in self.options.keys():
-            if string.rfind(option, '_OBJECTS') > 0:
-
-                program = option[0:string.find(option, '_OBJECTS')]
-                objs = self.options[option]
-
-                variable_in_objects = 0
-
-                objlist = string.split(objs)
-                variable = re.compile('\$\((\w+)\)')
-                for obj in objlist:
-                    match = variable.match(obj)
-                    if match and not match.group(1) == 'OBJEXT':
-                        variable_in_objects = 1
-                        break
-
-                if variable_in_objects:
-                    continue
-
-                if len(program) > 3 and program[3] == 'am_':
-                    program = program[3:]
-
-                if verbose:
-                    print "found program " + program
-
-                self.programs.append(program)
-                self.realobjs[program] = objs
-
-                if self.options.has_key(program + "_SOURCES"):
-                    self.sources[program] = self.options[program + "_SOURCES"]
-                else:
-                    self.sources[program] = ""
-                    sys.stderr.write("found program with no _SOURCES: " + program + '\n')
-
-                # unmask to regexp
-                realprogram = string.replace(program, '_', '.')
-                search_real_programs[program] = re.compile('.*(' + realprogram +
-                                                           ')(\$\(EXEEXT\)?)?:.*\$\(' +
-                                                           program + '_OBJECTS\).*')
-
-                self.realname[program] = "";
-
-        for line in self.lines:
-            if string.find(line, '_OBJECTS') > 0: # just a random piece to not use at _every_ line
-                for program in self.programs:
-                    match = search_real_programs[program].match(line)
-                    if match:
-                        self.realname[program] = match.group(1)
-
-    def finalTouch(self):
-        if self.options.has_key('DEPDIR'):
-            sys.stderr.write(self.printname + " defines DEPDIR. This means you're using automake > 1.4 - this is not supported!")
-        else:
-            # taken out a random variable
-            self.substituteLine('bindir\s*=.*', 'DEPDIR = .deps\nbindir = ' + self.options['bindir'])
-
-        self.appendLines('cvs-clean:\n' +
-                         '\t$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean')
-
-        self.appendLines('kde-rpo-clean:\n'+
-                         '\t-rm -f *.rpo')
-
-        self.addTarget('clean', 'kde-rpo-clean')
-        self.addAllTargets()
-
-    def addAllTargets(self):
-        for target in self.target_adds.keys():
-            match = self.findLine(target + ':\s*(.*)')
-            if match:
-                self.substituteLine(match.re, target + ': ' +
-                                    string.join(self.target_adds[target]) +
-                                    ' ' + match.group(1))
-                    
-    def writeback(self):
-        f = open(self.makefile, 'w')
-        for line in self.lines:
-            f.write(line)
-            f.write('\n')
-        f.close()
-
-    def tag_automake(self):
-        match = self.findLine('^(.*cd \$\(top_srcdir\)\s+&&\s+\$\(AUTOMAKE\).*)$')
-        if not match: return 1
-        self.substituteLine(match.re, match.group(1) + '\n' +
-                       '\tcd $(top_srcdir) && python ' +
-                       thisProg + ' ' + self.printname)
-        
-def main():
-    global use_final, dryrun, pathoption, thisProg, verbose
-
-    optlist, makefiles = getopt.getopt(sys.argv[1:], 'vhp:n', [
-        'version', 'verbose', 'path=', 'help', 'no-final'])
-
-    for option, param in optlist:
-        if option == '--version':
-            print "\n"
-            print thisProg + "$Revision: 1.1.1.1 $"
-            print "This is really free software, unencumbered by the GPL."
-            print "You can do anything you like with it except sueing me."
-            print "Copyright 1998 Kalle Dalheimer <kalle\@kde.org>"
-            print "Concept, design and unnecessary questions about perl"
-            print "     by Matthias Ettrich <ettrich\@kde.org>"
-            print ""
-            print "Making it useful by Stephan Kulow <coolo\@kde.org> and"
-            print "Harri Porten <porten\@kde.org>"
-            print "Updated (Feb-1999), John Birch <jb.nz\@writeme.com>"
-            print "Current Maintainer Stephan Kulow"
-            sys.exit(0)
-        if option == '--verbose' or option == '-v':
-            verbose = 1
-        if option == '-p' or option == '--path':
-            thisProg = param + "/" + thisProg
-            if (not posixpath.exists(thisProg)):
-                sys.stderr.write(thisProg + " doesn't exist\n")
-            pathoption=1
-        if option == '--help' or option == '-h':
-            print "Usage " + thisProg + " [OPTION] ... [dir/Makefile.in]..."
-            print "Patches dir/Makefile.in generated from automake"
-            print "(where dir can be a full or relative directory name)"
-            print "  -v, --verbose      verbosely list files processed"
-            print "  -h, --help         print this help, then exit"
-            print "  --version          print version number, then exit"
-            print "  -p, --path=        use the path to am_edit if the path"
-            print "  --no-final         don't patch for --enable-final"
-            print "                     called from is not the one to be used"
-            sys.exit(0)
-        if option == '--no-final':
-            use_final = 0
-        if option == '-n':
-            dryrun = 1
-
-    if not use_final:
-        thisProg = thisProg + " --no-final"
-
-    if thisProg[0] == '/' and not pathoption:
-        sys.stderr.write( "Illegal full pathname call performed...\n"
-                          "The call to \"" + thisProg + "\"\n"
-                          "would be inserted in some Makefile.in.\n"
-                          "Please use option --path.\n")
-        sys.exit(1)
-
-    if len(makefiles) == 0:
-        import find
-        makefiles = find.find('Makefile.in')
-
-    for index in range(len(makefiles)):
-        if not makefiles[index][0] == '/':
-            makefiles[index] = os.path.normcase(os.path.abspath(makefiles[index]))
-
-    makefiles.sort()
-    for file in makefiles:
-        makefile = Makefile(file)
-        try:
-            makefile.initialize()
-            makefile.tag_automake()
-            makefile.finalTouch()
-            makefile.writeback()
-        except Makefile.NoMakefileAmFound, param:
-            if verbose: print Makefile.NoMakefileAmFound + ' in ' + param
-
-main()
diff --git a/bibletime-doc/admin/conf.change.pl b/bibletime-doc/admin/conf.change.pl
deleted file mode 100644
index 7793be4..0000000
--- a/bibletime-doc/admin/conf.change.pl
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/perl -w
-
-# 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@ifh.de>
-
-# 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 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'
-	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 section.*/) {
-          $flag = 4;
-          insert_main_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;
-die "autoconf 2.50 is currently not supported" if  $ac_version == 250;
-
-sub insert_main_loop {
-    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" "\$ac_given_srcdir" "\$ac_given_INSTALL"
-fi
-rm -f \$ac_cs_root.s*
-
-EOF
-    return;
-}
diff --git a/bibletime-doc/admin/config.guess b/bibletime-doc/admin/config.guess
deleted file mode 100755
index 378eab8..0000000
--- a/bibletime-doc/admin/config.guess
+++ /dev/null
@@ -1,1368 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-03-30'
-
-# 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.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# 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, 93, 94, 95, 96, 97, 98, 99, 2000
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break
-	  fi
-	done
-	rm -f $dummy.c $dummy.o $dummy.rel
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
-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.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	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.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	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;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	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 ;;
-    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=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		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 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > 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 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    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)
-	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 $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    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
-		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 $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		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])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              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 $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >$dummy.c
-	#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 $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*: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 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	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*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
-	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/
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# 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
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-int main (int argc, char *argv[]) {
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	;;
-    ppc:Linux:*:*)
-	# Determine Lib Version
-	cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unknown\n");
-#endif
-  return 0;
-}
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		./$dummy | grep 1\.99 > /dev/null
-		if test "$?" = 0 ; then LIBC="libc1" ; fi
-	fi
-	rm -f $dummy.c $dummy
-	echo powerpc-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    alpha:Linux:*:*)
-	cat <<EOF >$dummy.s
-	  .data
-	  \$Lformat:
-		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-	   .text
-		.globl main
-		.align 4
-		.ent main
-	    main:
-		.frame \$30,16,\$26,0
-		ldgp \$29,0(\$27)
-		.prologue 1
-		.long 0x47e03d80 # implver \$0
-		lda \$2,-1
-		.long 0x47e20c21 # amask \$2,\$1
-		lda \$16,\$Lformat
-		mov \$0,\$17
-		not \$1,\$18
-		jsr \$26,printf
-		ldgp \$29,0(\$26)
-		mov 0,\$16
-		jsr \$26,exit
-		.end main
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-		0-0)	UNAME_MACHINE="alpha" ;;
-		1-0)	UNAME_MACHINE="alphaev5" ;;
-		1-1)    UNAME_MACHINE="alphaev56" ;;
-		1-101)	UNAME_MACHINE="alphapca56" ;;
-		2-303)	UNAME_MACHINE="alphaev6" ;;
-		2-307)	UNAME_MACHINE="alphaev67" ;;
-		esac
-		objdump --private-headers $dummy | \
-		  grep ld.so.1 > /dev/null
-		if test "$?" = 0 ; then
-			LIBC="libc1"
-		fi
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i?86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported emulations:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_emulations" in
-	  i?86linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
-		;;
-	  elf_i?86)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  i?86coff)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
-		;;
-	esac
-	# Either a pre-BFD a.out linker (linux-gnuoldld)
-	# or one that does not give us useful --help.
-	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	# If ld does not provide *any* "supported emulations:"
-	# that means it is gnuoldld.
-	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-	case "${UNAME_MACHINE}" in
-	i?86)
-	  VENDOR=pc;
-	  ;;
-	*)
-	  VENDOR=unknown;
-	  ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
-	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:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-	else
-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    i?86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i?86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # 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 ;;
-    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 | 4850:*: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:CPunix: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 ;;
-    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 ;;
-    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]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i?86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >$dummy.c <<EOF
-#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 $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-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/bibletime-doc/admin/config.pl b/bibletime-doc/admin/config.pl
deleted file mode 100644
index 011cd25..0000000
--- a/bibletime-doc/admin/config.pl
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/usr/bin/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@ifh.de>
-#
-# the first part was done by looking at the config.status files generated
-# by configure.
-# 
-my $ac_cs_root=$ARGV[0];
-my $ac_given_srcdir=$ARGV[1];
-my $ac_given_INSTALL=$ARGV[2];
-
-# print "ac_cs_root=$ac_cs_root\n";
-# print "ac_given_srcdir=$ac_given_srcdir\n";
-# print "ac_given_INSTALL=$ac_given_INSTALL\n";
-
-my ($srcdir, $top_srcdir);
-my $INSTALL;
-my $bad_perl = ($] < 5.005);
-
-open(CF, "< $ac_cs_root.subs") || die "can't open $ac_cs_root.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 =~ /s%([^%]*)%([^%]*)%g/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/g% )
-	   || ($pat =~ /s%([^%]*)%([^%]*)%;t/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/;t% )
-	   ) {
-            # form : s%bla%blubb%g
-	    # or     s%bla%blubb%;t t   (newer autoconf)
-	    push @comp_subs, make_closure($1, $2);
-	} elsif ( ($pat =~ /%([^%]*)%d/ )
-	   || ($pat =~ m%/([^/]*)/d% )
-	   ) {
-	    push @comp_subs, make_closure($1, "");
-	} else {
-	    die "Uhh. Malformed pattern in $ac_cs_root.subs ($pat)"
-		unless ( $pat =~ /^\s*$/ );   # ignore white lines
-	}
-    }
-} else {
-    foreach my $pat (@subs) {
-	if (  ($pat =~ /s%([^%]*)%([^%]*)%g/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/g% )
-	   || ($pat =~ /s%([^%]*)%([^%]*)%;t/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/;t% )
-	   ) {
-            # form : s%bla%blubb%g
-	    # or     s%bla%blubb%;t t   (newer autoconf)
-	    push @comp_match, eval "qr/\Q$1\E/";  # compile match pattern
-	    push @comp_subs, $2;
-	} elsif ( ($pat =~ /%([^%]*)%d/ )
-	   || ($pat =~ m%/([^/]*)/d% )
-	   ) {
-	    push @comp_match, eval "qr/\Q$1\E/";
-	    push @comp_subs, "";
-	} else {
-	    die "Uhh. Malformed pattern in $ac_cs_root.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_cs_root.sacfiles") || die "can't open $ac_cs_root.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") { mkdir "$ac_dir", 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%.*/%%;
-    my $configure_input="Generated automatically from $fname by config.pl.";
-    if ($ac_file =~ /.*[Mm]akefile.*/) {
-	$ac_comsub="# ".$configure_input."\n";  # for the first line in $ac_file
-    }
-
-    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, $ac_comsub);
-}
-
-sub patch_file {
-    my ($outf, $infiles, $firstline) = @_;
-    my $filedata;
-    my @infiles=split(' ', $infiles);
-    my $i=0;
-
-    if ($firstline) {
-	$filedata = $firstline;
-    }
-    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) = @_;
-    $pat =~ s/\@/\\@/g;   # @bla@ -> \@bla\@
-    $pat =~ s/\$/\\\$/g;  # $bla -> \$bla
-    $sub =~ s/\@/\\@/g;
-    $sub =~ s/\$/\\\$/g;
-    my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%$pat%$sub%g; }";
-    if ($@) {
-        print "can't create CODE: $@\n";
-    }
-    return $ret;
-}
diff --git a/bibletime-doc/admin/config.sub b/bibletime-doc/admin/config.sub
deleted file mode 100755
index 4ac0c8b..0000000
--- a/bibletime-doc/admin/config.sub
+++ /dev/null
@@ -1,1360 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-03-30'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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>.
-#
-# 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* | storm-chaos* | os2-emx*)
-    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
-		;;
-	-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.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-		| pj | pjl | h8500)
-		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 | z8k | v70 | w65)
-		;;
-
-	# 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[234567]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.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-	      | [cjt]90-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
-		;;
-	# 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
-		;;
-	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 | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	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[34567]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i[34567]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i[34567]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i[34567]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
-		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	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
-		;;
-	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)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
-		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/^[^-]*-//'`
-		;;
-	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
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-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
-		;;
-	t3e)
-		basic_machine=t3e-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	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
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	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
-		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
-	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)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv9)
-		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
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-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* \
-	      | -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*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i[34567]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
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-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
-		;;
-	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
-		;;
-	*-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*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-		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/bibletime-doc/admin/configure.in.min b/bibletime-doc/admin/configure.in.min
deleted file mode 100644
index 4503fec..0000000
--- a/bibletime-doc/admin/configure.in.min
+++ /dev/null
@@ -1,55 +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 Licensednl    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
-
-AC_PATH_KDE
diff --git a/bibletime-doc/admin/debianrules b/bibletime-doc/admin/debianrules
deleted file mode 100755
index 0fd8318..0000000
--- a/bibletime-doc/admin/debianrules
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/perl -w
-
-use Shell qw(mv cp mkdir rm) ;
-use File::Find;
-use Cwd;
-
-$origPwd = `pwd`;
-chomp $origPwd;
-
-
-if (@ARGV && $ARGV[0] eq 'cleanup') {
-
-if (-d "debian/tmp/usr/share/config") {
-	if (! -d "debian/tmp/$kde_confdir") {
-	  system("mv debian/tmp/usr/share/config debian/tmp/$kde_confdir");
-	}
-}
-system("rm -f `find debian/ -name \".anchors\"`");
-system("chmod 755 debian/*preinst debian/*postinst");
-
-exit;
-}
-
-$QTDIR="/usr/share/qt";
-$kde_prefix="/usr";
-$kde_htmldir="$kde_prefix/share/doc/kde/HTML";
-$kde_icondir="$kde_prefix/share/icons";
-$kde_sounddir="$kde_prefix/share/sounds";
-$kde_datadir="$kde_prefix/share/apps";
-$kde_locale="$kde_prefix/share/locale";
-$kde_confdir="/etc/kde2";
-$kde_cgidir="$kde_prefix/lib/cgi-bin";
-$kde_appsdir="$kde_prefix/share/applnk";
-$kde_mimedir="$kde_prefix/share/mimelnk";
-$kde_wallpaperdir="$kde_prefix/share/wallpapers";
-$kde_bindir="$kde_prefix/bin";
-$kde_servicesdir="$kde_prefix/share/services";
-$kde_servicetypesdir="$kde_prefix/share/servicetypes";
-$kde_includedir="$kde_prefix/include/kde";
-$kde_libdir="$kde_prefix/lib";
-$kde_moduledir="$kde_prefix/lib/kde2";
-$mandir="$kde_prefix/share/man"; 
-$infodir="$kde_prefix/share/info";
-$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 (@ARGV && $ARGV[0] eq 'echodirs') {
-  print STDOUT "export kde_htmldir=$kde_htmldir\n";
-  print STDOUT "export kde_appsdir=$kde_appsdir\n";
-  print STDOUT "export kde_icondir=$kde_icondir\n";
-  print STDOUT "export kde_sounddir=$kde_sounddir\n";
-  print STDOUT "export kde_datadir=$kde_datadir\n";
-  print STDOUT "export kde_cgidir=$kde_cgidir\n";
-  print STDOUT "export kde_locale=$kde_locale\n";
-  print STDOUT "export kde_confdir=$kde_confdir\n";
-  print STDOUT "export kde_mimedir=$kde_mimedir\n";
-  print STDOUT "export kde_wallpaperdir=$kde_wallpaperdir\n";
-  print STDOUT "export kde_bindir=$kde_bindir\n";
-  print STDOUT "export kde_servicesdir=$kde_servicesdir\n";
-  print STDOUT "export kde_servicetypesdir=$kde_servicetypesdir\n";
-  print STDOUT "export kde_includedir=$kde_includedir\n";
-  print STDOUT "export kde_libdir=$kde_libdir\n";
-  print STDOUT "export kde_moduledir=$kde_moduledir\n";
-  print STDOUT "export mandir=$mandir\n";
-  print STDOUT "export infodir=$infodir\n";
-  print STDOUT "export QTDIR=$QTDIR\n";
-  print STDOUT "export kde_prefix=$kde_prefix\n";
-  print STDOUT "export INSTALL_DATA=install -p -c -m 644\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 "configkde=--disable-debug --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
-  print STDOUT "configkdevelop=--disable-debug --enable-docbase --enable-kdoc2 --disable-rpath --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html\n";
-  print STDOUT "configkdepim=--disable-debug --with-extra-includes=/usr/include/libpisock --enable-shared --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
-  exit
-}
-
diff --git a/bibletime-doc/admin/depcomp b/bibletime-doc/admin/depcomp
deleted file mode 100755
index 30f36ee..0000000
--- a/bibletime-doc/admin/depcomp
+++ /dev/null
@@ -1,367 +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.
-
-# 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!
-  if "$@" -MT "$object" -MF "$tmpdepfile" -MD -MP; then :
-  else
-    stat=$?
-    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
-  if "$@" -Wp,"$gccflag$tmpdepfile"; then :
-  else
-    stat=$?
-    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).
-    tr ' ' '
-' < "$tmpdepfile" | sed 's/^[^\.]*\.o://' | tr '
-' ' ' >> $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"
-  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.
-  tmpdepfile=`echo "$object" | sed 's/\(.*\)\..*$/\1.u/'`
-  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
-    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).
-    tr ' ' '
-' < "$tmpdepfile" | sed 's/^[^\.]*\.o://' | tr '
-' ' ' >> $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"
-  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"
-  ;;
-
-#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/bibletime-doc/admin/install-sh b/bibletime-doc/admin/install-sh
deleted file mode 100755
index e9de238..0000000
--- a/bibletime-doc/admin/install-sh
+++ /dev/null
@@ -1,251 +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 "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# 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
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/bibletime-doc/admin/libtool.m4.in b/bibletime-doc/admin/libtool.m4.in
deleted file mode 100644
index 4e67b29..0000000
--- a/bibletime-doc/admin/libtool.m4.in
+++ /dev/null
@@ -1,868 +0,0 @@
-## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-## 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 46 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 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_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)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
-
-# 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_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# 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_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# 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_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# 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_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-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_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  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*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-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_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # 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-gnu*)
-  case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | m68k* | arm* | mips* | hppa* | sh* )
-    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='file_magic NetBSD/[a-z0-9]* demand paged shared library']
-  else
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
-  fi
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-  ;;
-
-openbsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
-    i*86 )
-      changequote(,)dnl
-      lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
-      changequote([, ])dnl
-      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
-  ;;
-
-newsos6)
-  [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
-  ;;
-
-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
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  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*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL 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
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-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])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl 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])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
diff --git a/bibletime-doc/admin/ltcf-c.sh b/bibletime-doc/admin/ltcf-c.sh
deleted file mode 100644
index 288580c..0000000
--- a/bibletime-doc/admin/ltcf-c.sh
+++ /dev/null
@@ -1,796 +0,0 @@
-#### This script is meant to be sourced by ltconfig.
-
-# ltcf-c.sh - Create a C compiler specific configuration
-#
-# Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# 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.
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='main(){return(0);}'
-
-## Linker Characteristics
-case $host_os in
-cygwin* | mingw*)
-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-  # When not using gcc, we currently assume that we are using
-  # Microsoft Visual C++.
-  if test "$with_gcc" != yes; then
-    with_gnu_ld=no
-  fi
-  ;;
-
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # If archive_cmds runs LD, not CC, wlarc should be empty
-  wlarc='${wl}'
-
-  # See if GNU ld supports shared libraries.
-  case $host_os in
-  aix3* | aix4* | aix5*)
-    # On AIX, the GNU linker is very broken
-    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
-    ;;
-
-  amigaos*)
-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-
-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-    # that the semantics of dynamic libraries on AmigaOS, at least up
-    # to version 4, is to share data among multiple programs linked
-    # with the same dynamic library.  Since this doesn't match the
-    # behavior of shared libraries on other platforms, we can use
-    # them.
-    ld_shlibs=no
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      allow_undefined_flag=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-  cygwin* | mingw*)
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec='-L$libdir'
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-
-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~
-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-      else $CC -o impgen impgen.c ; fi)~
-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-
-    # cygwin and mingw dlls have different entry points and sets of symbols
-    # to exclude.
-    # FIXME: what about values for MSVC?
-    dll_entry=__cygwin_dll_entry@12
-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-    case $host_os in
-    mingw*)
-      # mingw values
-      dll_entry=_DllMainCRTStartup@12
-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-      ;;
-    esac
-
-    # mingw and cygwin differ, and it's simplest to just exclude the union
-    # of the two symbol sets.
-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-
-    # recent cygwin and mingw systems supply a stub DllMain which the user
-    # can override, but on older systems we have to supply one (in ltdll.c)
-    if test "x$lt_cv_need_dllmain" = "xyes"; then
-      ltdll_obj='$output_objdir/$soname-ltdll.'"$objext "
-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/$soname-ltdll.c~
-	test -f $output_objdir/$soname-ltdll.$objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-    else
-      ltdll_obj=
-      ltdll_cmds=
-    fi
-
-    # Extract the symbol export list from an `--export-all' def file,
-    # then regenerate the def file from the symbol export list, so that
-    # the compiled dll only exports the symbol export list.
-    # Be careful not to strip the DATA tag left be newer dlltools.
-    export_symbols_cmds="$ltdll_cmds"'
-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-
-    # If the export-symbols file already is a .def file (1st line
-    # is EXPORTS), use it as is.
-    # If DATA tags from a recent dlltool are present, honour them!
-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-        cp $export_symbols $output_objdir/$soname-def;
-      else
-        echo EXPORTS > $output_objdir/$soname-def;
-        _lt_hint=1;
-        cat $export_symbols | while read symbol; do
-         set dummy \$symbol;
-         case \[$]# in
-           2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-           *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
-         esac;
-         _lt_hint=`expr 1 + \$_lt_hint`;
-        done;
-      fi~
-      '"$ltdll_cmds"'
-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-    ;;
-
-  darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
-    archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`'
-    # We need to add '_' to the symbols in $export_symbols first
-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    whole_archive_flag_spec='-all_load $convenience'
-    ;;
-
-  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 | egrep 'BFD 2\.8' > /dev/null; then
-      ld_shlibs=no
-      cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-  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 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-  esac
-
-  case "$host_os" in
-  freebsd*)
-    skip_need_lc_check=yes
-    ;;
-  esac
-
-  if test "$ld_shlibs" = yes; then
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    case $host_os in
-    cygwin* | mingw*)
-      # dlltool doesn't understand --whole-archive et. al.
-      whole_archive_flag_spec=
-      ;;
-    *)
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-	whole_archive_flag_spec=
-      fi
-      ;;
-    esac
-  fi
-else
-  # PORTME fill in a description of your system's linker (not GNU ld)
-  case $host_os in
-  aix3*)
-    allow_undefined_flag=unsupported
-    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 "$with_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*)
-    hardcode_direct=yes
-    hardcode_libdir_separator=':'
-    link_all_deplibs=yes
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-    if test "$with_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
-        shared_flag='${wl}-G'
-      else
-        shared_flag='${wl}-bM:SRE'
-      fi
-    fi
-
-    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
-    # Let the compiler handle the export list.
-    always_export_symbols=no
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other run time loading flags (-brtl), -berok will
-      #           link without error, but may produce a broken library.
-      allow_undefined_flag=' ${wl}-berok'
-      # The following three lines along with hardcode_into_libs=yes put the correct path into libraries.
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir${libdir:+:}/usr/lib:/lib'
-      archive_cmds='$CC '"$shared_flag"' $libobjs $deplibs $linker_flags ${wl}-G '"$hardcode_libdir_flag_spec"' -o $lib'
-      archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $linker_flags ${wl}-G '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
-    else
-      if test "$host_cpu" = ia64; then
-        hardcode_libdir_flag_spec='${wl}-R $libdir${libdir:+:}/usr/lib:/lib'
-        allow_undefined_flag="-z nodefs"
-        archive_cmds='$CC '"$shared_flag"' $libobjs $deplibs $linker_flags '"$hardcode_libdir_flag_spec"' -o $lib'
-        archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $linker_flags '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
-      else
-        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=' '
-        build_libtool_need_lc=yes
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-        # 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
-    ;;
-
-  cygwin* | mingw*)
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec=' '
-    allow_undefined_flag=unsupported
-    # Tell ltmain to make .lib files, not .a files.
-    libext=lib
-    # FIXME: Setting linknames here is a bad hack.
-    archive_cmds='$CC -o $lib $libobjs $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"`'
-    ;;
-
-  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
-    skip_need_lc_check=yes
-    ;;
-
-  hpux9* | hpux10* | hpux11*)
-    case $host_os in
-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-    esac
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    hardcode_minus_L=yes # Not in the search PATH, but as the default
-			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  irix5* | irix6*)
-    if test "$with_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}${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 ${objdir}/so_locations -o $lib'
-    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 $linkopts'
-    hardcode_direct=yes
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_shlibpath_var=no
-    ;;
-
-  openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  os2*)
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-    ;;
-
-  osf3*)
-    if test "$with_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}${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 ${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 "$with_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}${objdir}/so_locations -o $lib'
-    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 ${objdir}/so_locations -o $lib'
-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-    fi
-    hardcode_libdir_flag_spec='-rpath $libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  sco3.2v5*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_shlibpath_var=no
-    runpath_var=LD_RUN_PATH
-    hardcode_runpath_var=yes
-    ;;
-
-  solaris*)
-    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='-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*)
-    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-    ;;
-
-  sysv4.3*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_shlibpath_var=no
-    export_dynamic_flag_spec='-Bexport'
-    ;;
-
-  sysv5*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-    hardcode_libdir_flag_spec=
-    hardcode_shlibpath_var=no
-    runpath_var='LD_RUN_PATH'
-    ;;
-
-  uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ld_shlibs=yes
-    fi
-    ;;
-
-  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
-    ;;
-
-  unixware7*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    ld_shlibs=no
-    ;;
-  esac
-fi
-
-## Compiler Characteristics: PIC flags, static flags, etc
-if test "X${ac_cv_prog_cc_pic+set}" = Xset; then
-  :
-else
-  ac_cv_prog_cc_pic=
-  ac_cv_prog_cc_shlib=
-  ac_cv_prog_cc_wl=
-  ac_cv_prog_cc_static=
-  ac_cv_prog_cc_no_builtin=
-  ac_cv_prog_cc_can_build_shared=$can_build_shared
-
-  if test "$with_gcc" = yes; then
-    ac_cv_prog_cc_wl='-Wl,'
-    ac_cv_prog_cc_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_cv_prog_cc_static='-Bstatic'
-      else
-        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-      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'.
-      ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    cygwin* | mingw* | 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).
-      ac_cv_prog_cc_pic='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_cv_prog_cc_pic='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      ac_cv_prog_cc_pic=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	 ac_cv_prog_cc_pic=-Kconform_pic
-      fi
-      ;;
-    *)
-      ac_cv_prog_cc_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for PIC flags for the system compiler.
-    case $host_os in
-    aix*)
-     # All AIX code is PIC.
-      ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      # Is there a better ac_cv_prog_cc_static that works with the bundled CC?
-      ac_cv_prog_cc_wl='-Wl,'
-      ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-      ac_cv_prog_cc_pic='+Z'
-      ;;
-
-    irix5* | irix6*)
-      ac_cv_prog_cc_wl='-Wl,'
-      ac_cv_prog_cc_static='-non_shared'
-      # PIC (with -KPIC) is the default.
-      ;;
-
-    cygwin* | mingw* | 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).
-      ac_cv_prog_cc_pic='-DDLL_EXPORT'
-      ;;
-
-    newsos6)
-      ac_cv_prog_cc_pic='-KPIC'
-      ac_cv_prog_cc_static='-Bstatic'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      # All OSF/1 code is PIC.
-      ac_cv_prog_cc_wl='-Wl,'
-      ac_cv_prog_cc_static='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      ac_cv_prog_cc_pic='-Kpic'
-      ac_cv_prog_cc_static='-dn'
-      ac_cv_prog_cc_shlib='-belf'
-      ;;
-
-    solaris*)
-      ac_cv_prog_cc_pic='-KPIC'
-      ac_cv_prog_cc_static='-Bstatic'
-      ac_cv_prog_cc_wl='-Wl,'
-      ;;
-
-    sunos4*)
-      ac_cv_prog_cc_pic='-PIC'
-      ac_cv_prog_cc_static='-Bstatic'
-      ac_cv_prog_cc_wl='-Qoption ld '
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      ac_cv_prog_cc_pic='-KPIC'
-      ac_cv_prog_cc_static='-Bstatic'
-      ac_cv_prog_cc_wl='-Wl,'
-      ;;
-
-    uts4*)
-      ac_cv_prog_cc_pic='-pic'
-      ac_cv_prog_cc_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	ac_cv_prog_cc_pic='-Kconform_pic'
-	ac_cv_prog_cc_static='-Bstatic'
-      fi
-      ;;
-
-    *)
-      ac_cv_prog_cc_can_build_shared=no
-      ;;
-    esac
-  fi
-  case "$host_os" in
-      # Platforms which do not suport PIC and -DPIC is meaningless
-      # on them:
-      *djgpp*)
-        ac_cv_prog_cc_pic=
-        ;;
-      *)
-        ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
-        ;;
-  esac
-fi
-
-need_lc=yes
-if test "$enable_shared" = yes && test "$with_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 $ac_n "checking whether -lc should be explicitly linked in... $ac_c" 1>&6
-    if eval "test \"`echo '$''{'ac_cv_archive_cmds_needs_lc'+set}'`\" = set"; then
-      echo $ac_n "(cached) $ac_c" 1>&6
-      need_lc=$ac_cv_archive_cmds_needs_lc
-    elif test "x$skip_need_lc_check" = "xyes" ; then
-      echo $ac_n "(skipping, using no) $ac_c" 1>&6
-      need_lc=no
-    else
-      $rm conftest*
-      echo "static int dummy;" > conftest.$ac_ext
-      if { (eval echo ltcf-c.sh:need_lc: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
-	# Append any warnings to the config.log.
-	cat conftest.err 1>&5
-	soname=conftest
-	lib=conftest
-	libobjs=conftest.$ac_objext
-	deplibs=
-	wl=$ac_cv_prog_cc_wl
-	compiler_flags=-v
-	linker_flags=-v
-	verstring=
-	output_objdir=.
-	libname=conftest
-	save_allow_undefined_flag=$allow_undefined_flag
-	allow_undefined_flag=
-	if { (eval echo ltcf-c.sh:need_lc: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then
-	  need_lc=no
-	fi
-	allow_undefined_flag=$save_allow_undefined_flag
-      else
-	cat conftest.err 1>&5
-      fi
-    fi
-    $rm conftest*
-    echo "$ac_t$need_lc" 1>&6
-    ;;
-  esac
-fi
-ac_cv_archive_cmds_needs_lc=$need_lc
diff --git a/bibletime-doc/admin/ltcf-cxx.sh b/bibletime-doc/admin/ltcf-cxx.sh
deleted file mode 100644
index 70ccba9..0000000
--- a/bibletime-doc/admin/ltcf-cxx.sh
+++ /dev/null
@@ -1,1040 +0,0 @@
-#### This script is meant to be sourced by ltconfig.
-
-# ltcf-cxx.sh - Create a C++ compiler specific configuration
-#
-# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# Original C++ support by:Gary V. Vaughan <gvv@techie.com>
-#    Alexandre Oliva <oliva@lsd.ic.unicamp.br>
-#    Ossama Othman <ossama@debian.org>
-#    Thomas Thanner <tanner@gmx.de>
-#
-# 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.
-
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return (0); }'
-
-# C++ compiler
-CXX=${CXX-c++}
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-CC=${CC-"$CXX"}
-CFLAGS=${CFLAGS-"$CXXFLAGS"}
-
-# Allow CC (or CXX) to be a program name with arguments.
-set dummy $CC
-compiler=$2
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# we are optimistic. (Too optimistic if you ask me, down there we switch it
-# off again for most platforms ;) (MM)
-ld_shlibs=yes
-
-# Check if we are using GNU gcc  (taken/adapted from configure script)
-# We need to check here since "--with-gcc" is set at configure time,
-# not ltconfig time!
-cat > conftest.$ac_ext <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-c++} -E conftest.$ac_ext'; { (eval echo \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  with_gcc=yes
-
-  # Set up default GNU C++ configuration
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if eval "`$CC -print-prog-name=ld` --version 2>&1" | \
-      egrep 'GNU ld' > /dev/null; then
-    with_gnu_ld=yes
-
-    archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${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" | \
-        egrep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-  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='$CC -shared $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_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-
-else
-  with_gcc=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-echo "ltcf-cxx: with_gcc=$with_gcc ; with_gnu_ld=$with_gnu_ld"
-
-# PORTME: fill in a description of your system's C++ link characteristics
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  aix4* | aix5*)
-    archive_cmds=''
-    hardcode_direct=yes
-    hardcode_libdir_separator=':'
-    link_all_deplibs=yes
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-    if test "$with_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
-        shared_flag='${wl}-G'
-      else
-        shared_flag='${wl}-bM:SRE'
-      fi
-    fi
-
-    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
-    # Let the compiler handle the export list.
-    always_export_symbols=no
-    if test "$aix_use_runtimelinking" = yes; then
-      allow_undefined_flag=' ${wl}-berok'
-      # The following three lines along with hardcode_into_libs=yes put the correct path into libraries.
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir${libdir:+:}/usr/lib:/lib'
-      archive_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' -o $lib'
-      archive_expsym_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
-     else
-      if test "$host_cpu" = ia64; then
-        hardcode_libdir_flag_spec='${wl}-R $libdir${libdir:+:}/usr/lib:/lib'
-        allow_undefined_flag="-z nodefs"
-        archive_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags '"$hardcode_libdir_flag_spec"' -o $lib'
-        archive_expsym_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
-      else
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-        # Warning - without using the other run time loading flags, -berok will
-        #           link without error, but may produce a broken library.
-        no_undefined_flag='${wl}-bnoerok'
-        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=' '
-        build_libtool_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
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  dgux*)
-    case $cc_basename in
-      ec++)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      ghcx)
-        # Green Hills C++ Compiler
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  freebsd*)
-    # FreeBSD uses GNU C++ and GNU ld
-    skip_need_lc_check=yes
-    remove_lgcc=yes
-    ;;
-  hpux*)
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    hardcode_minus_L=yes # Not in the search PATH, but as the default
-			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
-
-    case $cc_basename in
-      CC)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      aCC)
-	case $host_os in
-	hpux9*) archive_cmds='$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' ;;
-	*) archive_cmds='$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_cmds='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 "$with_gcc" = yes && test "$with_gnu_ld" = no ; then
-	  # MM: for HP-UX and g++ -fPIC is needed to link pic objects together
-	  case $host_os in
-	  hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -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' ;;
-	  *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
-	  esac
-	  output_verbose_link_cmds='$CC -shared -fPIC $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-	  remove_lgcc=yes
-        fi
-	if test "$with_gcc" = no ; then
-	  # FIXME: insert proper C++ library support
-          ld_shlibs=no
-	fi
-        ;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC)
-        # SGI C++
-        archive_cmds='$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='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-        if test "$with_gcc" = yes; then
-          if test "$with_gnu_ld" = no; then
-            archive_cmds='$CC -D_LANGUAGE_C_CPLUS_PLUS -shared $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='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
-          fi
-        fi
-        ;;
-    esac
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    link_all_deplibs=yes
-    ;;
-  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='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-        archive_expsym_cmds='templib=`echo $lib | sed -e "s/\.so\..*/\.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_cmds='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest.so 2>&1 | egrep "ld"`; rm -f libconftest.so; 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='${wl}--rpath,$libdir'
-        export_dynamic_flag_spec='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-        old_archive_cmds='$CC -Bstatic -o $oldlib $oldobjs'
-        ;;
-      cxx)
-        # Compaq C++
-        archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds='$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='-rpath $libdir'
-        hardcode_libdir_separator=:
-
-        # 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_cmds='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'
-        ;;
-      insure)
-        if test "$with_gcc" = yes; then
-	  # Insure++ together with gcc probably means also GNU ld
-	  # only -whole-archive isn't supported
-	  whole_archive_flag_spec=""
-	  # and we can't use -nostdlib, because bloody insure has no way to
-	  # output the linkline (-Zvm isn't working as documented), so we don't
-	  # know the depending libs. So we hope, insure gets it right anyway.
-	  archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  runpath_var=LD_RUN_PATH
-	  hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-	  export_dynamic_flag_spec='${wl}--export-dynamic'
-	  output_verbose_link_cmds=""
-	fi
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  netbsd*)
-    if test "$with_gcc" = no || test "$with_gnu_ld" = no; then
-      # This should only be triggered for NetBSD/a.out
-      # Add in C++ constructor/destructor support
-      if test -f /usr/pkg/lib/c++rt0/c++rt0.o.PIC; then
-        cppopts="/usr/pkg/lib/c++rt0/c++rt0.o.PIC"
-      elif test -f /usr/lib/c++rt0.o; then
-        cppopts="/usr/lib/c++rt0.o"
-      fi
-      archive_cmds='ld -Bshareable -o $lib '"$cppopts"' $libobjs $deplibs $linkopts'
-    fi
-    ;;
-  openbsd*)
-    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-      # MM: OpenBSD 2.7 uses G++, but not GNU ld
-      archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
-      hardcode_libdir_flag_spec='${wl}-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      whole_archive_flag_spec='${wl}-Bforcearchive'
-      remove_lgcc=yes
-    fi
-    ;;
-  osf3*)
-    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$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='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-
-      # 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_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-    else
-      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='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  hardcode_libdir_separator=:
-
-	  # Archives containing C++ object files must be created using
-	  # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	  old_archive_cmds='$CC -Bstatic -o $oldlib $oldobjs'
-
-	  ;;
-	RCC)
-	  # Rational C++ 2.4.1
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs=no
-	  ;;
-	cxx)
-	  allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds='$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='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator=:
-
-	  # 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_cmds='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'
-	  ;;
-	*)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs=no
-	  ;;
-      esac
-    fi
-    ;;
-  osf4* | osf5*)
-    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-      allow_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
-      no_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
-      archive_cmds='$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='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-
-      # 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_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-    else
-      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='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  hardcode_libdir_separator=:
-
-	  # Archives containing C++ object files must be created using
-	  # the KAI C++ compiler.
-	  old_archive_cmds='$CC -o $oldlib $oldobjs'
-	  ;;
-	RCC)
-	  # Rational C++ 2.4.1
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs=no
-	  ;;
-	cxx)
-	  allow_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
-	  no_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
-	  archive_cmds='$CC -shared${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` -update_registry ${objdir}/so_locations -o $lib'
-	  
-	  hardcode_libdir_flag_spec='-rpath $libdir'
-	  hardcode_libdir_separator=:
-
-	  # 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_cmds='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'
-	  ;;
-	*)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs=no
-	  ;;
-      esac
-    fi
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  sco*)
-    case $cc_basename in
-      CC)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC)
-        # Sun C++ 4.x
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      lcc)
-        # Lucid
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        no_undefined_flag=' -ztext'
-        archive_cmds='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-        archive_expsym_cmds='$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='-R$libdir'
-        hardcode_shlibpath_var=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='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-            ;;
-        esac
-        link_all_deplibs=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_cmds='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | egrep "\-R|\-L"`; 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='$CC -xar -o $oldlib $oldobjs'
-        ;;
-      gcx)
-        # Green Hills C++ Compiler
-        archive_cmds='$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='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-        ;;
-      *)
-        # GNU C++ compiler with Solaris linker
-        if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-          if $CC --version | egrep -v '^2\.7' > /dev/null; then
-            archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
-            archive_expsym_cmds='$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 $linker_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_cmds="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
-          else
-            # g++ 2.7 appears to require `-G' NOT `-shared' on this
-            # platform.
-            archive_cmds='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
-            archive_expsym_cmds='$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 $linker_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_cmds="$CC -G $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
-          fi
-
-          hardcode_libdir_flag_spec='${wl}-R $wl$libdir'
-        fi
-        ;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC)
-        # NonStop-UX NCC 3.20
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
-        ;;
-    esac
-    ;;
-  unixware*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs=no
-    ;;
-esac
-
-
-## Compiler Characteristics: PIC flags, static flags, etc
-
-# We don't use cached values here since only the C compiler
-# characteristics should be cached.
-ac_cv_prog_cc_pic=
-ac_cv_prog_cc_shlib=
-ac_cv_prog_cc_wl=
-ac_cv_prog_cc_static=
-ac_cv_prog_cc_no_builtin=
-ac_cv_prog_cc_can_build_shared=$can_build_shared
-
-ac_cv_prog_cc_pic_works=
-ac_cv_prog_cc_static_works=
-
-if test "$with_gcc" = yes; then
-  ac_cv_prog_cc_wl='-Wl,'
-  ac_cv_prog_cc_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_cv_prog_cc_static='-Bstatic'
-    else
-      lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-    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'.
-    ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-    ;;
-  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-    # PIC is the default for these OSes.
-    ;;
-  cygwin* | mingw* | 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).
-    ac_cv_prog_cc_pic='-DDLL_EXPORT'
-    ;;
-  darwin* | rhapsody*)
-    # PIC is the default on this platform
-    # Common symbols not allowed in MH_DYLIB files
-    lt_cv_prog_cc_pic='-fno-common'
-    ;;
-  *djgpp*)
-    # DJGPP does not support shared libraries at all
-    ac_cv_prog_cc_pic=
-    ;;
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      ac_cv_prog_cc_pic=-Kconform_pic
-    fi
-    ;;
-  *)
-    ac_cv_prog_cc_pic='-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_cv_prog_cc_static='-Bstatic'
-      else
-        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-    chorus*)
-      case $cc_basename in
-      cxch68)
-        # Green Hills C++ Compiler
-        # ac_cv_prog_cc_static="--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++)
-          ac_cv_prog_cc_pic='-KPIC'
-          ;;
-        ghcx)
-          # Green Hills C++ Compiler
-          ac_cv_prog_cc_pic='-pic'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    freebsd*)
-      # FreeBSD uses GNU C++
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      case $cc_basename in
-        CC)
-          ac_cv_prog_cc_wl='-Wl,'
-          ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-          ac_cv_prog_cc_pic='+Z'
-          ;;
-        aCC)
-          ac_cv_prog_cc_wl='-Wl,'
-          ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-          ac_cv_prog_cc_pic='+Z'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    irix5* | irix6*)
-      case $cc_basename in
-        CC)
-          ac_cv_prog_cc_wl='-Wl,'
-          ac_cv_prog_cc_static='-non_shared'
-          ac_cv_prog_cc_pic='-KPIC'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    linux*)
-      case $cc_basename in
-        KCC)
-          # KAI C++ Compiler
-          ac_cv_prog_cc_wl='--backend -Wl,'
-          ac_cv_prog_cc_pic='-fPIC'
-          ;;
-        cxx)
-          # Compaq C++
-          # Make sure the PIC flag is empty.  It appears that all Alpha
-          # Linux and Compaq Tru64 Unix objects are PIC.
-          ac_cv_prog_cc_pic=
-          ac_cv_prog_cc_static='-non_shared'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    lynxos*)
-      ;;
-    m88k*)
-      ;;
-    mvs*)
-      case $cc_basename in
-        cxx)
-          ac_cv_prog_cc_pic='-W c,exportall'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    netbsd*)
-      ;;
-    osf3* | osf4* | osf5*)
-      case $cc_basename in
-        KCC)
-          ac_cv_prog_cc_wl='--backend -Wl,'
-          ;;
-        RCC)
-          # Rational C++ 2.4.1
-          ac_cv_prog_cc_pic='-pic'
-          ;;
-        cxx)
-          # Digital/Compaq C++
-          ac_cv_prog_cc_wl='-Wl,'
-          # Make sure the PIC flag is empty.  It appears that all Alpha
-          # Linux and Compaq Tru64 Unix objects are PIC.
-          ac_cv_prog_cc_pic=
-          ac_cv_prog_cc_static='-non_shared'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    psos*)
-      ;;
-    sco*)
-      case $cc_basename in
-        CC)
-          ac_cv_prog_cc_pic='-fPIC'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    solaris*)
-      case $cc_basename in
-        CC)
-          # Sun C++ 4.2, 5.x and Centerline C++
-          ac_cv_prog_cc_pic='-KPIC'
-          ac_cv_prog_cc_static='-Bstatic'
-          ac_cv_prog_cc_wl='-Qoption ld '
-          ;;
-        gcx)
-          # Green Hills C++ Compiler
-          ac_cv_prog_cc_pic='-PIC'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    sunos4*)
-      case $cc_basename in
-        CC)
-          # Sun C++ 4.x
-          ac_cv_prog_cc_pic='-pic'
-          ac_cv_prog_cc_static='-Bstatic'
-          ;;
-        lcc)
-          # Lucid
-          ac_cv_prog_cc_pic='-pic'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    tandem*)
-      case $cc_basename in
-        NCC)
-          # NonStop-UX NCC 3.20
-          ac_cv_prog_cc_pic='-KPIC'
-          ;;
-        *)
-          ;;
-      esac
-      ;;
-    unixware*)
-      ;;
-    vxworks*)
-      ;;
-    *)
-      ac_cv_prog_cc_can_build_shared=no
-      ;;
-  esac
-fi
-
-case "$host_os" in
-    # Platforms which do not suport PIC and -DPIC is meaningless
-    # on them:
-    *djgpp*)
-      ac_cv_prog_cc_pic=
-      ;;
-    *)
-      ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
-      ;;
-esac
-
-
-# Figure out "hidden" C++ library dependencies from verbose
-# compiler output whening linking a shared library.
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-
-if (eval $ac_compile) 2>&5; 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
-
-  for p in `eval $output_verbose_link_cmds`; 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"; then
-             compiler_lib_search_path="${prev}${p}"
-           else
-             compiler_lib_search_path="${compiler_lib_search_path} ${prev}${p}"
-           fi
-           ;;
-         # The "-l" case would never come before the object being
-         # linked, so don't bother handling this case.
-         esac
-       else
-	 add="${prev}${p}"
-	 if test "x$remove_lgcc" = "xyes" ; then
-	   case "$add" in
-	     -lgcc ) add="" ;;
-	   esac
-	 fi
-	 if test -n "$add" ; then
-           if test -z "$postdeps"; then
-             postdeps="$add"
-           else
-             postdeps="${postdeps} ${add}"
-           fi
-         fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-         pre_test_object_deps_done=yes
-         continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-         if test -z "$predep_objects"; then
-           predep_objects="$p"
-         else
-           predep_objects="$predep_objects $p"
-         fi
-       else
-         if test -z "$postdep_objects"; then
-           postdep_objects="$p"
-         else
-           postdep_objects="$postdep_objects $p"
-         fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out
-else
-  echo "ltcf-cxx.sh: error: problem compiling test program"
-fi
-
-$rm -f confest.$objext
-
-if test "x$skip_need_lc_check" = "xyes" ; then
-  need_lc=no
-else
-  case " $postdeps " in
-  *" -lc "*) need_lc=no ;;
-  *) need_lc=yes ;;
-  esac
-fi
diff --git a/bibletime-doc/admin/ltconfig b/bibletime-doc/admin/ltconfig
deleted file mode 100755
index caefe9f..0000000
--- a/bibletime-doc/admin/ltconfig
+++ /dev/null
@@ -1,2794 +0,0 @@
-#! /bin/sh
-
-# ltconfig - Create a system-specific libtool.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# 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 lot of this script is taken from autoconf-2.10.
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-echo=echo
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) PATH_SEPARATOR=';' ;;
-    *)     PATH_SEPARATOR=':' ;;
-  esac
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test "X${echo_test_string+set}" != Xset; then
-  # find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for dir in $PATH /usr/ucb; do
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running ltconfig again with it.
-      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 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
-
-# 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'
-
-# The name of this program.
-progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
-
-# Constants:
-PROGRAM=ltconfig
-PACKAGE=libtool
-VERSION=1.4a
-TIMESTAMP=" (1.641.2.206mm 2001/04/03 21:47:47)"
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-rm="rm -f"
-
-help="Try \`$progname --help' for more information."
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-enable_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-enable_static=yes
-enable_fast_install=yes
-enable_dlopen=unknown
-enable_win32_dll=no
-pic_mode=default
-ltmain=
-silent=
-srcdir=
-ac_config_guess=
-ac_config_sub=
-host=
-build=NONE
-nonopt=NONE
-ofile="$default_ofile"
-verify_host=yes
-tagname=
-with_gcc=no
-with_gnu_ld=no
-need_locks=yes
-ac_ext=c
-libext=a
-cache_file=
-max_cmd_len=
-
-## Dependencies to place before and after the object being linked:
-predep_objects=
-postdep_objects=
-predeps=
-postdeps=
-compiler_lib_search_path=
-
-## Link characteristics:
-allow_undefined_flag=
-no_undefined_flag=
-need_lib_prefix=unknown
-need_version=unknown
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-archive_cmds=
-archive_expsym_cmds=
-old_archive_from_new_cmds=
-old_archive_from_expsyms_cmds=
-striplib=
-old_striplib=
-export_dynamic_flag_spec=
-whole_archive_flag_spec=
-thread_safe_flag_spec=
-hardcode_into_libs=no
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-hardcode_shlibpath_var=unsupported
-runpath_var=
-link_all_deplibs=unknown
-always_export_symbols=no
-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-# include_expsyms should be a list of space-separated symbols to be *always*
-# included in the symbol list
-include_expsyms=
-# exclude_expsyms can be an egrep regular expression of symbols to exclude
-# it will be wrapped by ` (' and `)$', so one must not match beginning or
-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-# as well as any symbol that contains `d'.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-# platforms (ab)use it in PIC code, but their linkers get confused if
-# the symbol is explicitly referenced.  Since portable code cannot
-# rely on this symbol name, it's probably fine to never include it in
-# preloaded symbol tables.
-extract_expsyms_cmds=
-
-## Tools:
-old_AR="$AR"
-old_AR_FLAGS="$AR_FLAGS"
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-old_CPPFLAGS="$CPPFLAGS"
-old_LDFLAGS="$LDFLAGS"
-old_LIBS="$LIBS"
-old_MAGIC_CMD="$MAGIC_CMD"
-old_LD="$LD"
-old_LN_S="$LN_S"
-old_LTCC="$LTCC"
-old_NM="$NM"
-old_RANLIB="$RANLIB"
-old_STRIP="$STRIP"
-old_AS="$AS"
-old_DLLTOOL="$DLLTOOL"
-old_OBJDUMP="$OBJDUMP"
-old_OBJEXT="$OBJEXT"
-old_EXEEXT="$EXEEXT"
-old_reload_flag="$reload_flag"
-old_deplibs_check_method="$deplibs_check_method"
-old_file_magic_cmd="$file_magic_cmd"
-
-# Parse the command line options.
-args=
-prev=
-for option
-do
-  case $option in
-  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    eval "$prev=\$option"
-    prev=
-    continue
-  fi
-
-  case $option in
-  --help) cat <<EOM
-Usage: $progname [OPTION]... LTMAIN [HOST]
-
-Generate a system-specific libtool script.
-
-    --build                configure for building on BUILD [BUILD=HOST]
-    --debug                enable verbose shell tracing
-    --disable-shared       do not build shared libraries
-    --disable-static       do not build static libraries
-    --disable-fast-install do not optimize for fast installation
-    --enable-dlopen        enable dlopen support
-    --enable-win32-dll     enable building dlls on win32 hosts
-    --help                 display this help and exit
-    --no-verify            do not verify that HOST is a valid host type
--o, --output=FILE          specify the output file [default=$default_ofile]
-    --quiet                same as \`--silent'
-    --silent               do not print informational messages
-    --srcdir=DIR           find \`config.guess' in DIR
-    --version              output version information and exit
-    --add-tag=TAG          append an alternate configuration
-    --with-gcc             assume that the GNU C compiler will be used
-    --with-gnu-ld          assume that the C compiler uses the GNU linker
-    --prefer-pic           try to use only PIC objects
-    --prefer-non-pic       try to use only non-PIC objects
-    --disable-lock         disable file locking
-    --cache-file=FILE      configure cache file
-
-LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
-that provides basic libtool functionality.
-
-HOST is the canonical host system name [default=guessed].
-EOM
-  exit 0
-  ;;
-
-  --build) prev=build ;;
-  --build=*) build="$optarg" ;;
-
-  --debug)
-    echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --disable-shared) enable_shared=no ;;
-
-  --disable-static) enable_static=no ;;
-
-  --disable-fast-install) enable_fast_install=no ;;
-
-  --enable-dlopen) enable_dlopen=yes ;;
-
-  --enable-win32-dll) enable_win32_dll=yes ;;
-
-  --quiet | --silent) silent=yes ;;
-
-  --srcdir) prev=srcdir ;;
-  --srcdir=*) srcdir="$optarg" ;;
-
-  --no-verify) verify_host=no ;;
-
-  --output | -o) prev=ofile ;;
-  --output=*) ofile="$optarg" ;;
-
-  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
-
-  --add-tag) prev=tagname ;;
-  --add-tag=*) tagname="$optarg" ;;
-
-  --with-gcc) with_gcc=yes ;;
-  --with-gnu-ld) with_gnu_ld=yes ;;
-
-  --prefer-pic) pic_mode=yes ;;
-  --prefer-non-pic) pic_mode=no ;;
-
-  --disable-lock) need_locks=no ;;
-
-  --cache-file=*) cache_file="$optarg" ;;
-
-  -*)
-    echo "$progname: unrecognized option \`$option'" 1>&2
-    echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    if test -z "$ltmain"; then
-      ltmain="$option"
-    elif test -z "$host"; then
-# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
-#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
-#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
-#      fi
-      host="$option"
-    else
-      echo "$progname: too many arguments" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-done
-
-if test -z "$ltmain"; then
-  echo "$progname: you must specify a LTMAIN file" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-if test ! -f "$ltmain"; then
-  echo "$progname: \`$ltmain' does not exist" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-if test -n "$tagname"; then
-  # Check whether tagname contains only valid characters
-  case `$echo "X$tagname" | $Xsed -e 's/[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]//g'` in
-  "") ;;
-  *)
-    echo "$progname: invalid tag name: $tagname" 1>&2
-    exit 1
-    ;;
-  esac
-
-  if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$ofile" > /dev/null; then
-    echo "$progname: tag name $tagname already exists" 1>&2
-    exit 1
-  fi
-
-  if test ! -f "$ofile"; then
-    echo "$progname: warning: output file \`$ofile' does not exist" 1>&2
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL $ofile --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      echo "$progname: warning: output file \`$ofile' does not look like a libtool script" 1>&2
-    else
-      echo "$progname: warning: using \`LTCC=$LTCC', extracted from \`$ofile'" 1>&2
-    fi
-  fi
-fi
-
-# Quote any args containing shell metacharacters.
-ltconfig_args=
-for arg
-do
-  case $arg in
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ltconfig_args="$ltconfig_args '$arg'" ;;
-  *) ltconfig_args="$ltconfig_args $arg" ;;
-  esac
-done
-
-# A relevant subset of AC_INIT.
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 compiler messages saved in config.log
-# 6 checking for... messages and results
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>>./config.log
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
-if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
-
-if test -n "$cache_file" && test -r "$cache_file" && test -f "$cache_file"; then
-  echo "loading cache $cache_file within ltconfig"
-  . $cache_file
-fi
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-if test -z "$srcdir"; then
-  # Assume the source directory is the same one as the path to LTMAIN.
-  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
-  test "$srcdir" = "$ltmain" && srcdir=.
-fi
-
-trap "$rm conftest*; exit 1" 1 2 15
-if test "$verify_host" = yes; then
-  # Check for config.guess and config.sub.
-  ac_aux_dir=
-  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-    if test -f $ac_dir/config.guess; then
-      ac_aux_dir=$ac_dir
-      break
-    fi
-  done
-  if test -z "$ac_aux_dir"; then
-    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-  ac_config_guess=$ac_aux_dir/config.guess
-  ac_config_sub=$ac_aux_dir/config.sub
-
-  # Make sure we can run config.sub.
-  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
-  else
-    echo "$progname: cannot run $ac_config_sub" 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-
-  echo $ac_n "checking host system type""... $ac_c" 1>&6
-
-  host_alias=$host
-  case $host_alias in
-  "")
-    # Force config.guess to use the C compiler.
-    # CC_FOR_BUILD overrides the CC variable in config.guess but I had
-    # problems with it so do it this way for now.
-    CC="$LTCC"
-
-    if host_alias=`$SHELL $ac_config_guess`; then :
-    else
-      echo "$progname: cannot guess host type; you must specify one" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Restore the C compiler.
-    CC="$old_CC"
-    ;;
-  esac
-  host=`$SHELL $ac_config_sub $host_alias`
-  echo "$ac_t$host" 1>&6
-
-  # Make sure the host verified.
-  test -z "$host" && exit 1
-
-  # Check for the build system type
-  echo $ac_n "checking build system type... $ac_c" 1>&6
-
-  build_alias=$build
-  case $build_alias in
-  NONE)
-    case $nonopt in
-    NONE) build_alias=$host_alias ;;
-    *) build_alias=$nonopt ;;
-    esac ;;
-  esac
-
-  build=`$SHELL $ac_config_sub $build_alias`
-  build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-  echo "$ac_t""$build" 1>&6
-
-elif test -z "$host"; then
-  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
-  echo "$help" 1>&2
-  exit 1
-else
-  host_alias=$host
-  build_alias=$host_alias
-  build=$host
-fi
-
-if test x"$host" != x"$build"; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case $host_os in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-esac
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# 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
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-fi
-
-# Source the script associated with the $tagname tag configuration.
-if test -n "$tagname"; then
-  . $ltmain
-else
-  # FIXME:  We should use a variable here
-  # Configure for a C compiler
-  . $srcdir/ltcf-c.sh
-fi
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$NM" && NM=nm
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$objext" && objext=o
-
-echo $ac_n "checking for objdir... $ac_c" 1>&6
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-echo "$ac_t$objdir" 1>&6
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-set dummy $CC
-compiler="$2"
-
-# We assume here that the value for ac_cv_prog_cc_pic will not be cached
-# in isolation, and that seeing it set (from the cache) indicates that
-# the associated values are set (in the cache) correctly too.
-echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
-echo "$progname:678:checking for $compiler option to produce PIC" 1>&5
-
-if test -z "$ac_cv_prog_cc_pic"; then
-  echo "$ac_t"none 1>&6
-else
-  echo "$ac_t""$ac_cv_prog_cc_pic" 1>&6
-
-  # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $ac_cv_prog_cc_pic works... $ac_c" 1>&6
-  echo "$progname:687:checking that $compiler PIC flag $ac_cv_prog_cc_pic works." 1>&5
-  if test "X${ac_cv_prog_cc_pic_works+set}" = Xset && \
-     test "X${ac_cv_prog_cc_pic_works}" != X; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    ac_cv_prog_cc_pic_works=yes
-    $rm conftest*
-    echo $lt_simple_compile_test_code > conftest.$ac_ext
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $ac_cv_prog_cc_pic -DPIC"
-    if { (eval echo $progname:697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-      # Append any warnings to the config.log.
-      cat conftest.err 1>&5
-
-      case $host_os in
-      hpux9* | hpux10* | hpux11*)
-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-	# they create non-PIC objects.  So, if there were any warnings, we
-	# assume that PIC is not supported.
-	if test -s conftest.err; then
-	  ac_cv_prog_cc_pic_works=no
-	  ac_cv_prog_cc_can_build_shared=no
-	  ac_cv_prog_cc_pic=
-	else
-	  ac_cv_prog_cc_pic_works=yes
-	  ac_cv_prog_cc_pic=" $ac_cv_prog_cc_pic"
-	fi
-	;;
-      *)
-	ac_cv_prog_cc_pic_works=yes
-	ac_cv_prog_cc_pic=" $ac_cv_prog_cc_pic"
-	;;
-      esac
-    else
-      # Append any errors to the config.log.
-      cat conftest.err 1>&5
-      ac_cv_prog_cc_pic_works=no
-      ac_cv_prog_cc_can_build_shared=no
-      ac_cv_prog_cc_pic=
-    fi
-    CFLAGS="$save_CFLAGS"
-    $rm conftest*
-  fi
-  # Belt *and* braces to stop my trousers falling down:
-  if test "X$ac_cv_prog_cc_pic_works" = Xno; then
-    ac_cv_prog_cc_pic=
-    ac_cv_prog_cc_can_build_shared=no
-  fi
-  echo "$ac_t""$ac_cv_prog_cc_pic_works" 1>&6
-fi
-
-# Check for any special shared library compilation flags.
-if test -n "$ac_cv_prog_cc_shlib"; then
-  echo "$progname: warning: \`$CC' requires \`$ac_cv_prog_cc_shlib' to build shared libraries" 1>&2
-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$ac_cv_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    echo "$progname: add \`$ac_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
-    ac_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-echo $ac_n "checking if $compiler static flag $ac_cv_prog_cc_static works... $ac_c" 1>&6
-echo "$progname:749: checking if $compiler static flag $ac_cv_prog_cc_static works" >&5
-if test "X${ac_cv_prog_cc_static_works+set}" = Xset && \
-   test "X${ac_cv_prog_cc_static_works}" != X; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  $rm conftest*
-  echo $lt_simple_link_test_code > conftest.$ac_ext
-  save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $ac_cv_prog_cc_static"
-  if { (eval echo $progname:758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    ac_cv_prog_cc_static_works=yes
-  else
-    ac_cv_prog_cc_static_works=no
-    ac_cv_prog_cc_static=
-  fi
-  LDFLAGS="$save_LDFLAGS"
-  $rm conftest*
-fi
-# Belt *and* braces to stop my trousers falling down:
-if test "X$ac_cv_prog_cc_static_works" = Xno; then
-  ac_cv_prog_cc_static=
-fi
-echo "$ac_t""$ac_cv_prog_cc_static_works" 1>&6
-pic_flag="$ac_cv_prog_cc_pic"
-special_shlib_compile_flags="$ac_cv_prog_cc_shlib"
-wl="$ac_cv_prog_cc_wl"
-link_static_flag="$ac_cv_prog_cc_static"
-no_builtin_flag="$ac_cv_prog_cc_no_builtin"
-can_build_shared="$ac_cv_prog_cc_can_build_shared"
-
-# find the maximum length of command line arguments
-echo "$progname:780: finding the maximum length of command line arguments" 1>&5
-echo $ac_n "finding the maximum length of command line arguments... $ac_c" 1>&6
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  i=0
-  testring="ABCDEF"
-  while test `$CONFIG_SHELL $0 --fallback-echo "X$testring" >/dev/null 2>&1` == `echo "X$testring" >/dev/null 2>&1` &&
-          new_result=`expr "X$testring" : ".*" 2>&1` &&
-          lt_cv_sys_max_cmd_len=$new_result &&
-          test $i != 32 # 1 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.  1/4 should be good.
-  len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-  lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len - $len`
-fi
-echo "$progname:@lineno@: result: $lt_cv_sys_max_cmd_len" 1>&5
-echo "${ac_t}$lt_cv_sys_max_cmd_len" 1>&6
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  max_cmd_len=$lt_cv_sys_max_cmd_len
-else
-  max_cmd_len=none
-fi
-
-# Check to see if options -o and -c are simultaneously supported by compiler
-echo $ac_n "checking if $compiler supports -c -o file.$objext... $ac_c" 1>&6
-if test "${lt_cv_compiler_c_o+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  $rm -r conftest 2>/dev/null
-  mkdir conftest
-  cd conftest
-  $rm conftest*
-  echo $lt_simple_compile_test_code > conftest.$ac_ext
-  mkdir out
-  # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-  # that will create temporary files in the current directory regardless of
-  # the output directory.  Thus, making CWD read-only will cause this test
-  # to fail, enabling locking or at least warning the user not to do parallel
-  # builds.
-  chmod -w .
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -o out/conftest2.$objext"
-  echo "$progname:829: checking if $compiler supports -c -o file.$objext" >&5
-  if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$objext; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s out/conftest.err; then
-        lt_cv_compiler_c_o=no
-      else
-        lt_cv_compiler_c_o=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat out/conftest.err 1>&5
-    lt_cv_compiler_c_o=no
-  fi
-  CFLAGS="$save_CFLAGS"
-  chmod u+w .
-  $rm conftest* out/*
-  rmdir out
-  cd ..
-  rmdir conftest
-  $rm -r conftest 2>/dev/null
-fi
-compiler_c_o=$lt_cv_compiler_c_o
-echo "${ac_t}$compiler_c_o" 1>&6
-
-# Check to see if we can do hard links to lock some files if needed
-hard_links="nottested"
-if test "$compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$ac_t$hard_links" 1>&6
-  $rm conftest*
-  if test "$hard_links" = no; then
-    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-if test "$with_gcc" = yes; then
-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
-  $rm conftest*
-  echo $lt_simple_compile_test_code > conftest.$ac_ext
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-  echo "$progname:883: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-  if { (eval echo $progname:884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	compiler_rtti_exceptions=no
-      else
-	echo "$ac_t"yes 1>&6
-	compiler_rtti_exceptions=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    compiler_rtti_exceptions=no
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-
-  if test "$compiler_rtti_exceptions" = "yes"; then
-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-  else
-    no_builtin_flag=' -fno-builtin'
-  fi
-  
-fi
-
-# See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
-
-echo "$ac_t$ld_shlibs" 1>&6
-test "$ld_shlibs" = no && can_build_shared=no
-
-# Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var"; 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 "$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 "$ac_t$hardcode_action" 1>&6
-
-echo $ac_n "checking whether stripping libraries is possible... $ac_c" 1>&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 "${ac_t}yes" 1>&6
-else
-  echo "${ac_t}no" 1>&6
-fi
-
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-# PORTME Fill in your ld.so characteristics
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-
-echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$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}.so$major'
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # 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.
-    # We preserve .a as extension for shared libraries though AIX4.2
-    # and later linker supports .so
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
-      # lib<name>.a to let people know that these are not typical AIX shared libraries.
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-      # We want symlinks to be created for the different names.
-      version_type=linux
-    else
-      # We preserve .a as extension for shared libraries though AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}.so$major.o'
-    fi
-    # 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 | egrep '(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
-    shlibpath_var=LIBPATH
-    deplibs_check_method=pass_all
-    # Put the right runpath into libraries.
-    hardcode_into_libs=yes
-    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
-	# 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.
-        can_build_shared=no
-      fi
-      ;;
-    esac
-  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}.so'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  lt_cv_dlopen="load_add_on"
-  lt_cv_dlopen_libs=
-  lt_cv_dlopen_self=yes
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  export_dynamic_flag_spec=-rdynamic
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  need_version=no
-  need_lib_prefix=no
-  case $with_gcc,$host_os in
-  yes,cygwin*)
-    library_names_spec='$libname.dll.a'
-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog .libs/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll; $rm \$dlpath'
-    ;;
-  yes,mingw*)
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
-    ;;
-  yes,pw32*)
-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-;;
-  *)
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  lt_cv_dlopen="LoadLibrary"
-  lt_cv_dlopen_libs=
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.$`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
-  soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  *)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  dynamic_linker="$host_os dld.sl"
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  shlibpath_var=SHLIB_PATH
-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-  soname_spec='${libname}${release}.sl$major'
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6*)
-  version_type=irix
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
-  case $host_os in
-  irix5*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-    need_version=yes
-  else
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-    soname_spec='${libname}${release}.so$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-    need_version=no
-  fi
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  # OpenBSD 2.7 the overriding is needed for fast-install
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  need_lib_prefix=no
-  library_names_spec='$libname.dll $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_version=no
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-    soname_spec='$libname.so.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$ac_t$dynamic_linker" 1>&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-
-# 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
-global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/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
-  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
-  ;;
-irix*)
-  symcode='[BCDEGRST]'
-  ;;
-solaris* | sysv5*)
-  symcode='[BDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $host_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[ABCDGISTW]'
-fi
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-  $rm 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
-
-  echo "$progname:1423: checking if global_symbol_pipe works" >&5
-  if { (eval echo $progname:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { echo "$progname:1427: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$global_symbol_to_cdecl"' < "$nlist" >> 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/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> 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.$objext conftstm.$objext
-	  save_LIBS="$LIBS"
-	  save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo $progname:1479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-	    pipe_works=yes
-	  else
-	    echo "$progname: failed program was:" >&5
-	    cat conftest.$ac_ext >&5
-	  fi
-	  LIBS="$save_LIBS"
-	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 $global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  $rm conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    global_symbol_pipe=
-  fi
-done
-if test "$pipe_works" = yes; then
-  echo "${ac_t}ok" 1>&6
-else
-  echo "${ac_t}failed" 1>&6
-fi
-
-if test -z "$global_symbol_pipe"; then
-  global_symbol_to_cdecl=
-fi
-
-# Report the final consequences.
-echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
-
-# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
-# configure.in, otherwise build static only libraries.
-case $host_os in
-cygwin* | mingw* | pw32* | os2*)
-  if test x$can_build_shared = xyes; then
-    test x$enable_win32_dll = xno && can_build_shared=no
-    echo "checking if package supports dlls... $can_build_shared" 1>&6
-  fi
-;;
-esac
-
-echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-
-echo "$ac_t$enable_shared" 1>&6
-
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-
-echo "checking whether to build static libraries... $enable_static" 1>&6
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$with_gcc" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-# Check whether we must set pic_mode to default
-test -z "$pic_flag" && pic_mode=default
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-if test "X${lt_cv_dlopen+set}" != Xset; then
-  lt_cv_dlopen=no lt_cv_dlopen_libs=
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "$progname:1583: checking for dlopen in -ldl" >&5
-if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-/*#line 1590 "ltconfig"*/
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo $progname:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if test "X$ac_cv_lib_dl_dlopen" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "$progname:1622: checking for dlopen" >&5
-if test "X${ac_cv_func_dlopen+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-/*#line 1627 "ltconfig"*/
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-dlopen();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo $progname:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_dlopen=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_dlopen=no
-fi
-rm -f conftest*
-fi
-if test "X$ac_cv_func_dlopen" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "$progname:1669: checking for dlopen in -lsvld" >&5
-if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsvld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-/*#line 1676 "ltconfig"*/
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo $progname:1689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if test "X$ac_cv_lib_svld_dlopen" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "$progname:1708: checking for dld_link in -ldld" >&5
-if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-/*#line 1715 "ltconfig"*/
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link();
-
-int main() {
-dld_link()
-; return 0; }
-EOF
-if { (eval echo $progname:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if test "X$ac_cv_lib_dld_dld_link" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "$progname:1747: checking for shl_load" >&5
-if test "X${ac_cv_func_shl_load+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-/*#line 1752 "ltconfig"*/
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-shl_load();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo $progname:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_shl_load=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_shl_load=no
-fi
-rm -f conftest*
-fi
-
-if test "X$ac_cv_func_shl_load" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "$progname:1795: checking for shl_load in -ldld" >&5
-if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-/*#line 1802 "ltconfig"*/
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load();
-
-int main() {
-shl_load()
-; return 0; }
-EOF
-if { (eval echo $progname:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if test "X$ac_cv_lib_dld_shl_load" = Xyes; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-fi
-
-fi
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-for ac_hdr in dlfcn.h; do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "$progname:1863: checking for $ac_hdr" >&5
-if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-/*#line 1868 "ltconfig"*/
-#include <$ac_hdr>
-int fnord = 0;
-int main () { return(0); }
-EOF
-ac_try="$ac_compile >/dev/null 2>conftest.out"
-{ (eval echo $progname:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-    if test "x$ac_cv_header_dlfcn_h" = xyes; then
-      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-    fi
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:1902: checking whether a program can dlopen itself" >&5
-if test "X${lt_cv_dlopen_self+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    lt_cv_dlopen_self=cross
-  else
-    cat > conftest.$ac_ext <<EOF
-/*#line 1910 "ltconfig"*/
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LTDL_GLOBAL	RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-#  define LTDL_GLOBAL	DL_GLOBAL
-# else
-#  define LTDL_GLOBAL	0
-# endif
-#endif
-
-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LTDL_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-# else
-#  ifdef DL_LAZY
-#   define LTDL_LAZY_OR_NOW	DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-#   else
-#    ifdef DL_NOW
-#     define LTDL_LAZY_OR_NOW	DL_NOW
-#    else
-#     define LTDL_LAZY_OR_NOW	0
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-void fnord() { int i=42; }
-int main() {
-    void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-               if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); return 1;}
-
-EOF
-if { (eval echo $progname:1957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  lt_cv_dlopen_self=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  lt_cv_dlopen_self=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-
-  if test "$lt_cv_dlopen_self" = yes; then
-    LDFLAGS="$LDFLAGS $link_static_flag"
-  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:1976: checking whether a statically linked program can dlopen itself" >&5
-if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    lt_cv_dlopen_self_static=cross
-  else
-    cat > conftest.$ac_ext <<EOF
-/*#line 1984 "ltconfig"*/
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LTDL_GLOBAL	RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-#  define LTDL_GLOBAL	DL_GLOBAL
-# else
-#  define LTDL_GLOBAL	0
-# endif
-#endif
-
-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LTDL_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-# else
-#  ifdef DL_LAZY
-#   define LTDL_LAZY_OR_NOW	DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-#   else
-#    ifdef DL_NOW
-#     define LTDL_LAZY_OR_NOW	DL_NOW
-#    else
-#     define LTDL_LAZY_OR_NOW	0
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-void fnord() { int i=42; }
-int main() {
-    void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); return 1; }
-
-EOF
-if { (eval echo $progname:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  lt_cv_dlopen_self_static=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  lt_cv_dlopen_self_static=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-fi
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-# Copy echo and quote the copy, instead of the original, because it is
-# used later.
-ltecho="$echo"
-if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
-fi
-LTSHELL="$SHELL"
-
-LTCONFIG_VERSION="$VERSION"
-
-# Only quote variables if we're using ltmain.sh.
-case $ltmain in
-*.sh)
-  # Now quote all the things that may contain metacharacters.
-  for var in ltecho old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \
-    old_MAGIC_CMD old_LD old_LDFLAGS old_LIBS \
-    old_LN_S old_NM old_RANLIB old_STRIP \
-    old_AS old_DLLTOOL old_OBJDUMP \
-    old_OBJEXT old_EXEEXT old_reload_flag \
-    old_deplibs_check_method old_file_magic_cmd \
-    AR AR_FLAGS CC LTCC LD LN_S NM LTSHELL LTCONFIG_VERSION \
-    reload_flag reload_cmds wl \
-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-    library_names_spec soname_spec \
-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-    predep_objects postdep_objects predeps postdeps compiler_lib_search_path \
-    old_striplib striplib file_magic_cmd export_symbols_cmds \
-    deplibs_check_method allow_undefined_flag no_undefined_flag \
-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    compiler_c_o need_locks exclude_expsyms include_expsyms; do
-
-    case $var in
-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ### testsuite: skip nested quoting test
-      ;;
-    *)
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ### testsuite: skip nested quoting test
-      ;;
-    esac
-  done
-
-  case $ltecho in
-  *'\$0 --fallback-echo"')
-    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-  if test -z "$tagname"; then
-    trap "$rm \"$ofile\"; exit 1" 1 2 15
-    echo "creating $ofile"
-    $rm "$ofile"
-    cat <<EOF > "$ofile"
-#! $SHELL
-
-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-#
-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# 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
-EOF
-  else
-    echo "appending configuration tag \"$tagname\" to $ofile"
-    echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
-  fi
-  cfgfile="$ofile"
-  ;;
-
-*)
-  # Double-quote the variables that need it (for aesthetics).
-  for var in old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \
-    old_MAGIC_CMD old_LD old_LDFLAGS old_LIBS \
-    old_LN_S old_NM old_RANLIB old_STRIP \
-    old_AS old_DLLTOOL old_OBJDUMP \
-    old_OBJEXT old_EXEEXT old_reload_flag \
-    old_deplibs_check_method old_file_magic_cmd; do
-    eval "$var=\\\"\$var\\\""
-  done
-
-  # Just create a config file.
-  cfgfile="$ofile.cfg"
-  if test -z "$tagname"; then
-    trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-    echo "creating $cfgfile"
-    $rm "$cfgfile"
-    cat <<EOF > "$cfgfile"
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-
-### BEGIN LIBTOOL CONFIG
-EOF
-  else
-    echo "appending to $cfgfile"
-    echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
-  fi
-  ;;
-esac
-
-cat <<EOF >> "$cfgfile"
-# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# AR=$old_AR AR_FLAGS=$old_AR_FLAGS LTCC=$old_LTCC CC=$old_CC \\
-# CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
-# MAGIC_CMD=$old_MAGIC_CMD LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
-# LN_S=$old_LN_S NM=$old_NM RANLIB=$old_RANLIB STRIP=$old_STRIP \\
-# AS=$old_AS DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP \\
-# objext=$old_OBJEXT exeext=$old_EXEEXT reload_flag=$old_reload_flag \\
-# deplibs_check_method=$old_deplibs_check_method \\
-# file_magic_cmd=$old_file_magic_cmd \\
-#   $0$ltconfig_args
-#
-# Compiler and other test output produced by $progname, useful for
-# debugging $progname, is in ./config.log if it exists.
-
-# The version of $progname that generated this script.
-LTCONFIG_VERSION=$LTCONFIG_VERSION
-
-# Shell to use when invoking shell scripts.
-SHELL=$LTSHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$need_lc
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$ltecho
-
-# The archiver.
-AR=$AR
-AR_FLAGS=$AR_FLAGS
-
-# A C compiler.
-LTCC=$LTCC
-
-# A language-specific compiler.
-CC=$CC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$with_gcc
-
-# The linker used to build libraries.
-LD=$LD
-
-# Whether we need hard or soft links.
-LN_S=$LN_S
-
-# A BSD-compatible nm program.
-NM=$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=$reload_flag
-reload_cmds=$reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$wl
-
-# Object file suffix (normally "o").
-objext="$objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$pic_flag
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$compiler_c_o
-
-# Must we lock files when doing compilation ?
-need_locks=$need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_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=$link_static_flag
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$RANLIB
-old_archive_cmds=$old_archive_cmds
-old_postinstall_cmds=$old_postinstall_cmds
-old_postuninstall_cmds=$old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$archive_cmds
-archive_expsym_cmds=$archive_expsym_cmds
-postinstall_cmds=$postinstall_cmds
-postuninstall_cmds=$postuninstall_cmds
-
-# Commands to strip libraries.
-old_striplib=$old_striplib
-striplib=$striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$global_symbol_to_cdecl
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# 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=$hardcode_libdir_flag_spec
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME.so 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
-
-# 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=$sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$include_expsyms
-
-EOF
-
-if test -z "$tagname"; then
-  echo '### END LIBTOOL CONFIG' >> "$ofile"
-else
-  echo "### END LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
-fi
-
-case $ltmain in
-*.sh)
-  echo >> "$ofile"
-  if test -z "$tagname"; then
-    case $host_os in
-    aix3*)
-      cat <<\EOF >> "$ofile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-      ;;
-    esac
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      cat <<'EOF' >> "$ofile"
-      # This is a source program that is used to create dlls on Windows
-      # Don't remove nor modify the starting and closing comments
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-      # This is a source program that is used to create import libraries
-      # on Windows for dlls which lack them. Don't remove nor modify the
-      # starting and closing comments
-# /* impgen.c starts here */
-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-#
-#  This file is part of GNU libtool.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#  */
-#
-#  #include <stdio.h>		/* for printf() */
-#  #include <unistd.h>		/* for open(), lseek(), read() */
-#  #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-#  #include <string.h>		/* for strdup() */
-#
-#  /* O_BINARY isn't required (or even defined sometimes) under Unix */
-#  #ifndef O_BINARY
-#  #define O_BINARY 0
-#  #endif
-#
-#  static unsigned int
-#  pe_get16 (fd, offset)
-#       int fd;
-#       int offset;
-#  {
-#    unsigned char b[2];
-#    lseek (fd, offset, SEEK_SET);
-#    read (fd, b, 2);
-#    return b[0] + (b[1]<<8);
-#  }
-#
-#  static unsigned int
-#  pe_get32 (fd, offset)
-#      int fd;
-#      int offset;
-#  {
-#    unsigned char b[4];
-#    lseek (fd, offset, SEEK_SET);
-#    read (fd, b, 4);
-#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-#  }
-#
-#  static unsigned int
-#  pe_as32 (ptr)
-#       void *ptr;
-#  {
-#    unsigned char *b = ptr;
-#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-#  }
-#
-#  int
-#  main (argc, argv)
-#      int argc;
-#      char *argv[];
-#  {
-#      int dll;
-#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-#      unsigned long export_rva, export_size, nsections, secptr, expptr;
-#      unsigned long name_rvas, nexp;
-#      unsigned char *expdata, *erva;
-#      char *filename, *dll_name;
-#
-#      filename = argv[1];
-#
-#      dll = open(filename, O_RDONLY|O_BINARY);
-#      if (dll < 1)
-#  	return 1;
-#
-#      dll_name = filename;
-#
-#      for (i=0; filename[i]; i++)
-#  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-#  	    dll_name = filename + i +1;
-#
-#      pe_header_offset = pe_get32 (dll, 0x3c);
-#      opthdr_ofs = pe_header_offset + 4 + 20;
-#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
-#
-#      if (num_entries < 1) /* no exports */
-#  	return 1;
-#
-#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
-#      export_size = pe_get32 (dll, opthdr_ofs + 100);
-#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-#      secptr = (pe_header_offset + 4 + 20 +
-#  	      pe_get16 (dll, pe_header_offset + 4 + 16));
-#
-#      expptr = 0;
-#      for (i = 0; i < nsections; i++)
-#      {
-#  	char sname[8];
-#  	unsigned long secptr1 = secptr + 40 * i;
-#  	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-#  	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-#  	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-#  	lseek(dll, secptr1, SEEK_SET);
-#  	read(dll, sname, 8);
-#  	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-#  	{
-#  	    expptr = fptr + (export_rva - vaddr);
-#  	    if (export_rva + export_size > vaddr + vsize)
-#  		export_size = vsize - (export_rva - vaddr);
-#  	    break;
-#  	}
-#      }
-#
-#      expdata = (unsigned char*)malloc(export_size);
-#      lseek (dll, expptr, SEEK_SET);
-#      read (dll, expdata, export_size);
-#      erva = expdata - export_rva;
-#
-#      nexp = pe_as32 (expdata+24);
-#      name_rvas = pe_as32 (expdata+32);
-#
-#      printf ("EXPORTS\n");
-#      for (i = 0; i<nexp; i++)
-#      {
-#  	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-#  	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-#      }
-#
-#      return 0;
-#  }
-# /* impgen.c ends here */
-
-EOF
-    ;;
-  esac
-
-
-    # Append the ltmain.sh script.
-    sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
-    # We use sed instead of cat because bash on DJGPP gets confused if
-    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-    # text mode, it properly converts lines to CR/LF.  This bash problem
-    # is reportedly fixed, but why not run on old versions too?
-
-    chmod +x "$ofile"
-  fi
-  ;;
-
-*)
-  # Compile the libtool program.
-  echo "FIXME: would compile $ltmain"
-  ;;
-esac
-
-# Update the list of available tags.
-if test -n "$tagname"; then
-
-  # 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'`
-
-  # Append the new tag name to the list of available tags.
-  available_tags="$available_tags $tagname"
-
-  # Now substitute the updated of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' ${ofile} > ${ofile}.new"; then
-    mv ${ofile}.new ${ofile}
-    chmod +x "$ofile"
-  else
-    rm -f ${ofile}.new
-    echo "$progname: unable to update list of available tagged configurations."
-    exit 1
-  fi
-fi
-
-# Don't cache tagged configuration!
-test -n "$cache_file" && test -z "$tagname" || exit 0
-
-# AC_CACHE_SAVE
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-exit 0
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/bibletime-doc/admin/ltmain.sh b/bibletime-doc/admin/ltmain.sh
deleted file mode 100644
index 1f5c51a..0000000
--- a/bibletime-doc/admin/ltmain.sh
+++ /dev/null
@@ -1,5395 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
-#
-# Copyright (C) 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.
-
-# 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.4a
-TIMESTAMP=" (1.641.2.206mm 2001/04/03 21:47:47)"
-
-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'
-SP2NL='tr \040 \012'
-NL2SP='tr \015\012 \040\040'
-
-# 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
-
-if test "$LTCONFIG_VERSION" != "$VERSION"; then
-  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-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/"
-
-# 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
-
-      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
-      ;;
-    *)
-      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"
-    exit 0
-    ;;
-
-  --config)
-    sed -n -e '/^### BEGIN LIBTOOL CONFIG/,/^### END LIBTOOL CONFIG/p' < "$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" ;;
-
-  --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 test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    case $nonopt in
-    *cc | *++ | gcc* | *-gcc*)
-      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=
-    prev=
-    lastarg=
-    srcfile="$nonopt"
-    suppress_output=
-
-    user_target=no
-    for arg
-    do
-      case $prev in
-      "") ;;
-      xcompiler)
-	# Aesthetically quote the previous argument.
-	prev=
-	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-
-	case $arg in
-	# Double-quote args containing other shell metacharacters.
-	# Many Bourne shells cannot handle close brackets correctly
-	# in scan sets, so we specify it separately.
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-
-	# Add the previous argument to base_compile.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
-
-      # Accept any command-line options.
-      case $arg in
-      -o)
-	if test "$user_target" != "no"; then
-	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	  exit 1
-	fi
-	user_target=next
-	;;
-
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	lastarg=
-	IFS="${IFS= 	}"; 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.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
-
-      case $user_target in
-      next)
-	# The next one is the -o target name
-	user_target=yes
-	continue
-	;;
-      yes)
-	# We got the output file
-	user_target=set
-	libobj="$arg"
-	continue
-	;;
-      esac
-
-      # Accept the current argument as the source file.
-      lastarg="$srcfile"
-      srcfile="$arg"
-
-      # Aesthetically quote the previous argument.
-
-      # Backslashify any backslashes, double quotes, and dollar signs.
-      # These are the only characters that are still specially
-      # interpreted inside of double-quoted scrings.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      case $lastarg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      # Add the previous argument to base_compile.
-      if test -z "$base_compile"; then
-	base_compile="$lastarg"
-      else
-	base_compile="$base_compile $lastarg"
-      fi
-    done
-
-    case $user_target in
-    set)
-      ;;
-    no)
-      # Get the name of the library object.
-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    *)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSfmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.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
-      "$CC "*) ;;
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
-      *)
-        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 "*)
-              # 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
-              ;;
-	    "`$echo $CC` "*)
-	      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 invokation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      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=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-
-    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=
-
-    # 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
-	  ;;
-	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 | egrep "^# 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
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi
-
-      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: not more than one -exported-symbols argument allowed"
-	  exit 1
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      # 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*)
-	  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 "$arg" = "-lc"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # These systems don't actually have c library (as such)
-	    continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  esac
-	elif test "$arg" = "-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have math library (as such)
-	    continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody math library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	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
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	IFS="${IFS= 	}"; 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=
-	IFS="${IFS= 	}"; 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
-	;;
-
-      # 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
-	;;
-
-      *.$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 | egrep "^# 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
-	;;
-      esac
-
-      # 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
-
-    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
-      "$CC "*) ;;
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
-      *)
-        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 "*)
-              # The compiler in $compile_command matches
-              # the one in the tagged configuration.
-              # Assume this is the tagged configuration we want.
-              tagname=$z
-              break
-	      ;;
-	    "`$echo $CC` "*)
-	      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
-
-    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
-      case "$libs " in
-      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-      esac
-      libs="$libs $deplib"
-    done
-
-    if test $linkmode = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    uninst_deplibs= # uninstalled libtool libraries
-    uninst_path= # paths that contain uninstalled 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; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    # Search the libtool library
-	    lib="$searchdir/lib${name}.la"
-	    if test -f "$lib"; then
-	      found=yes
-	      break
-	    fi
-	  done
-	  if test "$found" != yes; then
-	    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
-	  ;;
-	-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
-	  continue
-	  ;;
-	-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: This library needs some functionality provided by $deplib."
-	      echo "*** I have the capability to make that library automatically link in when"
-	      echo "*** you link to this library.  But I can only do this if you have a"
-	      echo "*** shared version of the library, which you do not appear to have."
-	    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
-	  ;;
-	*.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
-	if test $found = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	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 variable installed.
-	installed=yes
-
-	# 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"
-	  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"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test $linkmode != prog && test $linkmode != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
-	  fi
-	  continue
-	fi
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$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
-
-	# 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
-	  uninst_path="$uninst_path $abs_ladir"
-	fi
-	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
-
-	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
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-	  continue
-	fi
-
-	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
-
-	  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
-	    uninst_deplibs="$uninst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-	  if test $linkmode = lib && test "$hardcode_into_libs" = all; 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*)
-		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'"
-	      IFS="${IFS= 	}"; 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'"
-	      IFS="${IFS= 	}"; 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
-
-	  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"
-	      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"
-		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"
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      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 library needs some functionality provided by $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi
-
-	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"
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
-	    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="-L$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
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="-L$absdir"
-		fi
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi
-	fi
-      done
-      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
-	  # Make sure that $var contains only unique libraries
-	  # and add them in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    case "$deplib" in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    *)
-	      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
-      fi
-    done
-    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' 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 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 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' 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.
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	current="$2"
-	revision="$3"
-	age="$4"
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $revision in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $age in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	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)
-	  major=`expr $current - $age + 1`
-	  verstring="sgi$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test $loop != 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="sgi$major.$iface:$verstring"
-	  done
-
-	  # 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 != 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=
-	  verstring="0.0"
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      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 $uninst_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 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"
-	    ;;
-	  *)
- 	    # 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 behaviour.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $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" != "" -a "$name" != "0"; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		set dummy $deplib_matches
-		deplib_match=$2
-		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		  newdeplibs="$newdeplibs $i"
-		else
-		  droppeddeps=yes
-		  echo
-		  echo "*** Warning: This library needs some functionality provided by $i."
-		  echo "*** I have the capability to make that library automatically link in when"
-		  echo "*** you link to this library.  But I can only do this if you have a"
-		  echo "*** shared version of the library, which you do not appear to have."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occured in the first compile.  Let's try to salvage the situation:
-	    # Compile a seperate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	     # If $name is empty we are operating on a -L argument.
-	      if test "$name" != "" -a "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test $? -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    echo "*** Warning: This library needs some functionality provided by $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which you do not appear to have."
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "***  make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test "$name" != "" -a "$name" != "0"; then
-	      libname=`eval \\$echo \"$libname_spec\"`
-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		    for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | sed 10q \
-			 | egrep "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		    done
-	      done
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have."
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
-	     grep . >/dev/null; then
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    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 && 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"
-	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	  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 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 x$dlname = x; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-#	# Ensure that we have .o objects for linkers which dislike .lo
-#	# (e.g. aix) in case we are running --disable-static
-#	for obj in $libobjs; do
-#	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-#	  if test "X$xdir" = "X$obj"; then
-#	    xdir="."
-#	  else
-#	    xdir="$xdir"
-#	  fi
-#	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-#	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-#	  if test ! -f $xdir/$oldobj && test "$baseobj" != "$oldobj"; then
-#	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-#	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-#	  fi
-#	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    eval cmds=\"$export_symbols_cmds\"
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd" || exit $?
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test $status -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test $status -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	      libobjs="$libobjs "`find $xdir -name \*.$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 && test "$hardcode_into_libs" = all; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# 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
-        if len=`expr "X$cmds" : ".*"` &&
-           test $len -le $max_cmd_len; 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\"
-
-	  # 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.
-          IFS="${IFS= 	}"; 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
-        IFS="${IFS= 	}"; 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 && test "$hardcode_into_libs" = all; 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
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	    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\"
-      IFS="${IFS= 	}"; 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\"
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-#     else
-#	# Just create a symlink.
-#	$show $rm $libobj
-#	$run $rm $libobj
-#	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-#	if test "X$xdir" = "X$libobj"; then
-#	  xdir="."
-#	else
-#	  xdir="$xdir"
-#	fi
-#	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-#	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-#	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
-#	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit 0
-      ;;
-
-    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
-
-      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"
-
-      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="$objs$old_deplibs"
-	    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" | sort +2 | uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#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[] =
-{\
-"
-
-	    sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
-		-e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
-		  < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr_t) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  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 ;;
-	  *) exeext= ;;
-	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:
-  uninst_deplibs='$uninst_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 (eval \$relink_command); then :
-      else
-	$rm \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	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
-	# win32 systems need to use the prog path for dll
-	# lookup to work
-	*-*-cygwin* | *-*-pw32*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      # Export the path to the program.
-      PATH=\"\$progdir:\$PATH\"
-      export PATH
-
-      exec \$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  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="$objs$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test $status -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test $status -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print | $NL2SP`
-	done
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	eval cmds=\"$old_archive_from_new_cmds\"
-      else
-#	# Ensure that we have .o objects in place in case we decided
-#	# not to build a shared library, and have fallen back to building
-#	# static libs even though --disable-static was passed!
-#	for oldobj in $oldobjs; do
-#	  if test ! -f $oldobj; then
-#	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-#	    if test "X$xdir" = "X$oldobj"; then
-#	      xdir="."
-#	    else
-#	      xdir="$xdir"
-#	    fi
-#	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-#	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-#	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-#	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
-#	  fi
-#	done
-
-        eval cmds=\"$old_archive_cmds\"
-
-        if len=`expr "X$cmds" : ".*"` &&
-             test $len -le $max_cmd_len; 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
-          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
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-              eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-              objlist=
-            fi
-          done
-	  RANLIB=$save_RANLIB
-          oldobjs=$objlist
-          eval cmds=\"\$concat_cmds~$old_archive_cmds\"
-        fi
-      fi
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    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"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-
-      # 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) 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
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test $hardcode_into_libs = all &&
-	     test "$installed" = no && test $need_relink = yes; 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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	library_names=
-	old_library=
-	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 "$hardcode_into_libs" = all && test -n "$relink_command"; then
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    continue
-	  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 "$hardcode_into_libs" = all && 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\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# 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
-
-	# Do a test to see if this is really a libtool program.
-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  uninst_deplibs=
-	  relink_command=
-
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$uninst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-	    exit 1
-	  fi
-
-	  finalize=yes
-	  for lib in $uninst_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=
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  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" | $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" | $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\"
-      IFS="${IFS= 	}"; 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 $SHELL $0 --finish$current_libdirs
-      exit 1
-    fi
-
-    exit 0
-    ;;
-
-  # 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\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || 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 \`-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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	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 | egrep "^# 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 enviroment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now actually exec the command.
-      eval "exec \$cmd$args"
-
-      $echo "$modename: cannot exec \$cmd$args"
-      exit 1
-    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=
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -*) 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=
-
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$objdir"
-      else
-	objdir="$dir/$objdir"
-      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
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $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\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      eval cmds=\"$old_postuninstall_cmds\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-	      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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-          # Read the .lo file
-          . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-          if test -n "$pic_object" \
-             && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-          fi
-
-	  # Add non-PIC object to the list of files to remove.
-          if test -n "$non_pic_object" \
-             && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-          fi
-	fi
-	;;
-
-      *)
-	# Do a test to see if this is a libtool program.
-	if test $mode = clean &&
-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  relink_command=
-	  . $dir/$file
-
-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	  if test "$fast_install" = yes && test -n "$relink_command"; then
-	    rmfiles="$rmfiles $objdir/lt-$name"
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles
-    done
-
-    # 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 0
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$generic_help" 1>&2
-  exit 1
-fi # test -z "$show_help"
-
-# 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."
-  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
-  -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/bibletime-doc/admin/missing b/bibletime-doc/admin/missing
deleted file mode 100755
index 5f9da90..0000000
--- a/bibletime-doc/admin/missing
+++ /dev/null
@@ -1,265 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-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.3 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  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.in`
-    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)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-         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
-    ;;
-
-  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)
-    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)
-    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 ${1+"$@"} && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar ${1+"$@"} && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" ${1+"$@"} && 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/bibletime-doc/admin/mkinstalldirs b/bibletime-doc/admin/mkinstalldirs
deleted file mode 100755
index a2714af..0000000
--- a/bibletime-doc/admin/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.1.1.1 2001/11/24 19:50:34 mgruner Exp $
-
-errstatus=0
-
-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
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/bibletime-doc/admin/ylwrap b/bibletime-doc/admin/ylwrap
deleted file mode 100755
index 8aa0314..0000000
--- a/bibletime-doc/admin/ylwrap
+++ /dev/null
@@ -1,142 +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.
-
-# Usage:
-#     ylwrap PROGRAM INPUT [OUTPUT DESIRED]... -- [ARGS]...
-# * PROGRAM is program to run.
-# * INPUT is the input file
-# * OUTPUT is file PROG generates
-# * DESIRED is file we actually want
-# * ARGS are passed to PROG
-# Any number of OUTPUT,DESIRED pairs may be used.
-
-# The program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
- /* | [A-Za-z]:*) ;;
- */*) prog="`pwd`/$prog" ;;
-esac
-
-# The input.
-input="$1"
-shift
-case "$input" in
- /* | [A-Za-z]:*)
-    # Absolute path; do nothing.
-    ;;
- *)
-    # Relative path.  Make it absolute.  Why?  Because otherwise any
-    # debugging info in the generated file will point to the wrong
-    # place.  This is really gross.
-    input="`pwd`/$input"
-    ;;
-esac
-
-# We don't want to use the absolute path if the input in the current
-# directory like when making a tar ball.
-input_base=`echo $input | sed -e 's|.*/||'`
-if test -f $input_base && cmp $input_base $input >/dev/null 2>&1; then
-  input=$input_base
-fi
-
-pairlist=
-while test "$#" -ne 0; do
-   if test "$1" = "--"; then
-      shift
-      break
-   fi
-   pairlist="$pairlist $1"
-   shift
-done
-
-# 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
-case "$input" in
- /* | [A-Za-z]:*)
-    # Absolute path; do nothing.
-    ;;
- *)
-    # Make a symbolic link, hard link or hardcopy.
-    ln -s ../"$input" . > /dev/null 2>&1 || ln ../"$input" . > /dev/null 2>&1 || cp ../"$input" .
-    ;;
-esac
-$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
-	   /* | [A-Za-z]:*) target="$2";;
-	   *) target="../$2";;
-	 esac
-	 mv "$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/bibletime-doc/bibletime-doc.spec b/bibletime-doc/bibletime-doc.spec
deleted file mode 100644
index c15ddce..0000000
--- a/bibletime-doc/bibletime-doc.spec
+++ /dev/null
@@ -1,76 +0,0 @@
-%define         name 		bibletime-doc
-%define         version 	@VERSION
-%define		release 	1
-
-# This should be set to your os.
-# Possible values are  Mandrake, Red Hat, Turbolinux, Caldera, SuSE, Debian, etc.
-%define         ostype          Debian
-
-# This should be set to the version of your OS (6.0, 6.1, 6.2, 7.0, 7.1, 7.2, 8
-%define         osversion       3.0
-
-# This is your cpu i486, i586, i686, ppc, sparc, alfa, etc.
-%define         buildarch       noarch
-
-# This the RPM group on your system that this will installed into.
-# Graphical desktop/KDE, X11/apps, etc.
-%define         rpmgroup        Graphical desktop/KDE
-
-Summary:        BibleTime %{version} is an easy to use Bible study tool for KDE2.
-Name:		%{name}
-Version:        %{version}
-Release:        %{release}
-#Icon:		bibletime.xpm
-Copyright:      GPL
-Vendor:         The team of BibleTime <info@bibletime.de>
-Url:            http://www.bibletime.de
-Packager:       Brook Humphrey <bah@webmedic.net>, Joachim Ansorg <jansorg@gmx.de>
-Group:          %{rpmgroup}
-BuildArch:      %{buildarch}
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}--rootbibletime
-Prefix: 	/usr
-
-%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-xxx.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.
-
-This RPM has these compiled options Sword is compiled %{swordlibs} and KDE/QT is compiled %{kdelibs}.
-
-Although this binary no longer requires sword to run the source.rpm will not build correctly
-without the sword-devel package installed.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-
-
-
-%setup -q
-make -f Makefile.cvs
-./configure;
-make
-
-%install
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-#Sword config files
-# global BibleTime config files
-%{prefix}/share/doc/HTML/*/bibletime/*
-%{prefix}/share/locale/*/LC_MESSAGES/bibletime*
-
-
diff --git a/bibletime-doc/bibletime-doc.spec.in b/bibletime-doc/bibletime-doc.spec.in
deleted file mode 100644
index 6724ad5..0000000
--- a/bibletime-doc/bibletime-doc.spec.in
+++ /dev/null
@@ -1,76 +0,0 @@
-%define         name 		@PACKAGE@
-%define         version 	@VERSION
-%define		release 	1
-
-# This should be set to your os.
-# Possible values are  Mandrake, Red Hat, Turbolinux, Caldera, SuSE, Debian, etc.
-%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
-%define         osversion       @DISTRIBUTION_VERSION@
-
-# This is your cpu i486, i586, i686, ppc, sparc, alfa, etc.
-%define         buildarch       noarch
-
-# 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 KDE2.
-Name:		%{name}
-Version:        %{version}
-Release:        %{release}
-#Icon:		bibletime.xpm
-Copyright:      GPL
-Vendor:         The team of BibleTime <info@bibletime.de>
-Url:            http://www.bibletime.de
-Packager:       Brook Humphrey <bah@webmedic.net>, Joachim Ansorg <jansorg@gmx.de>
-Group:          %{rpmgroup}
-BuildArch:      %{buildarch}
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}--rootbibletime
-Prefix: 	@RPM_PREFIX@
-
-%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-xxx.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.
-
-This RPM has these compiled options Sword is compiled %{swordlibs} and KDE/QT is compiled %{kdelibs}.
-
-Although this binary no longer requires sword to run the source.rpm will not build correctly
-without the sword-devel package installed.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-
-
-
-%setup -q
-make -f Makefile.cvs
-./configure;
-make
-
-%install
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-#Sword config files
-# global BibleTime config files
-%{prefix}/share/doc/HTML/*/bibletime/*
-%{prefix}/share/locale/*/LC_MESSAGES/bibletime*
-
-
diff --git a/bibletime-doc/bibletime.m4 b/bibletime-doc/bibletime.m4
deleted file mode 100644
index 64b08fa..0000000
--- a/bibletime-doc/bibletime.m4
+++ /dev/null
@@ -1,156 +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/kde2"
-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])
-])
-
diff --git a/bibletime-doc/config.guess b/bibletime-doc/config.guess
deleted file mode 100755
index ed2e03b..0000000
--- a/bibletime-doc/config.guess
+++ /dev/null
@@ -1,1321 +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-03-20'
-
-# 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
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 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
-	    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.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *: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 ;;
-    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 $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    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 $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	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 $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
-		fi ;;
-	esac
-	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 $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	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:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	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
-	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
-	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|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # 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 ;;
-    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 | 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 ;;
-    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-[GKLNPTVW]: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 $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-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/bibletime-doc/config.sub b/bibletime-doc/config.sub
deleted file mode 100755
index f365797..0000000
--- a/bibletime-doc/config.sub
+++ /dev/null
@@ -1,1443 +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-03-07'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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* | 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 \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 | mipsisa64 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-	| 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-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | 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)
-		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
-		;;
-	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
-		;;
-	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)
-		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
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-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*)
-	# 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*)
-				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/bibletime-doc/configure b/bibletime-doc/configure
deleted file mode 100755
index db4e5ae..0000000
--- a/bibletime-doc/configure
+++ /dev/null
@@ -1,7785 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_default_prefix=${KDEDIR:-/usr/local/kde}
-ac_help="$ac_help
-  --disable-fast-perl     disable fast Makefile generation (needs perl)"
-ac_help="$ac_help
-  --enable-debug          enables debug symbols [default=no]"
-ac_help="$ac_help
-  --disable-debug         disables debug output and debug symbols [default=no]"
-ac_help="$ac_help
-  --enable-strict         compiles with strict compiler options (may not work!)"
-ac_help="$ac_help
-  --enable-profile        creates profiling infos [default=no]"
-ac_help="$ac_help
-  --enable-final          build size optimized apps (experimental - needs lots of memory)"
-ac_help="$ac_help
-  --disable-closure       don't delay template instantiation"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=no]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-ac_help="$ac_help
-  --enable-objprelink     prelink apps using objprelink (experimental [only tested on linux/386])"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --with-xinerama         enable support for Xinerama "
-ac_help="$ac_help
-  --enable-mt             link to threaded Qt (experimental)"
-ac_help="$ac_help
-  --with-extra-includes=DIR
-                          adds non standard include paths"
-ac_help="$ac_help
-  --with-extra-libs=DIR   adds non standard library paths"
-ac_help="$ac_help
-  --with-qt-dir=DIR       where the root of Qt is installed "
-ac_help="$ac_help
-  --with-qt-includes=DIR  where the Qt includes are. "
-ac_help="$ac_help
-  --with-qt-libraries=DIR where the Qt library is installed."
-ac_help="$ac_help
-  --disable-rpath         do not use the rpath feature of ld"
-ac_help="$ac_help
-  --disable-path-check    don't try to find out, where to install"
-ac_help="$ac_help
-  --with-distribution=TYPE     The name of your *NIX distribution, e.g. SuSE [auto] "
-ac_help="$ac_help
-  --with-distribution-version=VERSION     Version of your *NIX distribution, e.g. 7.2 [auto] "
-ac_help="$ac_help
-  --with-rpm-prefix=DIR    The directory which should be used as PREFIX
-														in the RPM spec file [auto] "
-ac_help="$ac_help
-  --with-rpm-group=DIR     The group which will be used for the RPM system [auto] "
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-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'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-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
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # 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 ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$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" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) 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)
-    # 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 << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --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
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$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)
-    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 ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    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 "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# 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
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=acinclude.m4
-
-# 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_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  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 "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# 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 "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
- 
-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
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in admin $srcdir/admin" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-unset CDPATH
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:635: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:656: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:674: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-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"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-
-    
-          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
-# 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 $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:733: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/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
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-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 "$ac_t""$INSTALL" 1>&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_PROGRAM}'
-
-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 $ac_n "checking for -p flag to install""... $ac_c" 1>&6
-echo "configure:790: checking for -p flag to install" >&5
-    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 "$ac_t""$ac_res" 1>&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 $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:813: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:851: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 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 conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=bibletime-doc
-
-VERSION=1.1
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:897: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:910: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:923: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:936: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:949: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
- 
-
-  unset CDPATH
-    
-
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-    ac_configure_args="$ac_configure_args --prefix $prefix"
-  fi
-  
-    # 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
-  
-
-
-
-
-  # Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval="$enable_debug"
-  
-   if test $enableval = "no";      then
-       kde_use_debug_code="no"
-       kde_use_debug_define=yes
-     else
-       kde_use_debug_code="yes"
-       kde_use_debug_define=no
-   fi
-  
-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-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"
-
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1052: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1082: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-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 $# -gt 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
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1133: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1165: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1176 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1207: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1212: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1240: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&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
- 
-
-  if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CFLAGS="-g -O2 $CFLAGS"
-      case $host in
-        *-*-linux-gnu)	
-          CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-        ;;
-      esac
-    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"
-
-  for ac_prog in $CCC c++ g++ gcc CC cxx cc++ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$CXX" && break
-done
-test -n "$CXX" || CXX="gcc"
-
-
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1337: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-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
-
-#line 1353 "configure"
-#include "confdefs.h"
-
-int main(){return(0);}
-EOF
-if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cxx_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cxx_cross=no
-  else
-    ac_cv_prog_cxx_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cxx_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-if test $ac_cv_prog_cxx_works = no; then
-  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1384: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1389: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
-else
-  ac_cv_prog_gxx=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-
-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-
-ac_test_CXXFLAGS="${CXXFLAGS+set}"
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1417: checking whether ${CXX-g++} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-  ac_cv_prog_cxx_g=yes
-else
-  ac_cv_prog_cxx_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&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
-
-
-  if test "$GXX" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
-
-      
-echo $ac_n "checking whether $CXX supports -Wno-long-long""... $ac_c" 1>&6
-echo "configure:1455: checking whether $CXX supports -Wno-long-long" >&5
-kde_cache=`echo Wno-long-long | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -Wno-long-long -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -Wno-long-long -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- CXXFLAGS="-Wno-long-long $CXXFLAGS"
-else
- echo "$ac_t""no" 1>&6
- :
- 
-fi
-
-      
-echo $ac_n "checking whether $CXX supports -Wnon-virtual-dtor""... $ac_c" 1>&6
-echo "configure:1484: checking whether $CXX supports -Wnon-virtual-dtor" >&5
-kde_cache=`echo Wnon-virtual-dtor | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -Wnon-virtual-dtor -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -Wnon-virtual-dtor -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"
-else
- echo "$ac_t""no" 1>&6
- :
- 
-fi
-
-      
-echo $ac_n "checking whether $CXX supports -fno-builtin""... $ac_c" 1>&6
-echo "configure:1513: checking whether $CXX supports -fno-builtin" >&5
-kde_cache=`echo fno-builtin | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -fno-builtin -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -fno-builtin -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- CXXFLAGS="-fno-builtin $CXXFLAGS"
-else
- echo "$ac_t""no" 1>&6
- :
- 
-fi
-
-
-      case $host in        *-*-linux-gnu)
-        CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS"
-        ;;
-      esac
-
-      if test "$kde_use_strict_options" = "yes"; then
-        CXXFLAGS="-Wcast-qual -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
-      fi
-
-      if test "$kde_very_strict" = "yes"; then
-        CXXFLAGS="-Wold-style-cast -Wredundant-decls -Wconversion $CXXFLAGS"
-      fi
-    else
-      CXXFLAGS="-O2 $CXXFLAGS"
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG $CXXFLAGS"
-  fi  
-
-  if test "$kde_use_profiling" = "yes"; then
-    
-echo $ac_n "checking whether $CXX supports -pg""... $ac_c" 1>&6
-echo "configure:1565: checking whether $CXX supports -pg" >&5
-kde_cache=`echo pg | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -pg -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -pg -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- 
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-    
-else
- echo "$ac_t""no" 1>&6
- :
- 
-fi
-
-  fi
-    
-  
-echo $ac_n "checking whether $CXX supports -fno-exceptions""... $ac_c" 1>&6
-echo "configure:1599: checking whether $CXX supports -fno-exceptions" >&5
-kde_cache=`echo fno-exceptions | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -fno-exceptions -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -fno-exceptions -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- CXXFLAGS="$CXXFLAGS -fno-exceptions"
-else
- echo "$ac_t""no" 1>&6
- :
- 
-fi
-
-  
-echo $ac_n "checking whether $CXX supports -fno-check-new""... $ac_c" 1>&6
-echo "configure:1628: checking whether $CXX supports -fno-check-new" >&5
-kde_cache=`echo fno-check-new | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -fno-check-new -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -fno-check-new -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- CXXFLAGS="$CXXFLAGS -fno-check-new"
-else
- echo "$ac_t""no" 1>&6
- :
- 
-fi
-
-  
-echo $ac_n "checking whether $CXX supports -fexceptions""... $ac_c" 1>&6
-echo "configure:1657: checking whether $CXX supports -fexceptions" >&5
-kde_cache=`echo fexceptions | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -fexceptions -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -fexceptions -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- USE_EXCEPTIONS="-fexceptions"
-else
- echo "$ac_t""no" 1>&6
- :
- USE_EXCEPTIONS=	
-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 "configure: 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" 1>&2; exit 1; }
-          fi
-        fi
-        ;;
-  esac
-
-    __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 "configure: warning: found forbidden $i in CXX, removing it" 1>&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 "configure: warning: found forbidden $i in CXXFLAGS, removing it" 1>&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
-
-
-
-  echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1741: checking how to run the C++ preprocessor" >&5
-if test -z "$CXXCPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-   ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-  CXXCPP="${CXX-g++} -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1757 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CXXCPP=/lib/cpp
-fi
-rm -f conftest*
-  ac_cv_prog_CXXCPP="$CXXCPP"
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-fi
-fi
-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
-
-
-  # the following is to allow programs, that are known to
-  # have problems when compiled with -O2
-  if test -n "$CXXFLAGS"; then
-      kde_safe_IFS=$IFS
-      IFS=" "
-      NOOPT_CXXFLAGS=""
-      for i in $CXXFLAGS; do
-        case $i in
-          -O*)
-                ;;
-          *)
-                NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS $i"
-                ;;
-        esac
-      done
-      IFS=$kde_safe_IFS
-  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
-
-
-  
-  REPO=""
-  NOREPO=""
-
-  
-echo $ac_n "checking whether $CXX supports -frepo""... $ac_c" 1>&6
-echo "configure:1823: checking whether $CXX supports -frepo" >&5
-kde_cache=`echo frepo | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -frepo -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -frepo -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- 
-     REPO="-frepo"
-     NOREPO="-fno-repo"
-   
-else
- echo "$ac_t""no" 1>&6
- :
- 
-fi
-
-
-  if test -z "$REPO"; then
-  
-echo $ac_n "checking whether $CXX supports -instances=explicit""... $ac_c" 1>&6
-echo "configure:1857: checking whether $CXX supports -instances=explicit" >&5
-kde_cache=`echo instances=explicit | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -instances=explicit -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -instances=explicit -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- 
-     REPO="-instances=explicit"
-     NOREPO="-instances=extern"
-  
-else
- echo "$ac_t""no" 1>&6
- :
- 
-fi
-
-  fi
-
-  if test -n "$REPO"; then
-     cat >> confdefs.h <<EOF
-#define HAVE_TEMPLATE_REPOSITORY 1
-EOF
-
-     
-  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=yes
-fi
-
-
-  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=""
-  fi
-  
-  
-
-
-  
-
-  KDE_CXXFLAGS=
-  
-
-# 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.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=no
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
-
-# 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 $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:2017: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:2047: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:2050: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:2085: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:2102: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2114: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-
-NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2152: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2173: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  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*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-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_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # 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-gnu*)
-  case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | m68k* | arm* | mips* | hppa* | sh* )
-    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='file_magic NetBSD/[a-z0-9]* demand paged shared library'
-  else
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-  fi
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-  ;;
-
-openbsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
-    i*86 )
-            lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 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
-  ;;
-
-newsos6)
-  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
-  ;;
-
-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
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  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*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# 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 $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2361: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2423: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2494: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2526: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2561: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2593: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-libtool_flags="$libtool_flags --enable-dlopen"
-
-# 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 && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# 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 x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 2660 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2682: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2695 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&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
-
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:2733: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2738 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:2749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:2766: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2771 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:2778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-
-
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-
-
-
-
-
-
-
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2913: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:2939: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.$ac_ext | *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-
-  
-
-  
-	 
-	 
-
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
-
-
-# Check whether --enable-objprelink or --disable-objprelink was given.
-if test "${enable_objprelink+set}" = set; then
-  enableval="$enable_objprelink"
-  kde_use_objprelink=$enableval
-else
-  kde_use_objprelink=no
-fi
-
-  if test "x$kde_use_objprelink" = "xyes"; then 
-
-      
-   echo $ac_n "checking for objprelink""... $ac_c" 1>&6
-echo "configure:3001: checking for objprelink" >&5
-   if test -n "$OBJPRELINK"; then
-        kde_cv_path="$OBJPRELINK";
-   else
-        kde_cache=`echo objprelink | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        kde_cv_path="NONE"
-	dirs=""
-	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/objprelink"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/objprelink  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/objprelink"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/objprelink"
-                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 "$ac_t""not found" 1>&6
-      kde_use_objprelink=no
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      OBJPRELINK=$kde_cv_path
-
-   fi
-   
-     
-      if test "x$kde_use_objprelink" = "xyes"; then
-      echo $ac_n "checking Patching libtool to run objprelink.""... $ac_c" 1>&6
-echo "configure:3058: checking Patching libtool to run objprelink." >&5
-      mv libtool libtool.orig
-      cat > libtool <<\EOF
-#! /bin/sh
-for n ; do case $n in
-  *.o)  test -r $n && echo objprelink $n && objprelink $n ;;
-  *.lo) m=`basename $n .lo`".o" && test -r $m && echo objprelink $m && objprelink $m 
-        m=".libs/$m" && test -r $m && echo objprelink $m && objprelink $m ;;
-esac; done
-EOF
-      cat >> libtool libtool.orig
-      rm libtool.orig
-      chmod a+x libtool
-      echo "$ac_t""done" 1>&6
-	fi
-  fi
-
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:3077: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # 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 "$ac_t""$USE_MAINTAINER_MODE" 1>&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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3105: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""$MSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3139: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GMSGFMT" in
-  /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-        echo "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3184: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""$XGETTEXT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-            if test "$XGETTEXT" != ":"; then
-			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6
-	  XGETTEXT=":"
-	fi
-      fi
-     
-
-  
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3228: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 3243 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 3260 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 3277 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-
-   ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-      echo $ac_n "checking for main in -lutil""... $ac_c" 1>&6
-echo "configure:3316: checking for main in -lutil" >&5
-ac_lib_var=`echo util'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lutil  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3324 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:3331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBUTIL="-lutil"
-else
-  echo "$ac_t""no" 1>&6
-fi
-    
-   echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6
-echo "configure:3352: checking for main in -lcompat" >&5
-ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcompat  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3360 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBCOMPAT="-lcompat"
-else
-  echo "$ac_t""no" 1>&6
-fi
-    
-   kde_have_crypt=
-   echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3389: checking for crypt in -lcrypt" >&5
-ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcrypt  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3397 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char crypt();
-
-int main() {
-crypt()
-; return 0; }
-EOF
-if { (eval echo configure:3408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBCRYPT="-lcrypt"; kde_have_crypt=yes
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for crypt in -lc""... $ac_c" 1>&6
-echo "configure:3427: checking for crypt in -lc" >&5
-ac_lib_var=`echo c'_'crypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3435 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char crypt();
-
-int main() {
-crypt()
-; return 0; }
-EOF
-if { (eval echo configure:3446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  kde_have_crypt=yes
-else
-  echo "$ac_t""no" 1>&6
-
-        echo "configure: warning: you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support" 1>&2
-	kde_have_crypt=no
-      
-fi
-
-fi
-
-   
-   if test $kde_have_crypt = yes; then
-      cat >> confdefs.h <<EOF
-#define HAVE_CRYPT 1
-EOF
-
-   fi
-   
-  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:3483: checking for socklen_t" >&5
-  if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-     ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-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
-#line 3500 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-      
-int main() {
-
-socklen_t a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-      
-; return 0; }
-EOF
-if { (eval echo configure:3513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_socklen_t=socklen_t
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 3521 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-        
-int main() {
-
-int a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-        
-; return 0; }
-EOF
-if { (eval echo configure:3534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_socklen_t=int
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_socklen_t=size_t
-      
-fi
-rm -f conftest*
-    
-fi
-rm -f conftest*
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-  
-fi
-
-
-  echo "$ac_t""$ac_cv_socklen_t" 1>&6
-  if test "$ac_cv_socklen_t" != "socklen_t"; then
-    cat >> confdefs.h <<EOF
-#define socklen_t $ac_cv_socklen_t
-EOF
-
-  fi
-  cat >> confdefs.h <<EOF
-#define ksize_t socklen_t
-EOF
-
-
-
-   ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-   echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3580: checking for dnet_ntoa in -ldnet" >&5
-ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3588 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:3599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3621: checking for dnet_ntoa in -ldnet_stub" >&5
-ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet_stub  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3629 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:3640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-   fi
-   echo $ac_n "checking for inet_ntoa""... $ac_c" 1>&6
-echo "configure:3662: checking for inet_ntoa" >&5
-if eval "test \"`echo '$''{'ac_cv_func_inet_ntoa'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3667 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char inet_ntoa(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char inet_ntoa();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
-choke me
-#else
-inet_ntoa();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_inet_ntoa=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_inet_ntoa=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'inet_ntoa`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-   if test $ac_cv_func_inet_ntoa = no; then
-     echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6
-echo "configure:3711: checking for inet_ntoa in -lnsl" >&5
-ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3719 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char inet_ntoa();
-
-int main() {
-inet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:3730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-   fi
-   echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:3752: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3757 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_connect) || defined (__stub___connect)
-choke me
-#else
-connect();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_connect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-   if test $ac_cv_func_connect = no; then
-      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3801: checking for connect in -lsocket" >&5
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3809 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-   fi
-
-   echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:3843: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3848 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_remove) || defined (__stub___remove)
-choke me
-#else
-remove();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_remove=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_remove=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-   if test $ac_cv_func_remove = no; then
-      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3892: checking for remove in -lposix" >&5
-ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3900 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-remove()
-; return 0; }
-EOF
-if { (eval echo configure:3911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-   fi
-
-   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3935: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3940 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmat) || defined (__stub___shmat)
-choke me
-#else
-shmat();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3981: checking for shmat in -lipc" >&5
-ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lipc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3989 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-shmat()
-; return 0; }
-EOF
-if { (eval echo configure:4000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-   
-   # Solaris 2.6 and others need -lresolv for res_init
-   for ac_func in res_init
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4027: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4032 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-kde_libs_safe="$LIBS"
-     LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-     cat > conftest.$ac_ext <<EOF
-#line 4079 "configure"
-#include "confdefs.h"
-
-#include <resolv.h>
-
-int main() {
- 
-res_init(); 
-
-; return 0; }
-EOF
-if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  LIBRESOLV="-lresolv"
-        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-        cat >> confdefs.h <<\EOF
-#define HAVE_RES_INIT 1
-EOF
-
-     
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-     LIBS=$kde_libs_safe
-   
-fi
-done
-
-
-   LIBSOCKET="$X_EXTRA_LIBS"
-   
-   
-   
-   echo $ac_n "checking for killpg in -lucb""... $ac_c" 1>&6
-echo "configure:4115: checking for killpg in -lucb" >&5
-ac_lib_var=`echo ucb'_'killpg | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lucb  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4123 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char killpg();
-
-int main() {
-killpg()
-; return 0; }
-EOF
-if { (eval echo configure:4134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBUCB="-lucb"
-else
-  echo "$ac_t""no" 1>&6
-fi
-    
-
-   case $host in     *-*-lynxos* )
-        echo $ac_n "checking LynxOS header file wrappers""... $ac_c" 1>&6
-echo "configure:4157: checking LynxOS header file wrappers" >&5
-        CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
-        echo "$ac_t""disabled" 1>&6
-        echo $ac_n "checking for gethostbyname in -lbsd""... $ac_c" 1>&6
-echo "configure:4161: checking for gethostbyname in -lbsd" >&5
-ac_lib_var=`echo bsd'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lbsd  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4169 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBSOCKET="-lbsd"
-else
-  echo "$ac_t""no" 1>&6
-fi
-          ;;
-    esac
-
-     echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4203: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_int=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4211 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <sys/types.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
-}
-EOF
-if { (eval echo configure:4223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_int=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-EOF
-
-  echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4242: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4250 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <sys/types.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
-}
-EOF
-if { (eval echo configure:4262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF
-
-  echo $ac_n "checking size of char *""... $ac_c" 1>&6
-echo "configure:4281: checking size of char *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_char_p=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4289 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <sys/types.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(char *));
-  exit(0);
-}
-EOF
-if { (eval echo configure:4301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_char_p=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_char_p=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-EOF
-
-  echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:4320: checking size of char" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_char=1
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4328 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <sys/types.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(char));
-  exit(0);
-}
-EOF
-if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_char=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_char=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_char" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-EOF
-
-
-   
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4361: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4369 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:4380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-LIBDL="-ldl"
-ac_cv_have_dlfcn=yes
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for shl_unload in -ldld""... $ac_c" 1>&6
-echo "configure:4405: checking for shl_unload in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_unload | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4413 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shl_unload();
-
-int main() {
-shl_unload()
-; return 0; }
-EOF
-if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-LIBDL="-ldld"
-ac_cv_have_shload=yes
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-
-
-
-echo $ac_n "checking for extra includes""... $ac_c" 1>&6
-echo "configure:4453: checking for extra includes" >&5
-# 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 "$ac_t""$kde_use_extra_includes" 1>&6
-
-kde_extra_libs=
-echo $ac_n "checking for extra libs""... $ac_c" 1>&6
-echo "configure:4484: checking for extra libs" >&5
-# 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 "$ac_t""$kde_use_extra_libs" 1>&6
-
-
-
-
-echo $ac_n "checking for libz""... $ac_c" 1>&6
-echo "configure:4518: checking for libz" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_z'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-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 <<EOF
-#line 4535 "configure"
-#include "confdefs.h"
-
-#include<zlib.h>
-
-int main() {
-return (zlibVersion() == ZLIB_VERSION); 
-; return 0; }
-EOF
-if { (eval echo configure:4544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_z='-lz'"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_z=no"
-fi
-rm -f conftest*
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-
-fi
-if test ! "$ac_cv_lib_z" = no; then
-  cat >> confdefs.h <<EOF
-#define HAVE_LIBZ 1
-EOF
-
-  LIBZ="$ac_cv_lib_z"
-  
-  echo "$ac_t""$ac_cv_lib_z" 1>&6
-else
-  { echo "configure: error: not found. Check your installation and look into config.log" 1>&2; exit 1; }
-  LIBZ=""
-  
-fi
-
-
-echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4574: checking for X" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-if eval "test \"`echo '$''{'kde_cv_have_x'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 <<EOF
-#line 4608 "configure"
-#include "confdefs.h"
-#include <$x_direct_test_include>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  # 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*
-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 <<EOF
-#line 4682 "configure"
-#include "confdefs.h"
-
-int main() {
-${x_direct_test_function}()
-; return 0; }
-EOF
-if { (eval echo configure:4689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  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/` \
-    /usr/X11/lib          \
-    /usr/X11R6/lib        \
-    /usr/X11R5/lib        \
-    /usr/X11R4/lib        \
-                          \
-    /usr/lib/X11          \
-    /usr/lib/X11R6        \
-    /usr/lib/X11R5        \
-    /usr/lib/X11R4        \
-                          \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
-                          \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11	  \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
-    ; \
-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*
-fi # $ac_x_libraries = NO
-
-case "$host" in
-mips-sgi-irix6*)
-  ;;
-*-*-solaris*)
-  ;;
-*)
-  rm -fr conftestdir
-if mkdir conftestdir; then
-  cd conftestdir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat > Imakefile <<'EOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-EOF
-  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 conftestdir
-fi
-
-  if test -z "$ac_x_includes"; then
-    ac_x_includes="."
-  fi
-  if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib"
-  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 "configure: error: Can't find X includes. Please check your installation and add the correct paths!" 1>&2; exit 1; }
-fi
-
-if test "$kde_x_libraries" = NO; then
-  { echo "configure: error: Can't find X libraries. Please check your installation and add the correct paths!" 1>&2; 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 "$ac_t""$have_x" 1>&6
-  no_x=yes
-else
-  echo "$ac_t""libraries $kde_x_libraries, headers $kde_x_includes" 1>&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 $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4863: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4871 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber();
-
-int main() {
-IceConnectionNumber()
-; return 0; }
-EOF
-if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBSM="-lSM -lICE"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-LDFLAGS="$ac_save_LDFLAGS"
-
-
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-
-echo $ac_n "checking for libXext""... $ac_c" 1>&6
-echo "configure:4911: checking for libXext" >&5
-if eval "test \"`echo '$''{'kde_cv_have_libXext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-cat > conftest.$ac_ext <<EOF
-#line 4923 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-int main() {
-
-printf("hello Xext\n");
-
-; return 0; }
-EOF
-if { (eval echo configure:4937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  kde_cv_have_libXext=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  kde_cv_have_libXext=no
-   
-fi
-rm -f conftest*
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
- 
-fi
-
-
-echo "$ac_t""$kde_cv_have_libXext" 1>&6
-
-if test "$kde_cv_have_libXext" = "no"; then
-  { echo "configure: 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." 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking for Xinerama""... $ac_c" 1>&6
-echo "configure:4964: checking for Xinerama" >&5
-
- # Check whether --with-xinerama or --without-xinerama was given.
-if test "${with_xinerama+set}" = set; then
-  withval="$with_xinerama"
-  
-    no_xinerama=no
-  
-else
-  
-    no_xinerama=yes
-  
-
-fi
-
-
-kde_save_LDFLAGS="$LDFLAGS"
-kde_save_CFLAGS="$CFLAGS"
-kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
-
-if test "x$no_xinerama" = "xno"; then
-
-  if eval "test \"`echo '$''{'ac_cv_have_xinerama'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-	  cat > conftest.$ac_ext <<EOF
-#line 4994 "configure"
-#include "confdefs.h"
-#include <X11/Xlib.h>
-  			#include <X11/extensions/Xinerama.h>
-int main() {
-XineramaIsActive(NULL);
-; return 0; }
-EOF
-if { (eval echo configure:5002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_have_xinerama="yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_have_xinerama="no"
-fi
-rm -f conftest*
-  
-fi
-
-else
-  ac_cv_have_xinerama=no;
-fi
-
-echo "$ac_t""$ac_cv_have_xinerama" 1>&6
-
-LIBXINERAMA=""
-
-if test "$ac_cv_have_xinerama" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_XINERAMA 1
-EOF
-
-  LIBXINERAMA="-lXinerama"
-fi
-
-
-
-LDFLAGS="$kde_save_LDFLAGS"
-CFLAGS="$kde_save_CFLAGS"
-LIBS="$kde_save_LIBS"
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-
-
-
-
-if test -z ""; then
-  kde_qtver=2
-  kde_qtsubver=1
-else
-  kde_qtsubver=`echo "" | sed -e 's#[0-9]\+\.\([0-9]\+\).*#\1#'`
-  # following is the check if subversion isn�t found in passed argument
-  if test "$kde_qtsubver" = ""; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "" | sed -e 's#^\([0-9]\+\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  else
-   # this is the version number fallback to 2.1, unless major version is 1 or 2
-   if test "$kde_qtver" != "2"; then
-    kde_qtver=2
-    kde_qtsubver=1
-   fi
-  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
-  else
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion=
-fi
-
-if test -z ""; then
-   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
-   else
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-  fi
-else
-   kde_qt_verstring=
-fi
-
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-else
-   kde_qt_dirs="$QTDIR /usr/lib/qt"
-fi
-
-
-
-
-echo $ac_n "checking for libpng""... $ac_c" 1>&6
-echo "configure:5107: checking for libpng" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_png'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 5124 "configure"
-#include "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; }
-EOF
-if { (eval echo configure:5137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_png=no"
-
-fi
-rm -f conftest*
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-
-fi
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-  cat >> confdefs.h <<EOF
-#define HAVE_LIBPNG 1
-EOF
-
-  LIBPNG="$ac_cv_lib_png"
-  
-  echo "$ac_t""$ac_cv_lib_png" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-  LIBPNG=""
-  
-fi
-
-
-
-echo $ac_n "checking for libjpeg6b""... $ac_c" 1>&6
-echo "configure:5169: checking for libjpeg6b" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_jpeg_6b'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-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 <<EOF
-#line 5186 "configure"
-#include "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; }
-EOF
-if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_jpeg_6b=no"
-fi
-rm -f conftest*
-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 "$ac_t""$ac_cv_lib_jpeg_6b" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-  
-echo $ac_n "checking for libjpeg""... $ac_c" 1>&6
-echo "configure:5230: checking for libjpeg" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_jpeg_normal'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-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 <<EOF
-#line 5247 "configure"
-#include "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; }
-EOF
-if { (eval echo configure:5268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_jpeg_normal=-ljpeg"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_jpeg_normal=no"
-fi
-rm -f conftest*
-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 "$ac_t""$ac_cv_lib_jpeg_normal" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-  
-       LIBJPEG=
-    
-   
-fi
-
-
-
-fi
-
-
-
-jpeg_incdirs="/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: 5308: $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 <<EOF
-#define HAVE_LIBJPEG 1
-EOF
-
-else
-  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    echo "configure: 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.
-" 1>&2
-  else
-    echo "configure: warning: libjpeg not found. disable JPEG support." 1>&2
-  fi
-  jpeg_incdir=
-  LIBJPEG=
-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
-  kde_use_qt_mt=no
-
-fi
-
-
-USING_QT_MT=""
-
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-
-  case $host in
-  *-*-linux-*)
-    if test "x$GCC" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread"
-      X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
-    else
-      echo "configure: warning: Compiler is not gcc. MT support disabled." 1>&2
-    fi
-    ;;
-  *)
-    echo "configure: warning: MT not yet supported on $host - disabled." 1>&2
-    ;;
-  esac
-
-fi
-
-kde_qt_was_given=yes
-
-
-if test -z "$LIBQT_GLOB"; then
-
-  LIBQT_GLOB="libqt.*"
-
-fi
-
-if test -z "$LIBQT"; then
-
-  LIBQT="-lqt"
-  kde_int_qt="-lqt"
-
-
-  if test "x$kde_use_qt_mt" = "xyes"; then
-
-      case $host in
-      *-*-linux-*)
-        if test "x$GCC" = "xyes"; then
-          LIBQT="-lqt-mt"
-          kde_int_qt="-lqt-mt"
-          LIBQT_GLOB="libqt-mt.*"
-          USING_QT_MT="using -mt"
-        fi
-      ;;
-      esac
-  fi
-
-  kde_qt_was_given=no
-
-else
-  kde_int_qt="$LIBQT"
-fi
-
-if test $kde_qtver = 2; then
-
-  
-  
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-echo $ac_n "checking for Qt""... $ac_c" 1>&6
-echo "configure:5422: checking for Qt" >&5
-
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-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
-       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 eval "test \"`echo '$''{'ac_cv_have_qt'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" = "2"; 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: 5484: $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 $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
-
-ac_qt_libraries="$qt_libdir"
-
-
- ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-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"
-LIBS="$LIBS $LIBQT"
-
-
-
-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
-#include <qiconview.h>
-EOF
-fi
-
-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();
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
-EOF
-fi
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-EOF
-
-
-if { (eval echo configure:5583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-  ac_cv_have_qt="have_qt=no"
-  ac_qt_notfound=""
-  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
-    ac_qt_notfound="(libraries)";
-  fi
-
-  { echo "configure: 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." 1>&2; exit 1; }
-else
-  have_qt="yes"
-fi
-
-fi
-
-
-eval "$ac_cv_have_qt"
-
-if test "$have_qt" != yes; then
-  echo "$ac_t""$have_qt" 1>&6;
-else
-  ac_cv_have_qt="have_qt=yes \
-    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-  echo "$ac_t""libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" 1>&6
-
-  qt_libraries="$ac_qt_libraries"
-  qt_includes="$ac_qt_includes"
-fi
-
-if test ! "$kde_qt_libs_given" = "yes"; then
-
-
-echo $ac_n "checking if Qt compiles without flags""... $ac_c" 1>&6
-echo "configure:5641: checking if Qt compiles without flags" >&5
-if eval "test \"`echo '$''{'kde_cv_qt_direct'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-
- ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-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"
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-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
-#include <qiconview.h>
-EOF
-fi
-
-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();
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
-EOF
-fi
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-EOF
-
-
-if { (eval echo configure:5720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-
-fi
-
-
-if test "$kde_cv_qt_direct" = "yes"; then
-  echo "$ac_t""yes" 1>&6
-  qt_libraries= 
-else
-  echo "$ac_t""no" 1>&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
-
-
-
-
-   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 $ac_n "checking for moc""... $ac_c" 1>&6
-echo "configure:5789: checking for moc" >&5
-   if test -n "$MOC"; then
-        kde_cv_path="$MOC";
-   else
-        kde_cache=`echo moc | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
-      
-    { echo "configure: 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.
-" 1>&2; exit 1; }
-
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      MOC=$kde_cv_path
-
-   fi
-
-   if test -z "$UIC_NOT_NEEDED"; then
-     
-   echo $ac_n "checking for uic""... $ac_c" 1>&6
-echo "configure:5855: checking for uic" >&5
-   if test -n "$UIC"; then
-        kde_cv_path="$UIC";
-   else
-        kde_cache=`echo uic | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
-      UIC=""
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      UIC=$kde_cv_path
-
-   fi
-
-     if test -z "$UIC" ; then
-       
-    echo "configure: 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.
-" 1>&2
-
-       exit 1
-     fi
-   else
-     UIC="echo uic not available: "
-   fi
-
-   
-   
-
-
-LIB_QT="$kde_int_qt "'$(LIBPNG) $(LIBJPEG) -lXext $(LIB_X11) $(LIBSM)'
-
-
-
-
-
-  
-
-
-echo $ac_n "checking for rpath""... $ac_c" 1>&6
-echo "configure:5940: checking for rpath" >&5
-# 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
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-  fi
-fi
-
-
-echo "$ac_t""$USE_RPATH" 1>&6
-
-echo $ac_n "checking for KDE""... $ac_c" 1>&6
-echo "configure:5969: checking for KDE" >&5
-
-if test "${prefix}" != NONE; then
-  kde_includes=${prefix}/include
-  ac_kde_includes=$prefix/include
-
-  if test "${exec_prefix}" != NONE; then
-    kde_libraries=${exec_prefix}/lib
-    ac_kde_libraries=$exec_prefix/lib
-  else
-    kde_libraries=${prefix}/lib
-    ac_kde_libraries=$prefix/lib
-  fi
-else
-  ac_kde_includes=
-  ac_kde_libraries=
-  kde_libraries=""
-  kde_includes=""
-fi
-
-if eval "test \"`echo '$''{'ac_cv_have_kde'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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/kde2/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: 6013: $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 "configure: error: 
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!" 1>&2; exit 1; }
-fi
-
-kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
-
-kde_libdir=NO
-for i in $kde_libdirs;
-do
-  for j in $kde_check_lib;
-  do
-    echo "configure: 6039: $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"
-
-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-{ echo "configure: error: 
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!" 1>&2; exit 1; }
-fi
-ac_kde_libraries="$kde_libdir"
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = 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 "$ac_t""will be installed in $ac_kde_prefix" 1>&6
- else
-  ac_kde_exec_prefix="$exec_prefix"
-  echo "$ac_t""will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" 1>&6
- fi
-
- kde_libraries="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
-
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-  echo "$ac_t""libraries $ac_kde_libraries, headers $ac_kde_includes" 1>&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_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"
-
-
-
-
-
-  # 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 $ac_n "checking for KDE paths""... $ac_c" 1>&6
-echo "configure:6149: checking for KDE paths" >&5
-kde_result=""
-kde_cached_paths=yes
-if eval "test \"`echo '$''{'kde_cv_all_paths'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-  
-if test "$ac_use_path_checking" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${prefix}/share/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${prefix}/share/config'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${prefix}/share/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${prefix}/share/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
-  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_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_result=defaults"
-
-
-else
-
-  if test $kde_qtver = 1; then
-     echo "$ac_t""compiling" 1>&6
-     
-  
-    echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
-echo "configure:6236: checking for KDE headers installed" >&5
-    
-     ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-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");
-    return 0;
-    }
-EOF
-
- ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- if { (eval echo configure:6279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   echo "$ac_t""yes" 1>&6
- else
-   { echo "configure: 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." 1>&2; exit 1; }
-  fi
-
-  ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-
-
-  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 $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
-echo "configure:6316: checking for KDE libraries installed" >&5
-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 configure:6319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  echo "$ac_t""yes" 1>&6
-else
-  { echo "configure: 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." 1>&2; 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_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_result=$kde_result"
-
-
-
-  else
-     { echo "configure: error: path checking not yet supported for KDE 2" 1>&2; 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_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 "$kde_have_all_paths" != "yes"; 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_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-  kde_have_all_paths=
-  
-if test "$ac_use_path_checking" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${prefix}/share/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${prefix}/share/config'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${prefix}/share/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${prefix}/share/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
-  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_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_result=defaults"
-
-
-else
-
-  if test $kde_qtver = 1; then
-     echo "$ac_t""compiling" 1>&6
-     
-  
-    echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
-echo "configure:6470: checking for KDE headers installed" >&5
-    
-     ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-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");
-    return 0;
-    }
-EOF
-
- ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- if { (eval echo configure:6513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   echo "$ac_t""yes" 1>&6
- else
-   { echo "configure: 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." 1>&2; exit 1; }
-  fi
-
-  ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-
-
-  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 $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
-echo "configure:6550: checking for KDE libraries installed" >&5
-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 configure:6553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  echo "$ac_t""yes" 1>&6
-else
-  { echo "configure: 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." 1>&2; 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_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_result=$kde_result"
-
-
-
-  else
-     { echo "configure: error: path checking not yet supported for KDE 2" 1>&2; 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_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 "$kde_have_all_paths" != "yes"; then
-     kde_have_all_paths=no
-  fi
-
-  kde_result="$kde_result (cache overridden)"
-fi
-if test "$kde_have_all_paths" = "no"; then
-  { echo "configure: 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!)
-" 1>&2; exit 1; }
-else
-  rm -f conftest*
-  echo "$ac_t""$kde_result" 1>&6
-fi
-
-bindir=$kde_bindir
-
-
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde2/bin /usr/kde/bin /usr/local/kde/bin"
-        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 $ac_n "checking for dcopidl""... $ac_c" 1>&6
-echo "configure:6642: checking for dcopidl" >&5
-   if test -n "$DCOPIDL"; then
-        kde_cv_path="$DCOPIDL";
-   else
-        kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: The important program dcopidl was not found!
-Please check whether you installed KDE correctly.
-" 1>&2; exit 1; }
-
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      DCOPIDL=$kde_cv_path
-
-   fi
-
-        
-   echo $ac_n "checking for dcopidl2cpp""... $ac_c" 1>&6
-echo "configure:6702: checking for dcopidl2cpp" >&5
-   if test -n "$DCOPIDL2CPP"; then
-        kde_cv_path="$DCOPIDL2CPP";
-   else
-        kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: The important program dcopidl2cpp was not found!
-Please check whether you installed KDE correctly.
-" 1>&2; exit 1; }
-
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      DCOPIDL2CPP=$kde_cv_path
-
-   fi
-
-        
-   echo $ac_n "checking for mcopidl""... $ac_c" 1>&6
-echo "configure:6762: checking for mcopidl" >&5
-   if test -n "$MCOPIDL"; then
-        kde_cv_path="$MCOPIDL";
-   else
-        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: The important program mcopidl was not found!
-Please check whether you installed KDE correctly.
-" 1>&2; exit 1; }
-
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      MCOPIDL=$kde_cv_path
-
-   fi
-
-        
-   echo $ac_n "checking for artsc-config""... $ac_c" 1>&6
-echo "configure:6822: checking for artsc-config" >&5
-   if test -n "$ARTSCCONFIG"; then
-        kde_cv_path="$ARTSCCONFIG";
-   else
-        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: The important program artsc-config was not found!
-Please check whether you installed KDE correctly.
-" 1>&2; exit 1; }
-
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      ARTSCCONFIG=$kde_cv_path
-
-   fi
-
-        
-   echo $ac_n "checking for kde-config""... $ac_c" 1>&6
-echo "configure:6882: checking for kde-config" >&5
-   if test -n "$KDECONFIG"; then
-        kde_cv_path="$KDECONFIG";
-   else
-        kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
-      
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      KDECONFIG=$kde_cv_path
-
-   fi
-
-        
-   echo $ac_n "checking for meinproc""... $ac_c" 1>&6
-echo "configure:6938: checking for meinproc" >&5
-   if test -n "$MEINPROC"; then
-        kde_cv_path="$MEINPROC";
-   else
-        kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
-
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
-      
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      MEINPROC=$kde_cv_path
-
-   fi
-
-      
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde2/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: 7002: $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 -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 "configure: 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.
-                          " 1>&2; exit 1; }
-           fi
-           kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-        else
-           kde_libs_prefix='$(prefix)'
-           kde_libs_htmldir='$(kde_htmldir)'
-        fi
-        
-        
-
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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 = 2; then
-   LIB_KDECORE='-lkdecore'
-   
-   LIB_KDEUI='-lkdeui'
-   
-   LIB_KFORMULA='-lkformula'
-   
-   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_KWRITE='-lkwrite'
-   
-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
-
-
-
-
-
-echo $ac_n "checking for the used Linux distribution""... $ac_c" 1>&6
-echo "configure:7118: checking for the used Linux distribution" >&5
-
-# 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 eval "test \"`echo '$''{'DISTRIBUTION'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 eval "test \"`echo '$''{'DISTRIBUTION_VERSION'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 eval "test \"`echo '$''{'RPM_PREFIX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde2"
-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 eval "test \"`echo '$''{'RPM_GROUP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 <<EOF
-#define DISTRIBUTION ${DISTRIBUTION}
-EOF
-
-fi
-
-if test -n "$DISTRIBUTION_VERSION"  && test "$DISTRIBUTION_VERSION" != "unknown"; then
-	cat >> confdefs.h <<EOF
-#define DISTRIBUTION_VERSION ${DISTRIBUTION_VERSION}
-EOF
-
-fi
-
-
-
-
-
-
-echo "$ac_t""$DISTRIBUTION $DISTRIBUTION_VERSION" 1>&6
-
-echo $ac_n "checking for RPM installation prefix""... $ac_c" 1>&6
-echo "configure:7280: checking for RPM installation prefix" >&5
-echo "$ac_t""$RPM_PREFIX" 1>&6
-
-echo $ac_n "checking for the correct RPM group""... $ac_c" 1>&6
-echo "configure:7284: checking for the correct RPM group" >&5
-echo "$ac_t""$RPM_GROUP" 1>&6
-
-
-
-
-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
-
-if test -s $srcdir/inst-apps; then
-  ac_topsubdirs="`cat $srcdir/inst-apps`"
-else
-  ac_topsubdirs="`cat $srcdir/subdirs`"
-fi
-
-for i in $ac_topsubdirs; do
-  echo $ac_n "checking if $i should be compiled""... $ac_c" 1>&6
-echo "configure:7309: checking if $i should be compiled" >&5
-  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 "$ac_t""$install_it" 1>&6
-  if test $install_it = "yes"; then
-    TOPSUBDIRS="$TOPSUBDIRS $i"
-  fi
-done
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "\
-./Makefile \
-admin/Makefile \
-docs/Makefile \
-docs/de/Makefile \
-docs/de/handbook/Makefile \
-docs/de/handbook/html/Makefile \
-docs/de/handbook/unicode/Makefile \
-docs/de/helpdialog/Makefile \
-docs/de/helpdialog/html/Makefile \
-docs/de/helpdialog/unicode/Makefile \
-docs/de/howto/Makefile \
-docs/de/howto/html/Makefile \
-docs/de/howto/unicode/Makefile \
-docs/de/install/Makefile \
-docs/de/install/html/Makefile \
-docs/de/install/unicode/Makefile \
-docs/en/Makefile \
-docs/en/handbook/Makefile \
-docs/en/handbook/html/Makefile \
-docs/en/handbook/unicode/Makefile \
-docs/en/helpdialog/Makefile \
-docs/en/helpdialog/html/Makefile \
-docs/en/helpdialog/unicode/Makefile \
-docs/en/howto/Makefile \
-docs/en/howto/html/Makefile \
-docs/en/howto/unicode/Makefile \
-docs/en/install/Makefile \
-docs/en/install/html/Makefile \
-docs/en/install/unicode/Makefile \
-po/Makefile \
-README INSTALL bibletime-doc.spec \
-" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CONF_FILES@%$CONF_FILES%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@USE_EXCEPTIONS@%$USE_EXCEPTIONS%g
-s%@USE_RTTI@%$USE_RTTI%g
-s%@CXXCPP@%$CXXCPP%g
-s%@NOOPT_CXXFLAGS@%$NOOPT_CXXFLAGS%g
-s%@REPO@%$REPO%g
-s%@NOREPO@%$NOREPO%g
-s%@KDE_USE_FINAL_TRUE@%$KDE_USE_FINAL_TRUE%g
-s%@KDE_USE_FINAL_FALSE@%$KDE_USE_FINAL_FALSE%g
-s%@KDE_USE_CLOSURE_TRUE@%$KDE_USE_CLOSURE_TRUE%g
-s%@KDE_USE_CLOSURE_FALSE@%$KDE_USE_CLOSURE_FALSE%g
-s%@KDE_CXXFLAGS@%$KDE_CXXFLAGS%g
-s%@OBJEXT@%$OBJEXT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@LN_S@%$LN_S%g
-s%@RANLIB@%$RANLIB%g
-s%@STRIP@%$STRIP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@KDE_PLUGIN@%$KDE_PLUGIN%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@MSGFMT@%$MSGFMT%g
-s%@GMSGFMT@%$GMSGFMT%g
-s%@XGETTEXT@%$XGETTEXT%g
-s%@CPP@%$CPP%g
-s%@LIBUTIL@%$LIBUTIL%g
-s%@LIBCOMPAT@%$LIBCOMPAT%g
-s%@LIBCRYPT@%$LIBCRYPT%g
-s%@LIBSOCKET@%$LIBSOCKET%g
-s%@LIBRESOLV@%$LIBRESOLV%g
-s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@LIBUCB@%$LIBUCB%g
-s%@LIBDL@%$LIBDL%g
-s%@X_INCLUDES@%$X_INCLUDES%g
-s%@X_LDFLAGS@%$X_LDFLAGS%g
-s%@x_libraries@%$x_libraries%g
-s%@x_includes@%$x_includes%g
-s%@LIBSM@%$LIBSM%g
-s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-s%@LIB_X11@%$LIB_X11%g
-s%@LIBXINERAMA@%$LIBXINERAMA%g
-s%@USER_INCLUDES@%$USER_INCLUDES%g
-s%@USER_LDFLAGS@%$USER_LDFLAGS%g
-s%@LIBZ@%$LIBZ%g
-s%@LIBPNG@%$LIBPNG%g
-s%@LIBJPEG@%$LIBJPEG%g
-s%@qt_libraries@%$qt_libraries%g
-s%@qt_includes@%$qt_includes%g
-s%@QT_INCLUDES@%$QT_INCLUDES%g
-s%@QT_LDFLAGS@%$QT_LDFLAGS%g
-s%@MOC@%$MOC%g
-s%@UIC@%$UIC%g
-s%@LIB_QT@%$LIB_QT%g
-s%@KDE_EXTRA_RPATH@%$KDE_EXTRA_RPATH%g
-s%@KDE_RPATH@%$KDE_RPATH%g
-s%@kde_libraries@%$kde_libraries%g
-s%@kde_includes@%$kde_includes%g
-s%@KDE_LDFLAGS@%$KDE_LDFLAGS%g
-s%@KDE_INCLUDES@%$KDE_INCLUDES%g
-s%@all_includes@%$all_includes%g
-s%@all_libraries@%$all_libraries%g
-s%@AUTODIRS@%$AUTODIRS%g
-s%@DCOPIDL@%$DCOPIDL%g
-s%@DCOPIDL2CPP@%$DCOPIDL2CPP%g
-s%@DCOP_DEPENDENCIES@%$DCOP_DEPENDENCIES%g
-s%@MCOPIDL@%$MCOPIDL%g
-s%@ARTSCCONFIG@%$ARTSCCONFIG%g
-s%@KDECONFIG@%$KDECONFIG%g
-s%@MEINPROC@%$MEINPROC%g
-s%@KDE_XSL_STYLESHEET@%$KDE_XSL_STYLESHEET%g
-s%@kde_libs_prefix@%$kde_libs_prefix%g
-s%@kde_libs_htmldir@%$kde_libs_htmldir%g
-s%@kde_htmldir@%$kde_htmldir%g
-s%@kde_appsdir@%$kde_appsdir%g
-s%@kde_icondir@%$kde_icondir%g
-s%@kde_sounddir@%$kde_sounddir%g
-s%@kde_datadir@%$kde_datadir%g
-s%@kde_locale@%$kde_locale%g
-s%@kde_confdir@%$kde_confdir%g
-s%@kde_mimedir@%$kde_mimedir%g
-s%@kde_wallpaperdir@%$kde_wallpaperdir%g
-s%@kde_bindir@%$kde_bindir%g
-s%@kde_templatesdir@%$kde_templatesdir%g
-s%@kde_servicesdir@%$kde_servicesdir%g
-s%@kde_servicetypesdir@%$kde_servicetypesdir%g
-s%@kde_moduledir@%$kde_moduledir%g
-s%@LIB_KDECORE@%$LIB_KDECORE%g
-s%@LIB_KDEUI@%$LIB_KDEUI%g
-s%@LIB_KFORMULA@%$LIB_KFORMULA%g
-s%@LIB_KIO@%$LIB_KIO%g
-s%@LIB_KSYCOCA@%$LIB_KSYCOCA%g
-s%@LIB_SMB@%$LIB_SMB%g
-s%@LIB_KFILE@%$LIB_KFILE%g
-s%@LIB_KAB@%$LIB_KAB%g
-s%@LIB_KHTML@%$LIB_KHTML%g
-s%@LIB_KSPELL@%$LIB_KSPELL%g
-s%@LIB_KPARTS@%$LIB_KPARTS%g
-s%@LIB_KWRITE@%$LIB_KWRITE%g
-s%@LIB_KFM@%$LIB_KFM%g
-s%@DISTRIBUTION@%$DISTRIBUTION%g
-s%@DISTRIBUTION_VERSION@%$DISTRIBUTION_VERSION%g
-s%@RPM_PREFIX@%$RPM_PREFIX%g
-s%@RPM_GROUP@%$RPM_GROUP%g
-s%@TOPSUBDIRS@%$TOPSUBDIRS%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# 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_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # 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" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"\
-./Makefile \
-admin/Makefile \
-docs/Makefile \
-docs/de/Makefile \
-docs/de/handbook/Makefile \
-docs/de/handbook/html/Makefile \
-docs/de/handbook/unicode/Makefile \
-docs/de/helpdialog/Makefile \
-docs/de/helpdialog/html/Makefile \
-docs/de/helpdialog/unicode/Makefile \
-docs/de/howto/Makefile \
-docs/de/howto/html/Makefile \
-docs/de/howto/unicode/Makefile \
-docs/de/install/Makefile \
-docs/de/install/html/Makefile \
-docs/de/install/unicode/Makefile \
-docs/en/Makefile \
-docs/en/handbook/Makefile \
-docs/en/handbook/html/Makefile \
-docs/en/handbook/unicode/Makefile \
-docs/en/helpdialog/Makefile \
-docs/en/helpdialog/html/Makefile \
-docs/en/helpdialog/unicode/Makefile \
-docs/en/howto/Makefile \
-docs/en/howto/html/Makefile \
-docs/en/howto/unicode/Makefile \
-docs/en/install/Makefile \
-docs/en/install/html/Makefile \
-docs/en/install/unicode/Makefile \
-po/Makefile \
-README INSTALL bibletime-doc.spec \
-"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # 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=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-"") ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-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
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/bibletime-doc/configure.in b/bibletime-doc/configure.in
deleted file mode 100644
index 9780b35..0000000
--- a/bibletime-doc/configure.in
+++ /dev/null
@@ -1,97 +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 Licensednl    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(bibletime-doc, 1.1) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-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
-
-dnl Chek for the used distribution
-AC_CHECK_DISTRIBUTION
-
-dnl add here all your Makefiles. They are created by configure
-dnl AC_OUTPUT(README INSTALL bibletime-doc.spec)
-KDE_CREATE_SUBDIRSLIST
-AC_OUTPUT( \
-./Makefile \
-admin/Makefile \
-docs/Makefile \
-docs/de/Makefile \
-docs/de/handbook/Makefile \
-docs/de/handbook/html/Makefile \
-docs/de/handbook/unicode/Makefile \
-docs/de/helpdialog/Makefile \
-docs/de/helpdialog/html/Makefile \
-docs/de/helpdialog/unicode/Makefile \
-docs/de/howto/Makefile \
-docs/de/howto/html/Makefile \
-docs/de/howto/unicode/Makefile \
-docs/de/install/Makefile \
-docs/de/install/html/Makefile \
-docs/de/install/unicode/Makefile \
-docs/en/Makefile \
-docs/en/handbook/Makefile \
-docs/en/handbook/html/Makefile \
-docs/en/handbook/unicode/Makefile \
-docs/en/helpdialog/Makefile \
-docs/en/helpdialog/html/Makefile \
-docs/en/helpdialog/unicode/Makefile \
-docs/en/howto/Makefile \
-docs/en/howto/html/Makefile \
-docs/en/howto/unicode/Makefile \
-docs/en/install/Makefile \
-docs/en/install/html/Makefile \
-docs/en/install/unicode/Makefile \
-po/Makefile \
-README INSTALL bibletime-doc.spec \
-)
diff --git a/bibletime-doc/configure.in.in b/bibletime-doc/configure.in.in
deleted file mode 100644
index 782688d..0000000
--- a/bibletime-doc/configure.in.in
+++ /dev/null
@@ -1,63 +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 Licensednl    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(bibletime-doc, 1.1) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-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
-
-dnl Chek for the used distribution
-AC_CHECK_DISTRIBUTION
-
-dnl add here all your Makefiles. They are created by configure
-dnl AC_OUTPUT(README INSTALL bibletime-doc.spec)
diff --git a/bibletime-doc/docs/Makefile.am b/bibletime-doc/docs/Makefile.am
deleted file mode 100644
index 683d52f..0000000
--- a/bibletime-doc/docs/Makefile.am
+++ /dev/null
@@ -1,4 +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 = en de
diff --git a/bibletime-doc/docs/Makefile.in b/bibletime-doc/docs/Makefile.in
deleted file mode 100644
index 72f9dde..0000000
--- a/bibletime-doc/docs/Makefile.in
+++ /dev/null
@@ -1,468 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = en de
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=documentation-links.html gen_am.sh ksgmltools-bug-read-me.txt gen_am.dat 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/Makefile.am b/bibletime-doc/docs/de/Makefile.am
deleted file mode 100644
index 82c2c9d..0000000
--- a/bibletime-doc/docs/de/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
-
-
-SUBDIRS = handbook helpdialog howto install 
-
diff --git a/bibletime-doc/docs/de/Makefile.in b/bibletime-doc/docs/de/Makefile.in
deleted file mode 100644
index 95d0b0d..0000000
--- a/bibletime-doc/docs/de/Makefile.in
+++ /dev/null
@@ -1,463 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = handbook helpdialog howto install 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/handbook/Makefile.am b/bibletime-doc/docs/de/handbook/Makefile.am
deleted file mode 100644
index 22320de..0000000
--- a/bibletime-doc/docs/de/handbook/Makefile.am
+++ /dev/null
@@ -1,39 +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 = html unicode 
-
-po-files:
-	for f in `ls ../../en/handbook/pot/*.pot`; do \
-		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/handbook\/pot\/"//`; \
-		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \
-		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \
-		msgmerge -o po/$$pofile.new po/$$pofile $$f; \
-		if diff po/$$pofile po/$$pofile.new > /dev/null; then \
-		rm po/$$pofile.new; \
-		else \
-		mv po/$$pofile.new po/$$pofile; \
-		fi; \
-	done;
-
-
-unicode-files:
-	for f in `ls ../../en/handbook/unicode/*.docbook`; do \
-		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/handbook\/unicode\/"//`; \
-		newfile=`echo $$f | sed s/"..\/..\/en\/handbook\/unicode\/"//`; \
-		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \
-		po2xml $$f po/$$pofile > unicode/$$newfile; \
-	done;
-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/bibletime-doc/docs/de/handbook/Makefile.in b/bibletime-doc/docs/de/handbook/Makefile.in
deleted file mode 100644
index 08edec2..0000000
--- a/bibletime-doc/docs/de/handbook/Makefile.in
+++ /dev/null
@@ -1,495 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = html unicode 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/handbook/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/handbook
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/handbook/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-po-files:
-	for f in `ls ../../en/handbook/pot/*.pot`; do \
-		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/handbook\/pot\/"//`; \
-		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \
-		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \
-		msgmerge -o po/$$pofile.new po/$$pofile $$f; \
-		if diff po/$$pofile po/$$pofile.new > /dev/null; then \
-		rm po/$$pofile.new; \
-		else \
-		mv po/$$pofile.new po/$$pofile; \
-		fi; \
-	done;
-
-unicode-files:
-	for f in `ls ../../en/handbook/unicode/*.docbook`; do \
-		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/handbook\/unicode\/"//`; \
-		newfile=`echo $$f | sed s/"..\/..\/en\/handbook\/unicode\/"//`; \
-		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \
-		po2xml $$f po/$$pofile > unicode/$$newfile; \
-	done;
-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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/handbook/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/handbook/html/Makefile.am b/bibletime-doc/docs/de/handbook/html/Makefile.am
deleted file mode 100644
index 576a7fb..0000000
--- a/bibletime-doc/docs/de/handbook/html/Makefile.am
+++ /dev/null
@@ -1,31 +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-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-op-module-bookmk-1.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-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchscope.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_bars_toolbar_Configtoolbar.png hdbk_bars_toolbar_action_cascade.png hdbk_bars_toolbar_action_cascade_auto.png hdbk_bars_toolbar_action_contents.png hdbk_bars_toolbar_action_exit.png hdbk_bars_toolbar_action_footnotes.png hdbk_bars_toolbar_action_print.png hdbk_bars_toolbar_action_reset.png hdbk_bars_toolbar_action_search.png hdbk_bars_toolbar_action_strongs.png hdbk_bars_toolbar_action_tile.png hdbk_bars_toolbar_action_tile_auto.png hdbk_bars_toolbar_close.png hdbk_op_module_bookmk_1.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_searchanal.png hdbk_op_search_dialog_searchresult.png hdbk_op_search_dialog_searchscope.png hdbk_op_search_dialog_searchtext.png hdbk_start_bticon.png hdbk_start_screen_terms.png hdbk_start_sequence_tips.png 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.png; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/handbook/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.png; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;
diff --git a/bibletime-doc/docs/de/handbook/html/Makefile.in b/bibletime-doc/docs/de/handbook/html/Makefile.in
deleted file mode 100644
index 27d032a..0000000
--- a/bibletime-doc/docs/de/handbook/html/Makefile.in
+++ /dev/null
@@ -1,390 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-op-module-bookmk-1.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-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchscope.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_bars_toolbar_Configtoolbar.png hdbk_bars_toolbar_action_cascade.png hdbk_bars_toolbar_action_cascade_auto.png hdbk_bars_toolbar_action_contents.png hdbk_bars_toolbar_action_exit.png hdbk_bars_toolbar_action_footnotes.png hdbk_bars_toolbar_action_print.png hdbk_bars_toolbar_action_reset.png hdbk_bars_toolbar_action_search.png hdbk_bars_toolbar_action_strongs.png hdbk_bars_toolbar_action_tile.png hdbk_bars_toolbar_action_tile_auto.png hdbk_bars_toolbar_close.png hdbk_op_module_bookmk_1.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_searchanal.png hdbk_op_search_dialog_searchresult.png hdbk_op_search_dialog_searchscope.png hdbk_op_search_dialog_searchtext.png hdbk_start_bticon.png hdbk_start_screen_terms.png hdbk_start_sequence_tips.png 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=hdbk-op-module-tree-select.html hdbk-bars.html hdbk-op-search.html hdbk-bars-menubar-file.html hdbk-bars-menubar-settings.html hdbk-bars-menubar-Window.html hdbk-bars-menubar.html hdbk-config.html hdbk-op-output.html hdbk-bars-menubar-mainindex.html hdbk-intro-ToDo.html hdbk-bars-toolbar-action.html hdbk-bars-menubar-view.html hdbk-bars-menubar-Help.html hdbk-start-screen.html index.html hdbk-config-bt.html hdbk-op-MDI-Window.html hdbk-op.html hdbk-intro.html hdbk-term.html hdbk-intro-motivation.html hdbk-term-hotkeys.html 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/html/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/handbook/html/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/handbook/html
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/handbook/html/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.png; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/handbook/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.png; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/handbook/html/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-Help.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-Help.html
deleted file mode 100644
index 86c8f38..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-Help.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Hilfe</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="previous" href="hdbk-bars-menubar-settings.html" title="Einstellungen"></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>Hilfe</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Werkzeugleiste und Men�leiste</td><td align="right" class="right"></td></tr></tbody></table></div></div><div class="section"><a name="hdbk-bars-menubar-Help"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-Help"></a>Hilfe</h2></div></div><p> <div class="variablelist"><dl><dt><a name="id2801725"></a><span class="term">Handbuch</span></dt><dd><p><a name="id2801733"></a>W�hlen Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Handbuch</span> aus, um dieses Dokument im KDE Hilfezentrum zu lesen. </p></dd><dt><a name="id2801749"></a><span class="term">Installation</span></dt><dd><p><a name="id2801756"></a>W�hlen Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Installation</span> aus, um die Installationsanleitung f�r BibleTime im KDE Hilfezentrum zu �ffnen. </p></dd><dt><a name="id2801778"></a><span class="term">Anleitung zum Bibelstudium</span></dt><dd><p><a name="id2801786"></a>W�hlen Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Anleitung zum Bibelstudium</span> um einen guten Grundlagentext mit Empfelungen zum Bibelstudium zu �ffnen. </p></dd><dt><a name="id2801801"></a><span class="term">Was ist das?</span></dt><dd><p><a name="id2801808"></a> Dies erlaubt ihnen auf bestimmte Elemente zu klicken, um eine Kontextinformation zu erhalten. </p></dd><dt><a name="id2801819"></a><span class="term">Fehlerbericht</span></dt><dd><p><a name="id2801827"></a> Schicken Sie einen Fehlerbericht zu den Entwicklern des Programmes, um die Entwicklung zu unterst�tzen. Bevor Sie einen Fehlerbericht schicken, konfigurieren Sie die Anwendung zum Fehlerberichten so, dass es ihr Mailprogramm benutzt. Dies kann durch <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">konfigurieren</span> im <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Einen Fehlerbericht schicken...</span> Dialog gemacht werden. </p></dd><dt><a name="id2801855"></a><span class="term">T�glicher Tipp</span></dt><dd><p><a name="id2801863"></a>�ffnet den <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tipp des Tages</span> Dialog.</p></dd><dt><a name="id2801877"></a><span class="term">�ber BibleTime</span></dt><dd><p><a name="id2801887"></a> �ffnet ein Fenster mit allgemeinen Informationen zu BibleTime </p></dd><dt><a name="id2801903"></a><span class="term">�ber KDE</span></dt><dd><p><a name="id2801913"></a> �ffnet ein Fenster mit allgemeinen Informationen zu KDE </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Einstellungen�</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/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-Window.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-Window.html
deleted file mode 100644
index de73671..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-Window.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Fenster</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="previous" href="hdbk-bars-menubar-mainindex.html" title="Hauptgruppe"><link rel="next" href="hdbk-bars-menubar-settings.html" title="Einstellungen"></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>Fenster</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Werkzeugleiste und Men�leiste</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"><a name="hdbk-bars-menubar-Window"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-Window"></a>Fenster</h2></div></div><p> <div class="variablelist"><dl><dt><a name="id2801430"></a><span class="term">Profil speichern</span></dt><dd><p><a name="id2801438"></a>Speichert die aktuelle Konfiguration zum gew�hlten Profil</p></dd><dt><a name="id2801447"></a><span class="term">Profile laden</span></dt><dd><p><a name="id2801454"></a>L�dt den Inhalt des gew�hlten Profiles in die aktuelle Sitzung von BibleTime.</p></dd><dt><a name="id2801468"></a><span class="term">Profile einrichten</span></dt><dd><p><a name="id2801475"></a>Dies �ffnet den <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Profile</span> Teil des <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Optionendialoges</span>. Hier erzeugen und verwalten Sie die Profile.</p></dd><dt><a name="id2801492"></a><span class="term">Vollbild Modus</span></dt><dd><p><a name="id2801499"></a>Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Vollbild Modus</span> ausgew�hlt wurde, wird BibleTime die gesamte Fl�che des Monitors bedecken. Um dies wieder r�ckg�ngig zu machen, w�hlen Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Vollbild Modus</span> erneut aus. </p></dd><dt><a name="id2801523"></a><span class="term">Staffeln</span></dt><dd><p><a name="id2801530"></a>Ge�ffnete Dokumentenfenster staffeln</p></dd><dt><a name="id2801539"></a><span class="term">Kacheln</span></dt><dd><p><a name="id2801546"></a>Ge�ffnete Dokumentenfenster kacheln</p></dd><dt><a name="id2801557"></a><span class="term">Automatisch staffeln</span></dt><dd><p><a name="id2801565"></a> Staffelt automatisch die neu ge�ffneten Anzeigefenster </p></dd><dt><a name="id2801576"></a><span class="term">Automatisch Kacheln</span></dt><dd><p><a name="id2801584"></a>ditto f�r das kacheln neu ge�ffneter Anzeigefenster</p></dd><dt><a name="id2801595"></a><span class="term">Alle Schlie�en</span></dt><dd><p><a name="id2801603"></a>Schlie�t alle ge�ffneten Anzeigefenster</p></dd><dt><a name="id2801614"></a><span class="term">Liste des ge�ffneten Module</span></dt><dd><p><a name="id2801622"></a>zeigt eine Liste aller zur Zeit gew�hlter Module.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Hauptgruppe�</td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right">�Einstellungen</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-file.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-file.html
deleted file mode 100644
index 3533e29..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-file.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Datei</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="previous" href="hdbk-bars-menubar.html" title="Men�zeile"><link rel="next" href="hdbk-bars-menubar-view.html" title="Ansicht"></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>Datei</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Werkzeugleiste und Men�leiste</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"><a name="hdbk-bars-menubar-file"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-file"></a>Datei</h2></div></div><p> <div class="variablelist"><dl><dt><a name="id2801151"></a><span class="term">Druckschlange leeren</span></dt><dd><p><a name="id2801158"></a>Entfernt alle Eintr�ge aus der BibleTime Druckschlange. Die BibleTime Druckschlange wird nicht automatisch gel�scht.</p></dd><dt><a name="id2801179"></a><span class="term"> Drucken</span></dt><dd><p><a name="id2801187"></a>Dieser Men�eintrag �ffnet den <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Druckdialog</span>. Hier k�nnen Sie wie in jeder anderen KDE Anwendung drucken oder betrachten.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Men�zeile�</td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right">�Ansicht</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-mainindex.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-mainindex.html
deleted file mode 100644
index d9effc2..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-mainindex.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Hauptgruppe</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="previous" href="hdbk-bars-menubar-view.html" title="Ansicht"><link rel="next" href="hdbk-bars-menubar-Window.html" title="Fenster"></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>Hauptgruppe</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Werkzeugleiste und Men�leiste</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"><a name="hdbk-bars-menubar-mainindex"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-mainindex"></a>Hauptgruppe</h2></div></div><p> <div class="variablelist"><dl><dt><a name="id2801315"></a><span class="term">In Modulen suchen</span></dt><dd><p><a name="id2801321"></a> Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Durchsuche gew�hlte Module</span> ausgew�hlt ist, dann wird der<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Suchdialog</span>  angezeigt. Jedes im linken  Bereich ausgew�hlte Dokument sind in der Module ausw�hlen Karteikarte vorausgew�hlt. </p></dd><dt><a name="id2801345"></a><span class="term">Hauptgruppe zur�cksetzen</span></dt><dd><p><a name="id2801352"></a> Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Hauptgruppe zur�cksetzen</span> ausgew�hlt wird, wird der linke Bereich neu aufgebaut.Jede Einstellung sowie die Lesezeichen werden gel�scht. </p></dd><dt><a name="id2801371"></a><span class="term">Entferne ausgew�hlte Elemente</span></dt><dd><p><a name="id2801380"></a> Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Entferne ausgew�hlte Eintr�ge</span> ausgew�hlt wird, wird jeder in der <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Hauptgruppe</span> gew�hlte Eintrag gel�scht. Diese Aktion kann nur teilweise durch <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Hauptgruppe zur�cksetzen</span> r�ckg�ngig gemacht werden. Benutzen Sie diese Funktion mit Vorsicht. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Ansicht�</td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right">�Fenster</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-settings.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-settings.html
deleted file mode 100644
index 8d62f19..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-settings.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Einstellungen</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="previous" href="hdbk-bars-menubar-Window.html" title="Fenster"><link rel="next" href="hdbk-bars-menubar-Help.html" title="Hilfe"></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>Einstellungen</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Werkzeugleiste und Men�leiste</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"><a name="hdbk-bars-menubar-settings"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-settings"></a>Einstellungen</h2></div></div><p> <div class="variablelist"><dl><dt><a name="id2801654"></a><span class="term">Werkzeugleiste einrichten</span></dt><dd><p><a name="id2801662"></a>Zeigt den <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Werkzeugleiste einrichten</span> Dialog.</p></dd><dt><a name="id2801676"></a><span class="term">BibleTime einrichten</span></dt><dd><p><a name="id2801686"></a>�ffnet den <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Optionendialog</span>. Von diesem Dialog aus k�nnen Sie alle Einstellungen wie Schriften, Profile, Sword-Einstellungen und Tastenk�rzel vornehmen. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Fenster�</td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right">�Hilfe</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-view.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-view.html
deleted file mode 100644
index 84a7de5..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar-view.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><head><title>Ansicht</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="previous" href="hdbk-bars-menubar-file.html" title="Datei"><link rel="next" href="hdbk-bars-menubar-mainindex.html" title="Hauptgruppe"></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>Ansicht</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Werkzeugleiste und Men�leiste</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"><a name="hdbk-bars-menubar-view"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-view"></a>Ansicht</h2></div></div><p> <div class="variablelist"><dl><dt><a name="id2801228"></a><span class="term">Werkzeugleiste anzeigen</span></dt><dd><p><a name="id2801236"></a>
-&gt;Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Werkzeigleiste anzeigen</span> ausgew�hlt ist, dass wird die Werkzeugleiste angezeigt. Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Werkzeigleiste anzeigen</span> nicht ausgew�hlt ist, dass wird die Werkzeugleiste versteckt.</p></dd><dt><a name="id2801259"></a><span class="term"> Zeige Hauptgruppe</span></dt><dd><p><a name="id2801267"></a>Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Zeige Hauptgruppe</span> ausgew�hlt ist, dann wird der linke Bereich, der die vorhandenen Sword-Dokumente zeigt, angezeigt. Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Zeige Hauptgruppe</span> nicht ausgew�hlt ist, dann wird der linke Bereich versteckt.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Datei�</td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right">�Hauptgruppe</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar.html
deleted file mode 100644
index 1077143..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-menubar.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Men�zeile</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="previous" href="hdbk-bars-toolbar-action.html" title="Knopf-Aktion"><link rel="next" href="hdbk-bars-menubar-file.html" title="Datei"></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>Men�zeile</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Werkzeugleiste und Men�leiste</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars-menubar-file.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="hdbk-bars-menubar"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar"></a>Men�zeile</h2></div></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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"><a href="hdbk-bars-menubar-file.html">Next</a></td></tr><tr><td width="33%" align="left">Knopf-Aktion�</td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right">�Datei</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-Configtoolbar.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-Configtoolbar.png
deleted file mode 100644
index 54d184c..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-Configtoolbar.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-cascade-auto.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-cascade-auto.png
deleted file mode 100644
index d0a8461..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-cascade-auto.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-cascade.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-cascade.png
deleted file mode 100644
index 263ad5f..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-cascade.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-contents.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-contents.png
deleted file mode 100644
index 293b736..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-contents.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-exit.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-exit.png
deleted file mode 100644
index 49ccbef..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-exit.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-reset.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-reset.png
deleted file mode 100644
index d1c2653..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-reset.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-search.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-search.png
deleted file mode 100644
index 028b97b..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-search.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-tile-auto.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-tile-auto.png
deleted file mode 100644
index 842d9ee..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-tile-auto.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-tile.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-tile.png
deleted file mode 100644
index 5dfd05f..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-tile.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action.html
deleted file mode 100644
index a47ae1d..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Knopf-Aktion</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="previous" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"><link rel="next" href="hdbk-bars-menubar.html" title="Men�zeile"></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>Knopf-Aktion</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Werkzeugleiste und Men�leiste</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"><a name="hdbk-bars-toolbar-action"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-toolbar-action"></a>Knopf-Aktion</h2></div></div><p> <div class="mediaobject"><img src="hdbk-bars-toolbar-action-exit.png" alt="Symbol"></div> Schlie�t BibleTime </p><p> <div class="mediaobject"><img src="hdbk-bars-toolbar-action-print.png" alt="Symbol"></div> Druckt Eintr�ge der Druckschlange. </p><p> <div class="mediaobject"><img src="hdbk-bars-toolbar-action-search.png" alt="Symbol"></div> Suche in ausgew�hlten Modulen. </p><p> <div class="mediaobject"><img src="hdbk-bars-toolbar-action-cascade.png" alt="Symbol"></div> Dokumentenfenster staffeln. </p><p> <div class="mediaobject"><img src="hdbk-bars-toolbar-action-cascade-auto.png" alt="Symbol"></div> Dokumentenfenster automatisch staffeln. </p><p> <div class="mediaobject"><img src="hdbk-bars-toolbar-action-tile.png" alt="Symbol"></div> Dokumentenfenster kacheln. </p><p> <div class="mediaobject"><img src="hdbk-bars-toolbar-action-tile-auto.png" alt="Symbol"></div> Dokumentenfenster automatisch kacheln. </p><p> <div class="mediaobject"><img src="hdbk-bars-toolbar-close.png" alt="Symbol"></div> Alle Dokumentenfenster schlie�en. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Werkzeugleiste und Men�leiste�</td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right">�Men�zeile</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-close.png b/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-close.png
deleted file mode 100644
index bb4b445..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-close.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars.html b/bibletime-doc/docs/de/handbook/html/hdbk-bars.html
deleted file mode 100644
index d61d2cc..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 5. Werkzeugleiste und Men�leiste</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="index.html" title="Das BibleTime-Handbuch"><link rel="previous" href="hdbk-config-bt.html" title="Optionendialog"><link rel="next" href="hdbk-bars-toolbar-action.html" title="Knopf-Aktion"></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>Werkzeugleiste und Men�leiste</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">�</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. Werkzeugleiste und Men�leiste</h2></div></div><p><div class="section"><a name="hdbk-bars-toolbar"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-toolbar"></a>Werkzeugleiste</h2></div></div><p> Die Aktion jedes Knopfes wird in der Dialogbox beschrieben. Bewegen des Mauspfeils �ber einen Knopf zeigt den Tooltip des Knopfes der die Aktion des Knopfes beschreibt. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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-toolbar-action.html">Next</a></td></tr><tr><td width="33%" align="left">Optionendialog�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Knopf-Aktion</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-config-bt.html b/bibletime-doc/docs/de/handbook/html/hdbk-config-bt.html
deleted file mode 100644
index 7eb9396..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-config-bt.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Optionendialog</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-config.html" title="Chapter 4. BibleTime konfigurieren"><link rel="previous" href="hdbk-config.html" title="Chapter 4. BibleTime konfigurieren"><link rel="next" href="hdbk-bars.html" title="Chapter 5. Werkzeugleiste und Men�leiste"></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>Optionendialog</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">BibleTime konfigurieren</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="hdbk-config-bt"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-config-bt"></a>Optionendialog</h2></div></div><p>Der Optionendialgo erlaubt Ihnen, viele BibleTime und Sword Features anzupassen.</p><div class="section"><a name="hdbk-config-bt-startup"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-startup"></a>Start</h3></div></div><p>Das Startverhalten kann angepasst werden. W�hlen Sie aus den folgenden Optionen aus:</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Tip des Tages anzeigen</td></tr><tr><td>Startlogo anzeigen</td></tr><tr><td>Fenster im Arbeitsbereich wiederherstellen</td></tr></table><div class="mediaobject"><img src="hdbk-conf-optdialog-start.png" alt="Optionendialog"><div class="caption"><p>Der Optionendialog - Start.</p></div></div></div><div class="section"><a name="hdbk-config-bt-fonts"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-fonts"></a>Schriften</h3></div></div><p>Die Anzeigeschrift kann ver�ndert werden. Wenn Sie ein Modul haben, das eine spezielle Schrift ben�tigt, �berpr�fen Sie hier, ob die Schrift f�r BibleTime verf�gbar ist. </p><div class="mediaobject"><img src="hdbk-conf-optdialog-fonts.png" alt="Optionendialog - Schriften"><div class="caption"><p>Der Optionendialog - Schriften.</p></div></div><div class="section"><a name="hdbk-config-bt-Unicode"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-Unicode"></a>Unicode Schriften (ISO10646)</h4></div></div><p>Sword Module benutzen entweder das ISO-8859-1 (Latin-1) oder das ISO-10646 (Unicode) Encoding. Sie k�nnen herausfinden, welches Encoding verwendet wurde, durch right mouse button auf dem Hauptindex, und Auswahl von <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">�ber dieses Modul</span>.</p><div class="mediaobject"><img src="hdbk-conf-font-about.png" alt="�ber dieses Modul"><div class="caption"><p>Das &quot;�ber dieses Modul&quot;-Fenster zeigt an, welches Encoding benutzt wird.</p></div></div><p>Solange Ihre ben�tigten Module korrekt angezeigt werden, muss hier nichts unternommen werden. Wenn ein Modul als eine Folge von Fragezeichen (???????????????????) angezeigt wird, dann enth�lt die eingestellte Schriftart nicht die Zeichen, die in Ihrem Dokument verwendet wurden.</p><p>W�hlen Sie im Optionendialog <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Schriften ausw�hlen</span> in dem <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Unicode Bereich der Anwendung</span>. Sie m�ssen eine Schrift ausw�hlen, die den ISO-10646-1 Zeichensatz enth�lt. Versuchen Sie clearlyu als einen ersten Schritt. (es ist in den meisten Distibutionen enthalten). Wenn Ihr Modul immer noch nicht korrekt dargestellt wird, dann versuchen Sie es mit einer geeigneteren Schriftart.</p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2799957"></a>Tip</h3><p>Wenn Sie eine kleine Unicode-Schriftart wie clearlyu (about 22kb) benutzen, wird BibleTime schneller laufen, als wenn Sie eine umfangreiche Schriftart wie Bitstream Cyberbit (ungef�hr 12Mb) verwenden.</p></div><div class="section"><a name="hdbk-config-bt-addfont"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-config-bt-addfont"></a>Schrift Installation</h5></div></div><p>Die Installation von Schriftarten besteht aus drei Schritten</p><div class="orderedlist"><ol type="i"><li><p><a name="id2799991"></a><a href="hdbk-config-bt.html#hdbk-config-bt-ob-font" title="Schriftarten bekommen">Unicode Schriftarten bekommen</a></p></li><li><p><a name="id2800011"></a><a href="hdbk-config-bt.html#hdbk-config-bt-ob-font-X" title="Schriften f�r XFree86 installieren (Ihren X-Server)">Schriftarten f�r den X-Server installieren</a></p></li><li><p><a name="id2800030"></a><a href="hdbk-config-bt.html#hdbk-config-bt-ob-font-print" title="Installieren der Schrift f�r das Drucken">Schriftarten f�r das Drucken installieren (funktioniert noch nicht).</a></p></li></ol></div></div><div class="section"><a name="hdbk-config-bt-ob-font"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-config-bt-ob-font"></a>Schriftarten bekommen</h5></div></div><p>Es gibt eine Anzahl von Schriften, die Unicode unterst�tzen, und einige von ihnen sind kostenlos verf�gbar. Wenige der verf�gbaren Schriften enthalten alle Symbole, die im Unicode Standard definiert sind.</p><p>Hier ist eine Liste von einigen verf�gbaren Schriften:</p><div class="table"><p><a name="id2800080"></a><b>Table 4.1. Unicode Schriften</b></p><table summary="Unicode Schriften" border="1"><colgroup><col><col></colgroup><tbody><tr><td>Clearlyu</td><td>Ist in einigen Distributionen enthalten. Enth�lt Europ�isch, Griechisch, Hebr�isch, Thai. Enth�lt keine chinesischen Schriftzeichen oder Arabisch</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>Verschiedene Schriften sind auf der Crosswire FTP Seite verf�gbar.</td></tr><tr><td><a href="ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/" target="_top">Bitstream CyberBit</a></td><td>Deckt fast den ganzen Unicode-Bereich ab.</td></tr><tr><td><a href="http://bibliofile.mc.duke.edu/gww/fonts/Unicode.html" target="_top">Caslon, Monospace, Cupola, Caliban</a></td><td>Teilweise Abdeckung, siehe die Information auf der angegebenen Seite.</td></tr></tbody></table></div><p>F�r eine Liste von anderen Unicode Schriften und den abgedeckten Bereichen: <a href="http://www.hclrss.demon.co.uk/unicode/fontsbyrange.html" target="_top">Unicode Schriftenliste</a> </p></div><div class="section"><a name="hdbk-config-bt-ob-font-X"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-config-bt-ob-font-X"></a>Schriften f�r XFree86 installieren (Ihren X-Server)</h5></div></div><p> Wenn Ihre Distribution einen Schriftarten Installer enth�lt (Linux-Mandrake&#8482; bietet Drake Font), verwenden Sie den Installer. Wenn das nicht funktioniert, oder Sie keinen haben, m�ssen Sie die Schrift manuell installieren. Anweisungen daf�r finden Sie <a href="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Unicode-HOWTO.html#toc4" target="_top">Das Unicode HOWTO</a>. Das wurde getestet und funktioniert unter Linux-Mandrake&#8482; 7.1.</p></div><div class="section"><a name="hdbk-config-bt-ob-font-print"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-config-bt-ob-font-print"></a>Installieren der Schrift f�r das Drucken</h5></div></div><p>Ein bekanntes Problem in Qt verhindert das Drucken von Zeichen au�erhalb des Bereiches des Latin-1 Zeichensatzes. Das wird mit der Freigabe von Qt3 und KDE 3 gel�st sein. Wenn Sie es trotzdem versuchen m�chten, das <a href="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Font-HOWTO.html" target="_top">Font HowTo</a> beschreibt den Prozess der Installation von Schriften f�r das Drucksystem.</p></div></div></div><div class="section"><a name="hdbk-config-bt-Colors"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-Colors"></a>Farben</h3></div></div><p>Die Farben der Objekte in den Anzeigefenstern k�nnen angepasst werden. Folgende Objekte k�nnen ver�ndert werden:</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Text</td></tr><tr><td>Hervorgehobener Vers</td></tr><tr><td>Fu�noten</td></tr><tr><td>Morphologische Tags</td></tr><tr><td>Hintergrund</td></tr><tr><td>Hyperlinks</td></tr><tr><td>Strongnummern</td></tr><tr><td>Worte Jesu</td></tr></table><p>Einige Optionen, wie die &quot;Worte Jesu&quot; treffen nur f�r bestimmte Texte zu, die diese speziellen Features unterst�tzen.</p><div class="mediaobject"><img src="hdbk-conf-optdialog-color.png" alt="Optionendialog - Farbe "><div class="caption"><p>Der Optionendialog - Farbe</p></div></div></div><div class="section"><a name="hdbk-config-bt-profiles"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-profiles"></a>Profile</h3></div></div><p>Profile definieren die Erscheinung des Arbeitsbereiches, z.B. welche Fenster ge�ffnet sind, und welche Texte in diesen Fenstern angezeigt werden sollen. Wenn ein Profil einmal erstellt ist, erwenden Sie den Eintrag <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Fenster</span> -&gt; <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Profil sichern</span>, um die aktuelle Sitzung in ein Profil zu sichern. Verwenden Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Fenster</span> -&gt; <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Profil laden</span>, um ein bereits gespeichertes Profil in BibleTime zu laden.</p></div><div class="section"><a name="hdbk-config-bt-sword"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-sword"></a>Sword</h3></div></div><p>Viele Funktionen, die von Sword bereitgestellt werden, k�nnen in BibleTime angepasst werden.</p><div class="mediaobject"><img src="hdbk-conf-optdialog-sword.png" alt="Optionendialog - Sword"><div class="caption"><p>Der Optionendialog - Sword.</p></div></div><div class="section"><a name="hdbk-config-bt-sword-gen"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-sword-gen"></a>Sword Allgemein</h4></div></div><p>Schl�sselcache f�r Lexikons</p><p>Bibletime kann einen Keycache f�r Lexikons anlegen. Dies beschleunigt das �ffnen gro�er Lexika. Es verbraucht allerdings etwas Festplattenkapazit�t, also sollten Sie dieses Feature abschalten, wenn Sie nur �ber sehr wenig freien Speicher haben.</p><p>Scrollverhalten</p><p>Per Voreinstellung bewegt der Pfeil nach unten das Anzeigefenster zum n�chsten Vers. Mit dieser Option kann man das Verhalten so �ndern, dass es zum vorigen Vers springt.</p><p>W�hlen Sie eine Sprache f�r die B�cher der Bibel</p><p>Dieses Feature erm�glicht die Auswahl der Sprache, die f�r die Buchnamen der Bibel verwendet wird.Z.B. kann die King James Version mit deutschen Buchnamen dargestellt werden.Wenn Ihre Sprache nicht unterst�tzt wird, und Sie gerne eine �bersetzung anfertigen wollen, dann besuchen Sie bitte die Crosswire Entwicklerseiten.</p></div><div class="section"><a name="hdbk-config-bt-sword-mod"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-sword-mod"></a>Sword Standardmodule</h4></div></div><p>Hier werden Standardmodule festgelegt.</p></div><div class="section"><a name="hdbk-config-bt-sword-filter"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-sword-filter"></a>Sword Filtereinstellungen</h4></div></div><p>Filter kontrollieren die Erscheinung des Textes in den Anzeigefenstern. Hier k�nnen Sie die Voreinstellungen f�r verschiedene Filter festlegen.</p><p>Folgendes kann durch Filter kontrolliert werden:</p><div class="itemizedlist"><ul><li><p><a name="id2800593"></a>Zeilenumbruch nach jedem Vers anzeigen</p></li><li><p><a name="id2800599"></a>Versnummern anzeigen</p></li><li><p><a name="id2800605"></a>Fu�noten anzeigen</p></li><li><p><a name="id2800611"></a>Strongnummern anzeigen</p></li><li><p><a name="id2800617"></a>�berschriften anzeigen</p></li><li><p><a name="id2800623"></a>Morphologische Tags anzeigen</p></li><li><p><a name="id2800629"></a>Wurzeln anzeigen</p></li><li><p><a name="id2800634"></a>Hebr�ische Vokalzeichen anzeigen</p></li><li><p><a name="id2800641"></a>Hebr�ische Kantillationszeichen anzeigen</p></li><li><p><a name="id2800648"></a>Griechische Akzente anzeigen</p></li></ul></div></div></div><div class="section"><a name="hdbk-config-bt-Accelerators"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-Accelerators"></a>Tastenk�rzel</h3></div></div><p>Es handelt sich um spezielle Tastenbefehle, die anstatt der Men�eintr�ge und Icons verwendet werden k�nnen. Eine Anzahl der Kommandos in BibleTime haben vordefinierte Tastenk�rzel. Allen Kommandos in BibleTime k�nnen hier Tastenk�zel zugewiesen werden.</p><div class="table"><p><a name="id2800689"></a><b>Table 4.2. Standard-Tastenk�rzel</b></p><table summary="Standard-Tastenk�rzel" border="1"><colgroup><col><col></colgroup><thead><tr><th>Aktion</th><th>Tastenkombination</th></tr></thead><tbody><tr><td>Automatisch Kacheln</td><td>Ctrl+Alt+T</td></tr><tr><td>Automatisch staffeln </td><td>Ctrl+Alt+A </td></tr><tr><td>Staffeln </td><td>Ctrl+A </td></tr><tr><td>Alle schlie�en </td><td>Shift+Ctrl+A</td></tr><tr><td>Werkzeugleisten konfigurieren</td><td>�</td></tr><tr><td>Voreinstellungen </td><td>�</td></tr><tr><td>Verlassen </td><td>Ctrl+Q</td></tr><tr><td>Ausgew�hlte Eintr�ge entfernen</td><td>Ctrl+Alt+D</td></tr><tr><td>Hauptgruppe zur�cksetzen </td><td>Ctrl+Alt+R</td></tr><tr><td>In den ausgew�hlten Modulen suchen </td><td>Ctrl+Alt+S</td></tr><tr><td>Kacheln </td><td>Ctrl+T </td></tr></tbody></table></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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-bars.html">Next</a></td></tr><tr><td width="33%" align="left">BibleTime konfigurieren�</td><td width="34%" align="center"><a href="hdbk-config.html">Up</a></td><td width="33%" align="right">�Werkzeugleiste und Men�leiste</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-config.html b/bibletime-doc/docs/de/handbook/html/hdbk-config.html
deleted file mode 100644
index 90c2abe..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-config.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 4. BibleTime konfigurieren</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="index.html" title="Das BibleTime-Handbuch"><link rel="previous" href="hdbk-op-output.html" title="Exortieren und Drucken"><link rel="next" href="hdbk-config-bt.html" title="Optionendialog"></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>BibleTime konfigurieren</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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. BibleTime konfigurieren</h2></div></div><p>Die BibleTime-Benutzerschnittstelle kann vielseitig konfiguriert werden. Um den Konfigurationsdialog aufzurufen, w�hlen Sie in der Hauptwerkzeugleiste <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Einstellungen</span>. Von hier aus w�hlen Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Werkzeugleisten konfigurieren</span>, um den Konfigurationsdialog der Werkzeugleisten aufzurufen, oder Sie w�hlen <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">BibleTime konfigurieren</span>, um den BibleTime Konfigurationsdialog aufzurufen.</p><div class="section"><a name="hdbk-config-toolbar"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-config-toolbar"></a>Werkzeugleisten-Konfigurationsdialog</h2></div></div><p>Der Werkzeugleisten-Konfigurationsdialog erm�glicht das Hinzuf�gen und Entfernen von Aktionen von der Haupterkzeugleiste von BibleTime. Die Reihenfolge der Aktionen kann auch ver�ndert werden.</p><div class="mediaobject"><img src="hdbk-config-toolbar.png" alt="Werkzeugleisten-Konfigurationsdialog"><div class="caption"><p>Der Werkzeugleisten-Konfigurationsdialog.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Exortieren und Drucken�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Optionendialog</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-intro-ToDo.html b/bibletime-doc/docs/de/handbook/html/hdbk-intro-ToDo.html
deleted file mode 100644
index 6ba14cf..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-intro-ToDo.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>ToDo</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-intro.html" title="Chapter 1. Einf�hrung"><link rel="previous" href="hdbk-intro.html" title="Chapter 1. Einf�hrung"><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('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('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('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('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">Einf�hrung</td><td align="right" class="right"><a accesskey="n" href="hdbk-intro-motivation.html">Next</a></td></tr></tbody></table></div></div><div class="sect1"><a name="hdbk-intro-ToDo"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-intro-ToDo"></a>ToDo</h2></div></div><p> Jede Menge! </p><p> Wir haben viel zu tun. Da wir ein sehr kleines Team von aktiven Entwicklern sind, ist es sehr schwierig vern�nftige Ergebnisse in einer kurzen Zeit zu bekommen. Falls Sie daran interessiert sind dem BibleTime Team zu helfen, kontaktieren Sie uns bitte auf <a href="http://sourceforge.net/pm/?group_id=954" target="_top">SourceForge BibleTime Hompage</a>. Informationen k�nnen ebenso auf der <a href="http://www.bibletime.de" target="_top">BibleTime Homepage</a> gefunden werden.</p><p>Das BibleTime Projekt ben�tigt Programmierer / Entwickler, Kritiker, Tester und eifrige Beter. Falls Sie bei einer dieser Aufgaben helfen k�nnen oder falls Sie an eine andere denken, wenden Sie sich bitte an uns. Ohne Ihre Hilfe wird BibleTime sehr sehr langsam weiterentwickelt und es wird sehr lange dauern, bis Sie ein voll funktionsf�higes Bibelstudien Werkzeug bekommen werden. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Einf�hrung�</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/bibletime-doc/docs/de/handbook/html/hdbk-intro-motivation.html b/bibletime-doc/docs/de/handbook/html/hdbk-intro-motivation.html
deleted file mode 100644
index 483a782..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-intro-motivation.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Motivation</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-intro.html" title="Chapter 1. Einf�hrung"><link rel="previous" href="hdbk-intro-ToDo.html" title="ToDo"><link rel="next" href="hdbk-term.html" title="Chapter 2. BibleTime starten"></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('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('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('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('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">Einf�hrung</td><td align="right" class="right"><a accesskey="n" href="hdbk-term.html">Next</a></td></tr></tbody></table></div></div><div class="sect1"><a name="hdbk-intro-motivation"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-intro-motivation"></a>Motivation</h2></div></div><p> Unser Verlangen ist es, Gott zu dienen und unseren Teil dazu beizutragen, dass andere in ihrer Beziehung mit IHM wachsen. Wir haben eine klaffende L�cke gefunden: Es gab keine benutzerfreundliche Bibelstudiensoftware unter Linux. Wir haben BibleTime entwickelt um diese L�cke zu f�llen. Wir haben uns bem�ht dies zu einem m�chtigen und qualitativen Programm zu machen, das jedoch gleichzeitig einfach und intuitiv zu bedienen ist. Es ist unser Verlangen, dass Gott gepriesen wird, da Er die Quelle aller guten Dinge ist. </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>Alle gute Gabe und alle vollkommene Gabe kommt von obenherab, von dem Vater des Lichts, bei welchem ist keine Ver�nderung noch Wechsel des Lichtes und der Finsternis.</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> Gott segne Sie, wenn Sie dieses Programm benutzen, und m�ge Er durch die Arbeit unserer H�nde verherrlicht werden. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">�BibleTime starten</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-intro.html b/bibletime-doc/docs/de/handbook/html/hdbk-intro.html
deleted file mode 100644
index c43cf8c..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-intro.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 1. Einf�hrung</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="index.html" title="Das BibleTime-Handbuch"><link rel="previous" href="index.html" title="Das BibleTime-Handbuch"><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>Einf�hrung</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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. Einf�hrung</h2></div></div><p> BibleTime ist ein m�chtiges Bibelstudien-Werkzeug, geschrieben f�r die KDEUmgebung auf dem Linux Betriebssystem. Es basiert auf der <a href="http://www.crosswire.org" target="_top">Sword</a> Bibliothek, welche die Back-End Funktionalit�t f�r BibleTime zur Verf�gung stellt, zum Beispiel Bibeltexte anschauen, Suchen, Lesezeichen anlegen usw. Sword ist das Hauptprodukt der <a href="http://www.crosswire.org" target="_top">Crosswire Bibelgesellschaft</a>. </p><p>BibleTime wurde konzipiert, um mit Dokumenten benutzt zu werden, die in Theological Markup Language (ThML) und im General Bible Format (GBF) vorliegen. Diese Formatierungssprachen zielen auf die Erfordernisse religi�ser Texte. Vollst�ndige Informationen �ber die unterst�tzten Dokumentenformate k�nnen im <a href="http://www.crosswire.org/sword/develop/index.jsp" target="_top"> Entwicklungsbereich der Crosswire Bible Society</a> gefunden werden.</p><p> �ber 200 Dokumente in 50 Sprachen sind auf dem Webserver der <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a> verf�gbar. Dazu geh�ren: </p><p> <div class="variablelist"><dl><dt><a name="id2798323"></a><span class="term">Bibeln</span></dt><dd><p><a name="id2734386"></a> Der gesamte Text, optional mit Strong-Nummern und Fu�noten im Text </p></dd><dt><a name="id2799378"></a><span class="term">Kommentare</span></dt><dd><p><a name="id2799386"></a> Mit einem <i>Pers�nlichen</i> Kommentar k�nnen Sie ihre eigenen pers�nlichen Notizen zu verschiedenen Bereichen der Bibel anlegen. </p></dd><dt><a name="id2799403"></a><span class="term">Lexika</span></dt><dd><p><a name="id2799411"></a> F�r Wortdefinitionen und Bibelthemen. Sie k�nnen einen Schl�ssel aus einer Liste ausw�hlen, der dann angezeigt wird. </p></dd></dl></div> </p><p>Weitere Dokumente werden zur Sword Bibliothek hinzugef�gt werden, daher schauen Sie dort �fters nach.</p><div class="sect1"><a name="hdbk-intro-changes"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-intro-changes"></a>�nderungen</h2></div></div><p> Bitte lesen sie die Datei <tt>Changelog</tt> des Quellcode Paketes, falls Sie an detailierteren �nderungen interessiert sind. </p><p>Eine Auflistung der im aktuellen Paket enthaltenen Funktionen kann im Quellcode im <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/bibletime/bibletime/ChangeLog" target="_top">CVS Log f�r <tt>bibletime/bibletime/ChangeLog</tt></a> gefunden werden.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Das BibleTime-Handbuch�</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/bibletime-doc/docs/de/handbook/html/hdbk-op-MDI-Window.html b/bibletime-doc/docs/de/handbook/html/hdbk-op-MDI-Window.html
deleted file mode 100644
index 1a4ce24..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-MDI-Window.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Multiple Document Interface (MDI) Fenster</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-op.html" title="Chapter 3. Programmbedienung"><link rel="previous" href="hdbk-op-module-tree-select.html" title="Ein Modul zum Anschauen ausw�hlen"><link rel="next" href="hdbk-op-search.html" title="In Dokumenten suchen"></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) Fenster</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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-module-tree-select.html">Prev</a></td><td align="center" class="center">Programmbedienung</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"><a name="hdbk-op-MDI-Window"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-MDI-Window"></a>Multiple Document Interface (MDI) Fenster</h2></div></div><p> Hier werden Dokumente &quot;Anzegefenstern&quot; angezeigt, die speziell auf die verschiedenen Modultypen abgestimmt sind. Die Crosswire Bible Society wird m�glicherweise andere Dokumenttypen f�r Sword schaffen. Wenn sie freigegeben werden, wird BibleTime sie auch unterst�tzen. </p><div class="section"><a name="hdbk-op-MDI-Window-control-modules"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-MDI-Window-control-modules"></a>Ge�ffnete Fenster verwalten</h3></div></div><p> Dokumentenfenster k�nnen mit Hilfe von �blichen KDE Fenster/Titelzeilen Funktionen kontrolliert und ver�ndert werden. Als Erweiterung zu diesen k�nnen Sie ge�ffnete Dokumentenfenster kacheln und stapeln. Benutzen Sie die entsprechenden Kn�pfe in der Werkzeugleiste oder die Men�funktionen im <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">&quot;Fenster&quot;</span> Untermen� der Men�leiste. </p></div><div class="section"><a name="hdbk-op-MDI-Window-module-navigation"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-MDI-Window-module-navigation"></a>In ge�ffneten Dokumenten navigieren</h3></div></div><p> Die Navigation innerhalb eines Dokumentes ist durch das Schl�ssel-Kontrollmen� und durch eine Scrollleiste verwirklicht. </p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2738648"></a>Tip</h3><p>Um zu einer bestimmter Stelle zu springen benutzen Sie die Schl�sselkontrolle.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2738657"></a>Tip</h3><p>Um sich in dem Bereich des Dokumentes zu bewegen benutzen Sie die Scrollleiste.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2738664"></a>Tip</h3><p>F�r Bibeltexte ist die Indexreihenfolge <i>Buch - Kapitel - Vers</i></p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2738674"></a>Tip</h3><p>F�r Kommentare ist die Indexreihenfolge <i>Buch - Kapitel - Vers</i></p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2738684"></a>Tip</h3><p>F�r Lexika ist der Index <i>Schl�sselwort</i></p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2738693"></a>Tip</h3><p>Drag&amp;Drop funktioniert hier; Wenn Sie einen Vers eines ge�ffneten Fensters oder ein Lesezeichen ziehen und auf einem anderen Dokumentenfenster fallen lassen, wird dieses von der aktuell angezeigten Stelle zur Stelle des Verses oder des Lesezeichens springen.</p></div></div><div class="section"><a name="hdbk-op-MDI-Window-Personal-commentary"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-MDI-Window-Personal-commentary"></a>Bearbeiten Sie ihren eigenen Kommentar</h3></div></div><p> Die Werkzeugleiste des Kommentarfensters hat einen weiteren Button, mit dem Bild eines Stiftes.<span class="inlinemediaobject"><img src="hdbk-op-pencil.png" alt="Geben Sie ihre Notizen ein"></span> F�r das &quot;Personal-commentary&quot; Modul, left mouse button den <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Button mit dem Bild eines Stiftes</span> um Ihre Notizen einzugeben, oder um eingegebene zu bearbeiten. Wenn Sie fertig sind, left mouse button den <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">&quot;Speichern&quot; (Ddisketten) Button</span>, um Ihre Notizen zu sichern. Um die Notizen f�r einen Vers zu l�schen, left mouse button den <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Vers l�schen Button</span> <span class="inlinemediaobject"><img src="hdbk-op-delete-verse.png" alt="Vers L�schen Symbol"></span>. </p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2736808"></a>Tip</h3><p>Das Personal Commentary ist ein Sword Modul. Wenn Sie es nicht im Hauptindex finden, dann laden Sie es von der<a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a> herunter.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2736890"></a>Tip</h3><p>Falls Sie nicht in das Modul Pers�nlicher Kommentar schreiben k�nnen, sind die Zugriffsrechte f�r den pers�nlichen Kommentar falsch. Setzen Sie die Zugrigffsrechte zur�ck, um ihrem Benutzer zu erlauben hinein zu schreiben.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2736775"></a>Tip</h3><p>Hier funktioniert Drag&amp;Drop, wie bei anderen Kommentaren und Bibeltexten.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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-module-tree-select.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">Ein Modul zum Anschauen ausw�hlen�</td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right">�In Dokumenten suchen</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-bookmk-1.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-module-bookmk-1.png
deleted file mode 100644
index 4bbcd58..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-bookmk-1.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-select-1.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-module-select-1.png
deleted file mode 100644
index 2f44816..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-select-1.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-select-2.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-module-select-2.png
deleted file mode 100644
index fceccfd..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-select-2.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-1.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-1.png
deleted file mode 100644
index e92af75..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-1.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png
deleted file mode 100644
index caa339a..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-select.html b/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-select.html
deleted file mode 100644
index dfc5d32..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-module-tree-select.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Ein Modul zum Anschauen ausw�hlen</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-op.html" title="Chapter 3. Programmbedienung"><link rel="previous" href="hdbk-op.html" title="Chapter 3. Programmbedienung"><link rel="next" href="hdbk-op-MDI-Window.html" title="Multiple Document Interface (MDI) Fenster"></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>Ein Modul zum Anschauen ausw�hlen</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Programmbedienung</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"><a name="hdbk-op-module-tree-select"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-module-tree-select"></a>Ein Modul zum Anschauen ausw�hlen</h2></div></div><p>Wenn Sie Dokument ausw�hlen wolllen, klicken Sie einfach auf die gew�nschte Dokumentengruppe (Bibeln, Kommentare oder Lexika) um den Inhalt der Dokumentengruppe anzuzeigen. Um ein Dokument zu �ffnen klicken Sie auf dessen Symbol. </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"><a name="id2736723"></a>Tip</h3><p>Hier funktioniert Drag&amp;Drop</p></div><p> Ein Dokument kann aus einem bereits ge�ffneten Dokument heraus ge�ffnet werden. Klicken Sie einfach auf eine Versnummer (Mauspfeil �ndert sich zu einer Hand) und ziehen Sie diese zur Modulliste. Lassen Sie sie hier auf dem Namen des von Ihnen gew�nschten Modules fallen; dieses Modul wird nun an der Stelle des her�bergezogenen Verses ge�ffnet. Wenn Sie eine Versnummer auf ein bereits ge�ffnetes Modul ziehen, wird dieses automatisch zur gew�nschten Stelle springen. Dies funktioniert nur f�r Bibeln und Kommentare. </p><p> Zwei weitere Funktionen sind durch right mouse button auf dem Modul verf�gbar. &quot;�ber dieses ModulA&quot; �ffnet ein Fenster mit Informationen �ber Copyright und andere wichtige Eigenschaften dieses Dokumentes. &quot;Dieses Modul entschl�sseln&quot; �ffnet einen kleinen Dialog f�r verschl�sselte Dokumente. Dies erlaubt es den Besitzern des Schl�ssels, diesen einzugeben, um das Modul zu entschl�ssenl und damit lesbar zu machen. Die Crosswire Bible Society muss Module verschl�sseln, bis entweder der Copyrightinhaber die Erlaubnis f�r die Weitergabe des Moduls erteilt, oder der Text in Public Domain �bergegangen ist (Copyright verfallen). <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"><a name="hdbk-op-module-tree-search"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-module-tree-search"></a>Auf den Suchdialog zugreifen</h3></div></div><p> Sie k�nnen in einem Modul suchen durch right mouse button auf dem Modulnamen in der Modulliste und Auswahl von &quot;Search in module(s)&quot;. Durch Shift-right mouse button auf anderen Modulnamen k�nnen Sie mehrere Module ausw�hlen. </p><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-module-select-2.png"></div></div></div><div class="section"><a name="hdbk-op-module-tree-bookmark"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-module-tree-bookmark"></a>Auf Lesezeichen zugreifen</h3></div></div><p> <div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2736728"></a>Tip</h3><p>Hier funktioniert Drag&amp;Drop</p></div> Klicken Sie mit der rechten Maustaste auf einen leeren Bereich der Hauptgruppe und w�hlen Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">&quot;Erzeuge einen neuen Ordner&quot;</span> um einen neuen Ordner anzulegen. Sie k�nnen normale Drag&amp;Drop Funktionen benutzen, um Verse aus den Suchdialogsergebnissen in den Lesezeichen Ordner zu ziehen und um Lesezeichen in Ordnern neu anzuordnen. Es gibt auch eine Import/Export Funktion f�r Lesezeichen. W�hlen Sie &quot;Exportiere Lesezeichen&quot; im <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Men� der rechten Maustaste</span>. Dies wird eine Dialogbox �ffnen, in der Sie die Lesezeichen speichern k�nnen. Sie k�nnen mit anderen Benutzern von BibleTime ausgetauscht werden, archiviert werden usw. Sie k�nnen in der gleichen Art und Weise importiert werden. Sie k�nnen auch rechts-klicken um Ordnernamen und Beschreibungen von Lesezeichen zu �ndern, und um Lesezeichen und Gruppen zu entfernen. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Programmbedienung�</td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right">�Multiple Document Interface (MDI) Fenster</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-output.html b/bibletime-doc/docs/de/handbook/html/hdbk-op-output.html
deleted file mode 100644
index 5f53ba9..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-output.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Exortieren und Drucken</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-op.html" title="Chapter 3. Programmbedienung"><link rel="previous" href="hdbk-op-search.html" title="In Dokumenten suchen"><link rel="next" href="hdbk-config.html" title="Chapter 4. BibleTime konfigurieren"></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>Exortieren und Drucken</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Programmbedienung</td><td align="right" class="right"><a accesskey="n" href="hdbk-config.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="hdbk-op-output"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-output"></a>Exortieren und Drucken</h2></div></div><p>Bibel-Fenster, Lexikon-Fenster, Kommentar-Fenster</p><p>Durch right mouse button auf dem Eintrag, der Versnummer oder dem Text des Anzeigefensters wird eine Auswahlbox erscheininen (je nach Modultyp), die Zugriff auf Auswahl-, Nachschlage-, Export- und Druckfunktionen bietet.</p><div class="section"><a name="hdbk-op-select-all"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-select-all"></a>Alle ausw�hlen</h3></div></div><p>Ein left mouse button hier w�hlt den gesamten text des Kapitels aus, das gerade dargestellt wird. </p></div><div class="section"><a name="hdbk-op-lookup"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-lookup"></a>Text im Lexikon nachschlagen</h3></div></div><p>Ein left mouse button hier wird ein Submen� mit einer Liste von allen verf�gbaren Lexikons �ffnen. Ein left mouse button auf einem Lexicon �ffnet das Lexikokn mit dem Eintrag, der gerade im aktuellen Text markiert ist. </p></div><div class="section"><a name="hdbk-op-copy"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-copy"></a>Kopieren</h3></div></div><p>Ein left mouse button hier wird ein Submen� anzeigen, dass die M�glichkeit bietet, den aktuellen Text in die Zwischenablage zu kopieren. </p><div class="itemizedlist"><ul><li><p><a name="id2798071"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Vers</span> - Die Nummer des aktuellen Verses (z.B. 1 Mose 1:25). </p></li><li><p><a name="id2798084"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Text des Verses</span> - Der Text des aktuellen Verses. </p></li><li><p><a name="id2798097"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Vers mit Text</span> - Sowohl Versnummer und Text des aktuellen Verses </p></li><li><p><a name="id2798111"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Kapitel</span> - Das ganze Kapitel </p></li><li><p><a name="id2798123"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Ausgew�hlter Text</span> - Nur der ausgew�hlte Text. </p></li></ul></div><p> Dieser Text kann in jede Anwendung kopiert werden, die auf die Zwischenablage zugreifen kann. </p></div><div class="section"><a name="hdbk-op-print"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-print"></a>Zur Druckschlange hinzuf�gen</h3></div></div><p>Ein left mouse button hier zeigt ein Submen� mit den Druckm�glichkeiten an: </p><div class="itemizedlist"><ul><li><p><a name="id2798039"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Vers mit Text</span> </p></li><li><p><a name="id2798183"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Kapitel</span> </p></li></ul></div><p> Wenn Sie diese ausw�hlen, wird der Text zur BibleTime Druckschlange hinzugef�gt, aber noch nicht ausgedruckt. Sobald sie alle gew�nschten Eintr�ge zur Druckschlange hinzugef�gt haben, clicken Sie das Druck-Icon, und der Druckdialog wird angezeigt. Nun k�nnen Sie den Text entweder anschauen oder drucken. </p><p>Das Drucken in BibleTime ist relativ einfach und als Hilfsmittel gedacht. Wenn Sie ein Dokument oder eine Pr�sentation erstellen, die Text von BibleTime Dokumenten enth�lt, dann kopieren Sie den Text doch �ber die Zwischenablage in Ihr bevorzugtes Programm. </p></div><div class="section"><a name="hdbk-op-save"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-save"></a>Speichern</h3></div></div><p>Ein left mouse button hier zeigt ein Submen� mit Speicherm�glichkeiten an: </p><div class="itemizedlist"><ul><li><p><a name="id2798264"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Kapitel als normaler Text</span> - eine Datei mit UNIX�-formatiertem ASCII-Text wird erstellt. </p></li><li><p><a name="id2798236"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Kapitel als HTML</span> - Eine HTML Datei wird erstellt. </p></li></ul></div><p> Wenn der Text gespeichert ist, kann er mit jedem Text- oder HTML-Editor bearbeitet werden. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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-config.html">Next</a></td></tr><tr><td width="33%" align="left">In Dokumenten suchen�</td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right">�BibleTime konfigurieren</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchanal.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchanal.png
deleted file mode 100644
index cc70423..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchanal.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchresult.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchresult.png
deleted file mode 100644
index 6d96e87..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchresult.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchscope.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchscope.png
deleted file mode 100644
index 6092d1e..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchscope.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchtext.png b/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchtext.png
deleted file mode 100644
index 7e47f27..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-search-dialog-searchtext.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op-search.html b/bibletime-doc/docs/de/handbook/html/hdbk-op-search.html
deleted file mode 100644
index d6a13bc..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-search.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>In Dokumenten suchen</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-op.html" title="Chapter 3. Programmbedienung"><link rel="previous" href="hdbk-op-MDI-Window.html" title="Multiple Document Interface (MDI) Fenster"><link rel="next" href="hdbk-op-output.html" title="Exortieren und Drucken"></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>In Dokumenten suchen</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Programmbedienung</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"><a name="hdbk-op-search"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-search"></a>In Dokumenten suchen</h2></div></div><p>Teile der Anweisungen zur Benutzung von GCC Regul�ren Ausdr�cken in Dokumente Durchsuchen ist �bernommen aus den Hilfedateien der Microsoft Windows� Version von Sword</p><div class="section"><a name="hdbk-op-search-functions"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-search-functions"></a>Zugriff auf Suchfunktionen</h3></div></div><p> Sie k�nnen in einem Dokument suchen indem Sie mit der rechten Maustaste auf den Dokumentennamen innerhalb der <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Hauptgruppe</span> klicken und dann <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Durchsuche gew�hlte Module</span> ausw�hlen. Durch dr�cken von Umschalt- oder Strg w�hrende dem klicken auf andere Modulenamen k�nnen Sie mehr als eines ausw�hlen. Gehen Sie in der selben Art und Weise vor, um in allen gew�hlten Modulen zu suchen. </p></div><div class="section"><a name="hdbk-op-search-dialog"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-search-dialog"></a>Benutzung des Suchdialoges</h3></div></div><div class="section"><a name="hdbk-op-search-choose-modules"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-op-search-choose-modules"></a>Das Modul Ausw�hlen Tab benutzen</h4></div></div><p>Auf der linken Seite der Modulauswahl sehen Sie eine Liste aller auf Ihrem System installerten Module, die f�r BibleTime.verf�gbar sind. Auf der rechten Seite befindet sich eine Liste mit allen Modulen, die in der aktuellen Suche durchsucht werden sollen. Um ein Modul von der linken zur rechten Seite zu bewegen, left mouse button darauf um es auszuw�hlen, dann left mouse button auf einem der <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Pfeil-Buttons</span>.</p><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-crch-dia-choose.png"></div></div></div><div class="section"><a name="hdbk-op-search-dialog-text"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-op-search-dialog-text"></a>Das &quot;Text&quot; Tab benutzen</h4></div></div><p> Suche Text - In diesem Teil geben Sie den zu suchenden Text ein und Sie setzen Sucheinstellungen. &quot;Regul�re Ausdr�cke&quot; benutzen RegExp Syntax um die Suche zu verfeinern. </p><div class="section"><a name="hdbk-op-search-properties"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-properties"></a>Sucheinstellungen</h5></div></div><p>Die Textbox in dem Feld Sucheinstellungen ist der Ort, wo Sie den zu suchenden Text eingeben k�nnen. Er kann aus einem oder mehreren Worten bestehen, oder auch aus Wortteilen(trennen Sie W�rter und Wortteile mit Leerzeichen) oder Regul�ren Ausdr�cken bestehen. Sie k�nnen die Radio Buttons verwenden, um die Suche im &quot;Mehrere W�rter&quot;, &quot;Exakte Suche&quot; oder &quot;Regul�re Ausdr�cke&quot; Modus auszuf�hren. Mit einer Checkbox k�nnen Sie die Unterscheidung zwischen Gro�- und Kleinbuchstaben an- und ausschalten. </p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2737077"></a>Tip</h3><p>Hier funktioniert Drag&amp;Drop, Sie k�nnen Verse und Lesezeichen in die Text-Eingabebox ziehen. Sie k�nnen Text in die Zwischenablage kopieren und in die Eingabezeile einf�gen.</p></div></div><div class="section"><a name="hdbk-op-search-dialog-text-input-case"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-case"></a>Benutzung des Knopfes f�r GROSS/klein Unterscheidung</h5></div></div><p>Klicken Sie auf die GRO�/klein Box, um die Unterscheidung an oder aus zu schalten. Wenn die Box angeschaltet ist, wird die Suche nur Verse finden, in denen der Text genauso wie in der Texteingabezeile auftaucht. Falls die Box ausgeschaltet ist, wird die Suche Treffer finden, sie sich auch in der Gro�- und Kleinschreibung unterscheiden. Um &quot;HERR&quot; jedoch nicht &quot;Herr&quot; oder &quot;herr&quot; zu finden, w�hlen Sie die Option aus. Um mit &quot;HERR&quot; und &quot;Herr&quot; &quot;herr&quot; zu finden, lassen Sie die Option ausgeschaltet.</p></div><div class="section"><a name="hdbk-op-search-dialog-text-input-multi"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-multi"></a>Benutzung des &quot;Mehrere W�rter&quot; Button </h5></div></div><p>Wenn &quot;Mehrere W�rter&quot; ausgew�hlt ist, wird die Suche alle Verse finden, die alle Worte (oder Wortteile) enthalten. Die Position und Reihenfolge der The position Worte spielt keine Rolle. Wenn alle Worte in einem Vers enthalten sind, wird er in der Liste der gefundenen Verse angezeigt. Eine Suche nach &quot;prove cause&quot; wird 1 Mose 21:25 finden, &quot;And Abraham re<i>prove</i>d Abimelech be <i>cause</i> of a well of water...&quot; Es reicht also sogar, wenn die gesuchten Worte in den Worten des Verses enthalten sind.</p></div><div class="section"><a name="hdbk-op-search-dialog-text-input-phrase"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-phrase"></a>Benutzung der Genauen Suche</h5></div></div><p>Wenn Genaue Suche ausgew�hlt wurde, wird die Suche alle Zeilen (oder Verse) finden, die genau den in der Eingabezeile eingegebenen Text unter Einbezug aller Leerzeichen enthalten. Der gesuchte Satz muss nicht an einer Wortgrenze starten. Eine Suche nach &quot;amt begehrt&quot; wird 1. Thimotheus 3:1 finden: &quot;Das ist gewi�lich wahr: So jemand ein Bischofs<i>amt begehrt</i>, der begehrt ein k�stlich Werk.&quot; </p></div><div class="section"><a name="hdbk-op-search-dialog-text-input-search"></a><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-search"></a>Benutzung des Knopfes Text Suchen</h5></div></div><p>Klicken Sie den Knopf <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Suchen</span> um die Suche zu starten.</p><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-search-dialog-searchtext.png"></div></div></div><div class="section"><a name="hd-op-sch-dia-txt-scope-options"></a><div class="titlepage"><div><h5 class="title"><a name="hd-op-sch-dia-txt-scope-options"></a>Suchbereich-Einstellung</h5></div></div><p>Definieren Sie den Bereich Ihrer Suche im Panel Suchbereich</p><div class="itemizedlist"><ul><li><p><a name="id2737262"></a><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Kein Suchbereich</span> schaltet den Suchbereich Tab aus. Das ganze Dokument wird durchsucht.</p></li><li><p><a name="id2737272"></a><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Letztes Suchergebnis</span> Die neue Suche wird nur innerhalb der Verse suchen, die in der letzten Suche gefunden wurden. </p></li><li><p><a name="id2737282"></a><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Suchbereich benutzen</span> Die neue Suche wird innerhalb des angegebenen Suchbereiches ausgef�hrt.</p></li></ul></div><p>Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Kein Suchbereich</span> ausgew�hlt ist, und die KJV Bible nach &quot;Jesus&quot; durchsucht wird, werden 939 Verse gefunden. Wenn dann <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Letztes Ergebnis</span> ausgew�hlt ist, und eine weitere Suche nach &quot;Christ&quot;, durchgef�hrt wird, werden 257 Verse der 939 Treffer der letzten Suche �brigbleiben. Wenn dann noch (<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Letztes Suchergebnis</span> bleibt ausgew�hlt) nach &quot;Lord&quot; gesucht wird, bleiben von den 257 Versen noch 106 �brig. Alle diese 106 Verse enthalten &quot;Jesus&quot;, &quot;Christ&quot; und &quot;Lord&quot;. Alle diese Verse enthalten &quot;Jesus&quot;, &quot;Christ&quot; und &quot;Lord&quot;.</p></div><div class="section"><a name="hd-op-sch-dia-txt-scope-maintain"></a><div class="titlepage"><div><h5 class="title"><a name="hd-op-sch-dia-txt-scope-maintain"></a>Bereiche bearbeiten</h5></div></div><p>Bereiche bearbeiten - Sie k�nnen obere und untere Grenzen f�r die Suche eingeben mit left mouse button <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Bereiche beabeiten</span> Button.</p><div class="mediaobject"><img src="hdbk-op-change-range.png" alt="Bereich ver�ndern Box"></div><p>Die voreingestellten Eintr�ge zeigen Beispiele der verlangten Syntax. </p><p> Wenn der HInzuf�gen Button geclickt wurde, wird eine Textbox angezeigt, in der der Name f�r den Bereich eingegeben wird. Geben sie jetzt den gew�nschten Bereich ein und clicken Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Schlie�en</span>. Ihr Bereich wird nun zur Bereichsliste hinzugef�gt.</p><p>Eine Anzahl von angepassten Bereichen wurde zur Verf�gung gestellt.</p><p>Wenn <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Kein Suchbereich</span> ausgew�hlt ist, und die KJV Bible nach &quot;Jesus&quot; durchsucht wird, werden 939 Verse gefunden. Wenn dann <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Letztes Ergebnis</span> ausgew�hlt ist, und eine weitere Suche nach &quot;Christ&quot;, durchgef�hrt wird, werden 257 Verse der 939 Treffer der letzten Suche �brigbleiben. Wenn dann noch (<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Letztes Suchergebnis</span> bleibt ausgew�hlt) nach &quot;Lord&quot; gesucht wird, bleiben von den 257 Versen noch 106 �brig. Alle diese 106 Verse enthalten &quot;Jesus&quot;, &quot;Christ&quot; und &quot;Lord&quot;. Alle diese Verse enthalten &quot;Jesus&quot;, &quot;Christ&quot; und &quot;Lord&quot;.</p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2737448"></a>Tip</h3><p>Drag &amp; Drop funktioniert hier; Sie k�nnen Versreferenzen und Lesezeichen in die Bereichsbox fallen lassen, ebenso k�nnen Sie normalen Text einf�gen.</p></div></div></div><div class="section"><a name="hdbk-op-search-dialog-text-result"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-op-search-dialog-text-result"></a>Benutzung des Tabs Suchergebnis</h4></div></div><p> Suchergebnis - Dies zeigt Ihnen - nach Modulen geordnet - wie viele Treffer des gesuchten Textes gefunden wurden. Klicken auf das Dokument wird die Liste der Referenzen �ffnen. Das Klicken auf eine Referenz �ffnet diese im Fenster darunter. Ziehen Sie die Referenz und lassen Sie diese auf einem Dokument in der Hauptgruppe fallen, um dieses Modul an der gew�nschten Stelle zu �ffnen. </p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2737493"></a>Tip</h3><p>Hier funktioniert Drag&amp;Drop</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2737498"></a>Tip</h3><p>W�hlen Sie eine Versnummer und ziehen Sie diese in die Hauptgruppe um Lesezeichen anzulegen,</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2737508"></a>Tip</h3><p>W�hlen Sie einen Vers aus und ziehen Sie ihn auf ein unge�ffnetes Modul, um dieses zu �ffnen und damit dieses die gew�nschte Stelle anzeigt (Nur f�r Bibeln und Kommentare).</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2737521"></a>Tip</h3><p>W�hlen Sie einen Vers aus und ziehen Sie diesen auf ein ge�ffnetes Dokument, um das Anzeigefenster an diese Stelle springen zu lassen (Nur in Bibeln und Kommentaren).</p></div><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-search-dialog-searchresult.png"></div></div></div><div class="section"><a name="hdbk-op-search-dialog-text-analysis"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-op-search-dialog-text-analysis"></a>Benutzung des Suchanalyse Teils</h4></div></div><p> Suchanalyse - Dies zeigt eine grafische Analyse der Anzahl der Treffer in jedem Buch. Sie kann das Ergebnis aller Dokumente anzeigen. Sie k�nnen den Graphen auch als Bild auf Festplatte abspeichern. </p><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-search-dialog-searchanal.png"></div></div></div></div><div class="section"><a name="hdbk-op-search-dialog-text-regexp"></a><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-search-dialog-text-regexp"></a>Syntax der Suche bei Benutzung von GCC regul�ren Ausdr�cken</h3></div></div><p>Eine Suche mit regul�ren Ausdr�cken stellt eine M�glichkeit dar, einfache oder komplexe Suchen nach Zeichenketten durchzuf�hren, die einem Muster oder einer Menge von Mustern (Bereiche) entsprechen. Die einzelnen Muster einer Menge werden durch den horizontalen Strich &quot;|&quot; getrennt. W�hrend es m�glich ist, ein Muster zu bauen, dass nach einem Wort oder einem Satz sucht, sucht ein einfaches aus einem einzelnen Wort bestehendes Muster nicht nur nach diesem einen Wort, sondern auch nach jeder Zeichenkette die das gesuchte Wort enth�lt. Eine Suche nach &quot;gerecht&quot; wird Verse liefern, die das Wort &quot;gerecht&quot; enthalten. Es werden jedoch auch Verse zur�ckgeliefert, die &quot;<i>Gerecht</i>igkeit&quot;, &quot;Un<i>gerecht</i>igkeit&quot; oder &quot;<i>gerecht</i>er&quot; enthalten. Eine Suche nach &quot;hall not&quot; ist nicht eine Suche nach &quot;hall&quot; UND &quot;not&quot;, sondern nach der Zeichenkette &quot;hall not&quot; mit einem Leerzeichen zwischen dem zweiten &quot;l&quot; und dem &quot;n&quot;. Die Suche nach &quot;hall not&quot; wird Textstellen mit &quot;s<i>hall not</i>&quot; finden.</p><p>Die M�chtigkeit der regul�ren Ausdr�cke liegt in den Mustern (oder Vorlagen) die benutzt werden, um die Suche zu definieren. Ein Muster besteht aus normalen Zeichen und einigen besonderen Zeichen, die von einer bestimmten Menge von Regeln interpretiert und benutzt werden. Die besonderen Zeichen enthalten .\[^*$?+. Normale (oder einfache) Zeichen, sind alle die, die keine besonderen Zeichen sind. Der Backslash, &quot;\&quot;, wird benutzt um die besonderen Zeichen in normale und normale in besondere Zeichen umzuwandeln. </p><p>Beispiel: das Muster &quot;<i>i. love\.</i>&quot; wird S�tze finden, die mit &quot;h<i>i</i>s <i>love</i>&quot; oder &quot;<i>i</i>n <i>love</i>&quot; oder &quot;<i>i</i>s <i>love</i>&quot; enden, gefolgt von einem Punkt. Der erste Punkt in &quot;i. love\.&quot; ist ein spezielles Zeichen, das ein Platzhalter f�r ein beliebiges Zeichen an dieser Stelle ist.Der Backslash in &quot;i. love\.&quot; markiert den folgenden Punkt als normales Zeichen (der sonst ein Sonderzeichen ist). </p><div class="section"><a name="hdbk-op-search-dialog-text-regexp-rules"></a><div class="titlepage"><div><h4 class="title"><a name="hdbk-op-search-dialog-text-regexp-rules"></a>Regeln f�r Suchabfragen mit GCC regul�ren Ausdr�cken</h4></div></div><div class="itemizedlist"><ul><li><p><a name="id2797045"></a>. Der Punkt passt auf jedes Zeichen. Siehe auch <a href="hdbk-op-search.html#period" title="Der Punkt ."> Einzelheiten</a></p></li><li><p><a name="id2797084"></a>* Der Stern findet 0 oder mehr Zeichen des vorhergehenden Sets, des vorhergehenden Zeichens oder des vorhergehenden besonderern Zeichens. Siehe auch <a href="hdbk-op-search.html#asterisk" title="Das Sternchen *">Einzelheiten</a></p></li><li><p><a name="id2797104"></a>+ Das Pluszeichen findet 1 oder mehr Zeichen des vorhergehenden Sets, des vorhergehenden Zeichens oder des vorhergehenden besonderern Zeichens. Siehe auch <a href="hdbk-op-search.html#plus" title="Das Pluszeichen +">Einzelheiten</a>.</p></li><li><p><a name="id2797125"></a>? Das Fragezeichen passt auf 0 oder 1 Zeichen des vorhergehenden Sets, Zeichens oder besonderern Zeichens. Siehe auch <a href="hdbk-op-search.html#question" title="Das Fragezeichen ?">Einzelheiten</a></p></li><li><p><a name="id2797145"></a>[ ] Eckige Klammern finden ein Zeichens innerhalb der eckigen Klammern [ ]. Siehe auch <a href="hdbk-op-search.html#bracket" title="Die eckigen Klammern [ ]">Einzelheiten</a></p></li><li><p><a name="id2797164"></a>^ Ein Hochzeichen als erstes Zeichen innerhalb von [ ] hei�t NICHT. Siehe auch <a href="hdbk-op-search.html#caret" title="Das Hochzeichen zu Beginn in den eckigen Klammern [^xxx">Einzelheiten</a></p></li><li><p><a name="id2797111"></a>^ Ein Hochzeichen als Beginn eines Musters verankert an den Beginn der Zeile. Siehe auch <a href="hdbk-op-search.html#caret" title="Das Hochzeichen zu Beginn in den eckigen Klammern [^xxx">Einzelheiten</a></p></li><li><p><a name="id2797179"></a>$ Ein Dollarzeichen am Beginn eines Musters verankert an das Ende einer Zeile. Siehe auch <a href="hdbk-op-search.html#dollar" title="Das Dollarzeichen als Zeilenende Anker xxx$">Einzelheiten</a></p></li><li><p><a name="id2797198"></a>| Ein vertikaler Strich hat die Bedeutung des logischen ODER. Siehe auch <a href="hdbk-op-search.html#bar" title="Der senkrechte Strich |">Einzelheiten</a></p></li><li><p><a name="id2797216"></a>( ) Runde Klammern gruppieren Ausdr�cke. <i>Wird nicht unterst�tzt!</i></p></li><li><p><a name="id2797227"></a>\ Ein Backslash kann vor jedem besonderem Zeichen benutzt werden, um dieses Zeichen zu finden. Siehe auch <a href="hdbk-op-search.html#backslash" title="Der Backslash vor einem besonderen Zeichen \*">Einzelheiten</a></p></li><li><p><a name="id2797246"></a>\ Ein Backslash kann vor jedem normalen Zeichen benutzt werden um es zu einem besonderen Zeichen zu machen. Siehe auch <a href="hdbk-op-search.html#backslash" title="Der Backslash vor einem besonderen Zeichen \*">Einzelheiten</a></p></li></ul></div><div class="section"><a name="period"></a><div class="titlepage"><div><h5 class="title"><a name="period"></a>Der Punkt .</h5></div></div><p>Der Punkt &quot;.&quot; steht f�r jedes einzelne Zeichen, sogar f�r ein Leerzeichen oder f�r ein Zeichen, dass nicht im Alphabet vorkommt. <i>s.t</i> findet <i>s</i>i<i>t</i>, <i>s</i>e<i>t</i>,<i> s</i>o<i>t</i>, usw., welche in folgenden Zeichenketten vorkommen k�nnen <i>s</i>i<i>t</i>ting, compas<i>s</i>e<i>t</i>h and <i>s</i>o<i>t</i>tish <i>b..t</i> findet <i>b</i>oo<i>t</i>, <i>b</i>oa<i>t</i> und <i>b</i>ea<i>t foot.tool </i>findet <i>foot</i>s<i>tool </i>und <i>foot tool</i></p></div><div class="section"><a name="asterisk"></a><div class="titlepage"><div><h5 class="title"><a name="asterisk"></a>Das Sternchen *</h5></div></div><p>Das Sternchen findet null oder mehr Zeichen des vorhergehenden Sets, Zeichens oder besonderen Zeichens. Die Benutzung einer Punkt Sternchen Kombination &quot;.*&quot; nach einem h�ufig gefundenem Muster kann die Suche sehr lange dauern lassen und das Programm eingefroren wirken lassen. <i>be*n</i> findet<i> beeen, been, ben</i>, und <i>bn</i> was z.B. &quot;Reu<i>ben</i>&quot; und &quot;She<i>bn</i>a&quot; finden k�nnte.</p></div><div class="section"><a name="plus"></a><div class="titlepage"><div><h5 class="title"><a name="plus"></a>Das Pluszeichen +</h5></div></div><p>Das Pluszeichen findet ein oder mehr Zeichen des vorhergehenden Sets, Zeichens oder besonderen Zeichens. Die Benutzung einer Pluszeichen Sternchen Kombination &quot;+*&quot; nach einem h�ufig gefundenem Muster kann die Suche sehr lange dauern lassen und das Programm eingefroren wirken lassen. &quot;<i>be+n</i>&quot; findet &quot;<i>beeen, been</i>&quot; und &quot;<i>ben</i>&quot;, jedoch nicht &quot;<i>bn</i>&quot;.</p></div><div class="section"><a name="question"></a><div class="titlepage"><div><h5 class="title"><a name="question"></a>Das Fragezeichen ?</h5></div></div><p>Das Fragezeichen findet 0 oder mehr Zeichen des vorhergehenden Sets, Zeichens oder besonderen Zeichens. <i>be?n</i> findet <i>ben</i> und <i>bn</i> jedoch nicht <i>been</i>. <i>trees?</i> findet <i>trees</i> oder <i>tree</i>.</p></div><div class="section"><a name="bracket"></a><div class="titlepage"><div><h5 class="title"><a name="bracket"></a>Die eckigen Klammern [ ]</h5></div></div><p>Die eckigen Klammern schlie�en eine Menge von Zeichen ein, die Treffer erzielen k�nnen. Die Zeichen Punkt, Sternchen, Pluszeichen und Fragezeichen werden innerhalb der Klammern nicht als besondere Zeichen behandelt. Ein Minuszeichen kann benutzt werden, um einen Bereich anzugeben. Falls Sie m�chten, dass ein Hochzeichen &quot;^&quot; Teil des Bereiches wird plazieren Sie es nicht direkt hinter die linke Klammer, oder es wird als besonderes Zeichen behandelt. Um den vertikalen Strich &quot;|&quot; in die Menge aufzunehmen, machen Sie ihn zum ersten Zeichen nach der linken eckigen Klammer (oder zweites nach dem besonderen Zeichen &quot;^&quot;). Um ein Minuszeichen in die Menge aufzunehmen machen Sie es zum ersten Zeichen nach der linken Klammer (oder zweites nach dem besonderen Zeichen &quot;^&quot;) oder auch zum letzten Zeichen der Menge. <i>s[eia]t</i> findet <i>set</i>, <i>sit</i>, und <i>sat</i>, jedoch nicht <i>s</i>o<i>t</i>. <i>s[eia]+t </i>findet so wie oben und<i>seat, seet, siet</i>, usw. <i>[a-d]</i> findet <i>a, b, c,</i> oder <i>d</i>. <i>[A-Z]</i> findet jeden Gro�buchstaben. [.;:?!] findet ., ;, :, ?, oder ! jedoch kein Komma. [ ]^-] findet ] oder ^ oder -</p></div><div class="section"><a name="caret"></a><div class="titlepage"><div><h5 class="title"><a name="caret"></a>Das Hochzeichen zu Beginn in den eckigen Klammern [^xxx</h5></div></div><p>Wenn das Hochzeichen das erste Zeichen nach der linken Klammer ist, hat es die Bedeutung von NICHT. <i>s[^io]t</i> findet <i>set, sat</i>, usw., jedoch nicht <i>s</i>i<i>t</i> und <i>s</i>o<i>t</i>.</p></div><div class="section"><a name="caret-s"></a><div class="titlepage"><div><h5 class="title"><a name="caret-s"></a>Das Hochzeichen als Zeilenbeginn Anker ^xxx</h5></div></div><p>Wenn das Hochzeichen das erste Zeichen in einem Muster ist, verankert es diese an den Beginn der Zeile. Jeder Treffer muss am Beginn der Zeile liegen. Wegen ungefilterten Formatierungszeichen in einigen Texten funktioniert diese Funktion nicht immer. Sie k�nnte es jedoch, wenn einige Punkte nach dem Hochzeichen gesetzt werden, um die Formatierungszeichen zu umgehen. <i>^Am Anfang</i> findet Zeilen, die mit &quot;<i>Amfang</i>&quot;. beginnen (Vielleicht m�ssen Sie &quot;<i>^.....Am Anfang</i>&quot; benutzen).</p></div><div class="section"><a name="dollar"></a><div class="titlepage"><div><h5 class="title"><a name="dollar"></a>Das Dollarzeichen als Zeilenende Anker xxx$</h5></div></div><p>Wenn das Dollarzeichen das letzte des Musters ist, verankert es das Muster an das Ende der Zeile. Jeder Treffer muss am Ende der Zeile stattfinden. Wegen ungefilterten Formatierungszeichen in einigen Texten funktioniert diese Funktion nicht immer. Sie k�nnte es jedoch, wenn einige Punkte vor das Dollarzeichen gesetzt werden, um die Formatierungszeichen zu umgehen. <i>Amen\.$</i> findet Zeilen, die mit &quot;<i>Amen.</i>&quot; enden (Vielleicht m�ssen Sie &quot;Amen\....&quot;, &quot;Amen\..........$&quot;, oder sogar &quot;Amen\....................$&quot; benutzen)</p></div><div class="section"><a name="bar"></a><div class="titlepage"><div><h5 class="title"><a name="bar"></a>Der senkrechte Strich |</h5></div></div><p>Der vertikale Strich zwischen Mustern bedeutet ODER. <i>John|Peter</i> findet <i>John</i>. <i>Peter. John .*Peter|Peter .*John</i> matches <i>John</i> ... <i>Peter</i> oder <i>Peter</i> ... <i>John</i>. (.* slows a search) <i>pain|suffering|sorrow</i> findet<i>pain</i>, oder <i>suffering</i>, oder <i>sorrow</i>.</p></div><div class="section"><a name="parenth"></a><div class="titlepage"><div><h5 class="title"><a name="parenth"></a>Die runden Klammern ( ) </h5></div></div><p><i>Die Benutzung der runden Klammern () wird nicht unterst�tzt.</i></p></div><div class="section"><a name="backslash"></a><div class="titlepage"><div><h5 class="title"><a name="backslash"></a>Der Backslash vor einem besonderen Zeichen \*</h5></div></div><p>Der Backslash vor einem besonderen Zeichen bedeutet, dass das Zeichen nicht in seiner besonderen Bedeutung behandelt werden soll, sondern dass es das Zeichen selbst sein soll. &quot;<i>amen\.</i>&quot; findet &quot;<i>amen.</i>&quot;, jedoch nicht &quot;<i>amen</i>t&quot; und es wird nicht &quot;firm<i>amen</i>t&quot;.</p></div><div class="section"><a name="backslash-o"></a><div class="titlepage"><div><h5 class="title"><a name="backslash-o"></a>Der Backslash vor einem normalen Zeichen \s</h5></div></div><p>Der Backslash vor einem normalen Zeichen bedeutet, dass dieses statt der normalen Bedeutung eine besondere haben soll.</p><div class="itemizedlist"><ul><li><p><a name="id2797851"></a> \b aus�erhalb von [ ] benutzt, bedeutet es Wortgrenze. Innerhalb von [ ] hat die es die Bedeutung des Backspace. <i>\brighteous\b</i> findet <i>righteous</i>, aber nicht un<i>righteous</i> oder <i>righteous</i>ness</p></li><li><p><a name="id2797878"></a>\B steht f�r keine Wortgrenze. <i>\Brighteous\B</i> findet un<i>righteous</i>ness und un<i>righteous</i>ly, jedoch nicht <i>righteous</i>, un<i>righteous</i> oder <i> righteous</i>ness.</p></li><li><p><a name="id2797910"></a>\d steht f�r Zahlen; das Gleiche wie [0-9].</p></li><li><p><a name="id2797918"></a>\D steht f�r nicht-Zahlen; das Gleiche wie [^0-9].</p></li><li><p><a name="id2797926"></a>\s bedeutet Leerzeichen. </p></li><li><p><a name="id2797931"></a>\S steht f�r nicht-Leerzeichen. </p></li><li><p><a name="id2797939"></a>\w bedeutet alphanumerisch; das Gleiche wie [a-zA-Z0-9_].</p></li><li><p><a name="id2797946"></a>\W bedeutet nicht-alphanumerisch; das Gleiche wie [^a-zA-Z0-9_].</p></li></ul></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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-output.html">Next</a></td></tr><tr><td width="33%" align="left">Multiple Document Interface (MDI) Fenster�</td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right">�Exortieren und Drucken</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-op.html b/bibletime-doc/docs/de/handbook/html/hdbk-op.html
deleted file mode 100644
index 75cf0cf..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 3. Programmbedienung</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="index.html" title="Das BibleTime-Handbuch"><link rel="previous" href="hdbk-start-screen.html" title="Elemente des BibleTime Fensters"><link rel="next" href="hdbk-op-module-tree-select.html" title="Ein Modul zum Anschauen ausw�hlen"></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>Programmbedienung</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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-module-tree-select.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. Programmbedienung</h2></div></div><p> BibleTime wird haupts�chlich von dem Modulbaum aus bedient (dieser wird &quot;Hauptgruppe&quot; genannt). Der zweite wichtige Ort zum Arbeiten in BibleTime ist der MDI Bereich (MDI = Multiple Document Interface). </p><div class="section"><a name="hdbk-op-module-tree"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-module-tree"></a>Hauptgruppe</h2></div></div><p> Dies ist der Bereich auf der linken Seite des BibleTime Fensters. Er enth�lt den Baum der installierten Dokumente (Sword Module) und alle von Ihnen angelegten Lesezeichen. </p><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-module-tree-1.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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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-module-tree-select.html">Next</a></td></tr><tr><td width="33%" align="left">Elemente des BibleTime Fensters�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Ein Modul zum Anschauen ausw�hlen</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-start-bticon.png b/bibletime-doc/docs/de/handbook/html/hdbk-start-bticon.png
deleted file mode 100644
index c2a6346..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-start-bticon.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-start-screen-terms.png b/bibletime-doc/docs/de/handbook/html/hdbk-start-screen-terms.png
deleted file mode 100644
index 1b7692c..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-start-screen-terms.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-start-screen.html b/bibletime-doc/docs/de/handbook/html/hdbk-start-screen.html
deleted file mode 100644
index 5aedf86..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-start-screen.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Elemente des BibleTime Fensters</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="hdbk-term.html" title="Chapter 2. BibleTime starten"><link rel="previous" href="hdbk-term.html" title="Chapter 2. BibleTime starten"><link rel="next" href="hdbk-op.html" title="Chapter 3. Programmbedienung"></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>Elemente des BibleTime Fensters</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">BibleTime starten</td><td align="right" class="right"><a accesskey="n" href="hdbk-op.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="hdbk-start-screen"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-start-screen"></a>Elemente des BibleTime Fensters</h2></div></div><p> Jetzt �ffnet sich das BibleTime Fenster. Die Bedienung wird im n�chsten Kapitel erkl�rt. <div class="mediaobject"><img src="hdbk-start-screen-terms.png" alt="Das BibleTime Anwendungsfenster"></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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-op.html">Next</a></td></tr><tr><td width="33%" align="left">BibleTime starten�</td><td width="34%" align="center"><a href="hdbk-term.html">Up</a></td><td width="33%" align="right">�Programmbedienung</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-start-sequence-tips.png b/bibletime-doc/docs/de/handbook/html/hdbk-start-sequence-tips.png
deleted file mode 100644
index d4f0a2e..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-start-sequence-tips.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-term-hotkeys.html b/bibletime-doc/docs/de/handbook/html/hdbk-term-hotkeys.html
deleted file mode 100644
index abd5a28..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-term-hotkeys.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<html>
-<head>
-<title></title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="Das BibleTime Handbuch">
-<link rel="up" href="hdbk-bars.html" title="Chapter 4. Haupt-Werkzeugleiste und Men�leiste">
-<link rel="previous" href="hdbk-bars-menubar.html" title="Men�zeile">
-</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></h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Haupt-Werkzeugleiste und Men�leiste</td>
-<td align="right" class="right"></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="hdbk-term-hotkeys"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="hdbk-term-hotkeys"></a></h2></div></div>
-<p> Die hier aufgelisteten Tastenkombinationen k�nnen im Optionendialog ver�ndert werden. </p>
-<div class="table">
-<p>
-<a name="id2787194"></a><b>Table 4.0. Voreingestellte Tasten</b>
-</p>
-<table summary="Voreingestellte Tasten" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Aktion</th>
-<th>Voreingestelle Taste</th>
-</tr></thead>
-<tbody>
-<tr>
-<td>Automatisch Kacheln</td>
-<td>Strg+Alt+T</td>
-</tr>
-<tr>
-<td>Automatisch staffeln </td>
-<td>Strg+Alt+A </td>
-</tr>
-<tr>
-<td>Staffeln </td>
-<td>Strg+A </td>
-</tr>
-<tr>
-<td>Alle schlie�en </td>
-<td>Umschalt+Strg+A</td>
-</tr>
-<tr>
-<td>Werkzeugleisten einrichten</td>
-<td>�</td>
-</tr>
-<tr>
-<td>Einstellungen </td>
-<td>�</td>
-</tr>
-<tr>
-<td>Beenden </td>
-<td>Strg+Q</td>
-</tr>
-<tr>
-<td>Entferne ausgew�hlte Elemente</td>
-<td>Strg+Alt+D</td>
-</tr>
-<tr>
-<td>Hauptgruppe zur�cksetzen </td>
-<td>Strg+Alt+R</td>
-</tr>
-<tr>
-<td>In gew�hlten Modulen suchen </td>
-<td>Strg+Alt+S</td>
-</tr>
-<tr>
-<td>Kacheln </td>
-<td>Strg+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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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"></td>
-</tr>
-<tr>
-<td width="33%" align="left">Men�zeile�</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/bibletime-doc/docs/de/handbook/html/hdbk-term.html b/bibletime-doc/docs/de/handbook/html/hdbk-term.html
deleted file mode 100644
index 02f3b22..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk-term.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 2. BibleTime starten</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="up" href="index.html" title="Das BibleTime-Handbuch"><link rel="previous" href="hdbk-intro-motivation.html" title="Motivation"><link rel="next" href="hdbk-start-screen.html" title="Elemente des BibleTime Fensters"></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>BibleTime starten</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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-screen.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. BibleTime starten</h2></div></div><p> BibleTime ist ein KDE Programm und ist in den KDE Arbeitsplatz integriert. Sie k�nnen BibleTime in KDE <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Startmen�</span> in der Hauptgruppe finden. <div class="mediaobject"><img src="hdbk-start-bticon.png" alt="XX"></div> </p><p> BibleTime kann von anderen Fenstermanagern aufgerufen werden (wie zum Beispiel gnome), voraussgesetzt KDE ist installiert. SIe m�ssen ihr eigenes Symbol anlegen, um das Programm zu starten. Schlagen Sie in der Hilfe des Fenstermanagers nach, wie dies funktioniert. </p><p> BibleTime kann auch von der Kommandozeile eines Terminals aufgerugfen werden. Um BibleTime zu starten, �ffnen Sie ein Terminal (jedes beliebige Xterminal) und geben Sie <span class="command"><b>BibleTime</b></span> ein. </p><div class="section"><a name="hdbk-start-sequence"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-start-sequence"></a>Startvorgang</h2></div></div><p> Wenn BibleTime startet, k�nnten Sie einige Meldungen sehen:</p><div class="itemizedlist"><ul><li><p><a name="id2737800"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Keine Module installiert</span> - Dies erscheint, wenn Sie vergessen haben Sword Module zu installieren, oder wenn Sword Module nicht gefunden werden k�nnen. </p></li><li><p><a name="id2737818"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Erster Start</span> - Dies wird angezeigt, wenn BibleTime das erste Mal startet. </p></li><li><p><a name="id2798456"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">T�gliche Tipps</span> - Dies wird bei jedem Start angezeigt, es sei denn Sie schalten dies ab. <div class="mediaobject"><img src="hdbk-start-sequence-tips.png" alt="T�gliche Tipps"></div> </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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-screen.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">�Elemente des BibleTime Fensters</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_Configtoolbar.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_Configtoolbar.png
deleted file mode 100644
index 54d184c..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_Configtoolbar.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_cascade.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_cascade.png
deleted file mode 100644
index 263ad5f..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_cascade.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_cascade_auto.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_cascade_auto.png
deleted file mode 100644
index d0a8461..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_cascade_auto.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_contents.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_contents.png
deleted file mode 100644
index 293b736..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_contents.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_exit.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_exit.png
deleted file mode 100644
index df78708..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_exit.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_footnotes.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_footnotes.png
deleted file mode 100644
index 119147e..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_footnotes.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_print.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_print.png
deleted file mode 100644
index cac78d6..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_print.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_reset.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_reset.png
deleted file mode 100644
index 51ecc27..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_reset.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_search.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_search.png
deleted file mode 100644
index b6e504c..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_search.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_strongs.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_strongs.png
deleted file mode 100644
index 68ac2bb..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_strongs.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_tile.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_tile.png
deleted file mode 100644
index 5dfd05f..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_tile.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_tile_auto.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_tile_auto.png
deleted file mode 100644
index 842d9ee..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_action_tile_auto.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_close.png b/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_close.png
deleted file mode 100644
index d4c4440..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_bars_toolbar_close.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_bookmk_1.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_module_bookmk_1.png
deleted file mode 100644
index 4bbcd58..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_bookmk_1.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_select_1.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_module_select_1.png
deleted file mode 100644
index 2f44816..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_select_1.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_select_2.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_module_select_2.png
deleted file mode 100644
index fceccfd..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_select_2.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_tree_1.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_module_tree_1.png
deleted file mode 100644
index e92af75..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_tree_1.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_tree_bookmark_bookmarkandfolder.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_module_tree_bookmark_bookmarkandfolder.png
deleted file mode 100644
index caa339a..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_module_tree_bookmark_bookmarkandfolder.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchanal.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchanal.png
deleted file mode 100644
index cc70423..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchanal.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchresult.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchresult.png
deleted file mode 100644
index 6d96e87..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchresult.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchscope.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchscope.png
deleted file mode 100644
index 6092d1e..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchscope.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchtext.png b/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchtext.png
deleted file mode 100644
index 7e47f27..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_search_dialog_searchtext.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_start_bticon.png b/bibletime-doc/docs/de/handbook/html/hdbk_start_bticon.png
deleted file mode 100644
index c2a6346..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_start_bticon.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_start_screen_terms.png b/bibletime-doc/docs/de/handbook/html/hdbk_start_screen_terms.png
deleted file mode 100644
index 1b7692c..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_start_screen_terms.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_start_sequence_tips.png b/bibletime-doc/docs/de/handbook/html/hdbk_start_sequence_tips.png
deleted file mode 100644
index d4f0a2e..0000000
--- a/bibletime-doc/docs/de/handbook/html/hdbk_start_sequence_tips.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/handbook/html/index.html b/bibletime-doc/docs/de/handbook/html/index.html
deleted file mode 100644
index 0d32119..0000000
--- a/bibletime-doc/docs/de/handbook/html/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Das BibleTime-Handbuch</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="bibletime, Bibletime, sword, crosswire, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="next" href="hdbk-intro.html" title="Chapter 1. Einf�hrung"></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>Das BibleTime-Handbuch</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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" id="id2736031"><div class="titlepage"><div><h1 class="title"><a name="id2736031"></a>Das BibleTime-Handbuch</h1></div><div><h3 class="author">Fred  Saalbach</h3><div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:info@bibletime.de">info@bibletime.de</a>&gt;</tt></div></div><h3 class="author">Jeffrey Hoyt</h3></div><div>Revision <span class="releaseinfo">2.00<br></span></div><div><p class="copyright">Copyright � 1999, 2000, 2001 BibleTimeinfo@bibletime.de</p></div><div><div class="legalnotice"><p>Der BibleTime Hilfedialog ist ein Teil von 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" id="id2799340"><a name="id2799340"></a><p> BibleTime ist eine in der Studie der Bibel zu helfende Anwendung. </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="hdbk-intro.html">Einf�hrung</a></dt><dd><dl><dt> <a href="hdbk-intro.html#hdbk-intro-changes">�nderungen</a></dt><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">BibleTime starten</a></dt><dd><dl><dt> <a href="hdbk-term.html#hdbk-start-sequence">Startvorgang</a></dt><dt> <a href="hdbk-start-screen.html">Elemente des BibleTime Fensters</a></dt></dl></dd><dt>3 <a href="hdbk-op.html">Programmbedienung</a></dt><dd><dl><dt> <a href="hdbk-op.html#hdbk-op-module-tree">Hauptgruppe</a></dt><dt> <a href="hdbk-op-module-tree-select.html">Ein Modul zum Anschauen ausw�hlen</a></dt><dd><dl><dt> <a href="hdbk-op-module-tree-select.html#hdbk-op-module-tree-search">Auf den Suchdialog zugreifen</a></dt><dt> <a href="hdbk-op-module-tree-select.html#hdbk-op-module-tree-bookmark">Auf Lesezeichen zugreifen</a></dt></dl></dd><dt> <a href="hdbk-op-MDI-Window.html">Multiple Document Interface (MDI) Fenster</a></dt><dd><dl><dt> <a href="hdbk-op-MDI-Window.html#hdbk-op-MDI-Window-control-modules">Ge�ffnete Fenster verwalten</a></dt><dt> <a href="hdbk-op-MDI-Window.html#hdbk-op-MDI-Window-module-navigation">In ge�ffneten Dokumenten navigieren</a></dt><dt> <a href="hdbk-op-MDI-Window.html#hdbk-op-MDI-Window-Personal-commentary">Bearbeiten Sie ihren eigenen Kommentar</a></dt></dl></dd><dt> <a href="hdbk-op-search.html">In Dokumenten suchen</a></dt><dd><dl><dt> <a href="hdbk-op-search.html#hdbk-op-search-functions">Zugriff auf Suchfunktionen</a></dt><dt> <a href="hdbk-op-search.html#hdbk-op-search-dialog">Benutzung des Suchdialoges</a></dt><dt> <a href="hdbk-op-search.html#hdbk-op-search-dialog-text-regexp">Syntax der Suche bei Benutzung von GCC regul�ren Ausdr�cken</a></dt></dl></dd><dt> <a href="hdbk-op-output.html">Exortieren und Drucken</a></dt><dd><dl><dt> <a href="hdbk-op-output.html#hdbk-op-select-all">Alle ausw�hlen</a></dt><dt> <a href="hdbk-op-output.html#hdbk-op-lookup">Text im Lexikon nachschlagen</a></dt><dt> <a href="hdbk-op-output.html#hdbk-op-copy">Kopieren</a></dt><dt> <a href="hdbk-op-output.html#hdbk-op-print">Zur Druckschlange hinzuf�gen</a></dt><dt> <a href="hdbk-op-output.html#hdbk-op-save">Speichern</a></dt></dl></dd></dl></dd><dt>4 <a href="hdbk-config.html">BibleTime konfigurieren</a></dt><dd><dl><dt> <a href="hdbk-config.html#hdbk-config-toolbar">Werkzeugleisten-Konfigurationsdialog</a></dt><dt> <a href="hdbk-config-bt.html">Optionendialog</a></dt><dd><dl><dt> <a href="hdbk-config-bt.html#hdbk-config-bt-startup">Start</a></dt><dt> <a href="hdbk-config-bt.html#hdbk-config-bt-fonts">Schriften</a></dt><dt> <a href="hdbk-config-bt.html#hdbk-config-bt-Colors">Farben</a></dt><dt> <a href="hdbk-config-bt.html#hdbk-config-bt-profiles">Profile</a></dt><dt> <a href="hdbk-config-bt.html#hdbk-config-bt-sword">Sword</a></dt><dt> <a href="hdbk-config-bt.html#hdbk-config-bt-Accelerators">Tastenk�rzel</a></dt></dl></dd></dl></dd><dt>5 <a href="hdbk-bars.html">Werkzeugleiste und Men�leiste</a></dt><dd><dl><dt> <a href="hdbk-bars.html#hdbk-bars-toolbar">Werkzeugleiste</a></dt><dt> <a href="hdbk-bars-toolbar-action.html">Knopf-Aktion</a></dt><dt> <a href="hdbk-bars-menubar.html">Men�zeile</a></dt><dt> <a href="hdbk-bars-menubar-file.html">Datei</a></dt><dt> <a href="hdbk-bars-menubar-view.html">Ansicht</a></dt><dt> <a href="hdbk-bars-menubar-mainindex.html">Hauptgruppe</a></dt><dt> <a href="hdbk-bars-menubar-Window.html">Fenster</a></dt><dt> <a href="hdbk-bars-menubar-settings.html">Einstellungen</a></dt><dt> <a href="hdbk-bars-menubar-Help.html">Hilfe</a></dt></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">�Einf�hrung</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/handbook/unicode/Makefile.am b/bibletime-doc/docs/de/handbook/unicode/Makefile.am
deleted file mode 100644
index 6f2b018..0000000
--- a/bibletime-doc/docs/de/handbook/unicode/Makefile.am
+++ /dev/null
@@ -1,31 +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)/de/bibletime/handbook/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/handbook/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/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)/de/bibletime/handbook/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;
diff --git a/bibletime-doc/docs/de/handbook/unicode/Makefile.in b/bibletime-doc/docs/de/handbook/unicode/Makefile.in
deleted file mode 100644
index 9f2279b..0000000
--- a/bibletime-doc/docs/de/handbook/unicode/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/unicode/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/handbook/unicode/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/handbook/unicode
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/handbook/unicode/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/handbook/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/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)/de/bibletime/handbook/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/handbook/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/handbook/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/handbook/unicode/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/handbook/unicode/hdbk-config.docbook b/bibletime-doc/docs/de/handbook/unicode/hdbk-config.docbook
deleted file mode 100644
index 0a5fe17..0000000
--- a/bibletime-doc/docs/de/handbook/unicode/hdbk-config.docbook
+++ /dev/null
@@ -1,465 +0,0 @@
-<chapter id="hdbk-config"
-><title
->BibleTime konfigurieren</title>
-<para
->Die &bibletime;-Benutzerschnittstelle kann vielseitig konfiguriert werden. Um den Konfigurationsdialog aufzurufen, wählen Sie in der Hauptwerkzeugleiste <guimenu
->Einstellungen</guimenu
->. Von hier aus wählen Sie <guimenuitem
->Werkzeugleisten konfigurieren</guimenuitem
->, um den Konfigurationsdialog der Werkzeugleisten aufzurufen, oder Sie wählen <guimenuitem
->&bibletime; konfigurieren</guimenuitem
->, um den BibleTime Konfigurationsdialog aufzurufen.</para>
-
-	<section id="hdbk-config-toolbar"
-><title
->Werkzeugleisten-Konfigurationsdialog</title>
-	<para
->Der Werkzeugleisten-Konfigurationsdialog ermöglicht das Hinzufügen und Entfernen von Aktionen von der Haupterkzeugleiste von &bibletime;. Die Reihenfolge der Aktionen kann auch verändert werden.</para>
-	<mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-config-toolbar.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Werkzeugleisten-Konfigurationsdialog</phrase
-> </textobject
-> <caption
-> <para
->Der Werkzeugleisten-Konfigurationsdialog.</para
-> </caption
-> </mediaobject>
-	</section>
-
-	<section id="hdbk-config-bt"
-><title
->Optionendialog</title>
-	<para
->Der Optionendialgo erlaubt Ihnen, viele &bibletime; und Sword Features anzupassen.</para>
-
-		<section id="hdbk-config-bt-startup"
-><title
->Start</title>
-		<para
->Das Startverhalten kann angepasst werden. Wählen Sie aus den folgenden Optionen aus:</para>
-		<simplelist
-> <member
->Tip des Tages anzeigen</member
-> <member
->Startlogo anzeigen</member
-> <member
->Fenster im Arbeitsbereich wiederherstellen</member
-> </simplelist>
-		<mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-conf-optdialog-start.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Optionendialog</phrase
-> </textobject
-> <caption
-> <para
->Der Optionendialog - Start.</para
-> </caption
-> </mediaobject>
-		</section>
-		<section id="hdbk-config-bt-fonts"
-><title
->Schriften</title>
-		<para
->Die Anzeigeschrift kann verändert werden. Wenn Sie ein Modul haben, das eine spezielle Schrift benötigt, überprüfen Sie hier, ob die Schrift für &bibletime; verfügbar ist. </para>
-		<mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-conf-optdialog-fonts.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Optionendialog - Schriften</phrase
-> </textobject
-> <caption
-> <para
->Der Optionendialog - Schriften.</para
-> </caption
-> </mediaobject>
-
-			<section id="hdbk-config-bt-Unicode"
-><title
->Unicode Schriften (ISO10646)</title>
-			<para
->Sword Module benutzen entweder das ISO-8859-1 (Latin-1) oder das ISO-10646 (Unicode) Encoding. Sie können herausfinden, welches Encoding verwendet wurde, durch &RMB; auf dem Hauptindex, und Auswahl von <guimenuitem
->Über dieses Modul</guimenuitem
->.</para>
-			<mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-conf-font-about.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Über dieses Modul</phrase
-> </textobject
-> <caption
-> <para
->Das "Über dieses Modul"-Fenster zeigt an, welches Encoding benutzt wird.</para
-> </caption
-> </mediaobject>
-			<para
->Solange Ihre benötigten Module korrekt angezeigt werden, muss hier nichts unternommen werden. Wenn ein Modul als eine Folge von Fragezeichen (???????????????????) angezeigt wird, dann enthält die eingestellte Schriftart nicht die Zeichen, die in Ihrem Dokument verwendet wurden.</para>
-
-			<para
->Wählen Sie im Optionendialog <guilabel
->Schriften auswählen</guilabel
-> in dem <guilabel
->Unicode Bereich der Anwendung</guilabel
->. Sie müssen eine Schrift auswählen, die den ISO-10646-1 Zeichensatz enthält. Versuchen Sie clearlyu als einen ersten Schritt. (es ist in den meisten Distibutionen enthalten). Wenn Ihr Modul immer noch nicht korrekt dargestellt wird, dann versuchen Sie es mit einer geeigneteren Schriftart.</para>
-
-			<tip
-><para
->Wenn Sie eine kleine Unicode-Schriftart wie clearlyu (about 22kb) benutzen, wird &bibletime; schneller laufen, als wenn Sie eine umfangreiche Schriftart wie Bitstream Cyberbit (ungefähr 12Mb) verwenden.</para
-></tip>
-
-			<section id="hdbk-config-bt-addfont"
-><title
->Schrift Installation</title>
-			<para
->Die Installation von Schriftarten besteht aus drei Schritten</para>
-
-			<orderedlist numeration="lowerroman"
-> <listitem
-> <para
-><link linkend="hdbk-config-bt-ob-font"
->Unicode Schriftarten bekommen</link
-></para
-> </listitem
-> <listitem
-> <para
-><link linkend="hdbk-config-bt-ob-font-X"
->Schriftarten für den &X-Server; installieren</link
-></para
-> </listitem
-> <listitem
-> <para
-><link linkend="hdbk-config-bt-ob-font-print"
->Schriftarten für das Drucken installieren (funktioniert noch nicht).</link
-></para
-> </listitem
-> </orderedlist>
-			</section>
-
-
-			<section id="hdbk-config-bt-ob-font"
-><title
->Schriftarten bekommen</title>
-			<para
->Es gibt eine Anzahl von Schriften, die Unicode unterstützen, und einige von ihnen sind kostenlos verfügbar. Wenige der verfügbaren Schriften enthalten alle Symbole, die im Unicode Standard definiert sind.</para>
-			<para
->Hier ist eine Liste von einigen verfügbaren Schriften:</para>
-				<table>
-				<title
->Unicode Schriften</title>
-				<tgroup cols="2">
-				<tbody
-> <row
-><entry
->Clearlyu</entry
-> <entry
->Ist in einigen Distributionen enthalten. Enthält Europäisch, Griechisch, Hebräisch, Thai. Enthält keine chinesischen Schriftzeichen oder Arabisch</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
->Verschiedene Schriften sind auf der Crosswire FTP Seite verfügbar.</entry
-></row
-> <row
-><entry
-><ulink url="ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/"
->Bitstream CyberBit</ulink
-></entry
-> <entry
->Deckt fast den ganzen Unicode-Bereich ab.</entry
-></row
-> <row
-><entry
-><ulink url="http://bibliofile.mc.duke.edu/gww/fonts/Unicode.html"
->Caslon, Monospace, Cupola, Caliban</ulink
-></entry
-> <entry
->Teilweise Abdeckung, siehe die Information auf der angegebenen Seite.</entry
-></row
-> </tbody>
-				</tgroup>
-				</table>
-			<para
->Für eine Liste von anderen Unicode Schriften und den abgedeckten Bereichen: <ulink url="http://www.hclrss.demon.co.uk/unicode/fontsbyrange.html"
->Unicode Schriftenliste</ulink
-> </para>
-			</section>
-
-			<section id="hdbk-config-bt-ob-font-X"
-><title
->Schriften für XFree86 installieren (Ihren &X-Server;)</title>
-			<para
-> Wenn Ihre Distribution einen Schriftarten Installer enthält (&Linux-Mandrake; bietet Drake Font), verwenden Sie den Installer. Wenn das nicht funktioniert, oder Sie keinen haben, müssen Sie die Schrift manuell installieren. Anweisungen dafür finden Sie <ulink url="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Unicode-HOWTO.html#toc4"
->Das Unicode HOWTO</ulink
->. Das wurde getestet und funktioniert unter &Linux-Mandrake; 7.1.</para>
-
-			</section>
-
-			<section id="hdbk-config-bt-ob-font-print"
-><title
->Installieren der Schrift für das Drucken</title>
-			<para
->Ein bekanntes Problem in Qt verhindert das Drucken von Zeichen außerhalb des Bereiches des Latin-1 Zeichensatzes. Das wird mit der Freigabe von Qt3 und KDE 3 gelöst sein. Wenn Sie es trotzdem versuchen möchten, das <ulink url="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Font-HOWTO.html"
->Font HowTo</ulink
-> beschreibt den Prozess der Installation von Schriften für das Drucksystem.</para>
-			</section>
-
-		</section>
-	</section>
-
-	<section id="hdbk-config-bt-Colors"
-><title
->Farben</title>
-	<para
->Die Farben der Objekte in den Anzeigefenstern können angepasst werden. Folgende Objekte können verändert werden:</para>
-	<simplelist
-> <member
->Text</member
-> <member
->Hervorgehobener Vers</member
-> <member
->Fußnoten</member
-> <member
->Morphologische Tags</member
-> <member
->Hintergrund</member
-> <member
->Hyperlinks</member
-> <member
->Strongnummern</member
-> <member
->Worte Jesu</member
-> </simplelist>
-
-	<para
->Einige Optionen, wie die "Worte Jesu" treffen nur für bestimmte Texte zu, die diese speziellen Features unterstützen.</para>
-	<mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-conf-optdialog-color.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Optionendialog - Farbe </phrase
-> </textobject
-> <caption
-> <para
->Der Optionendialog - Farbe</para
-> </caption
-> </mediaobject>
-
-	</section>
-
-	<section id="hdbk-config-bt-profiles"
-><title
->Profile</title>
-	<para
->Profile definieren die Erscheinung des Arbeitsbereiches, z.B. welche Fenster geöffnet sind, und welche Texte in diesen Fenstern angezeigt werden sollen. Wenn ein Profil einmal erstellt ist, erwenden Sie den Eintrag <guimenu
->Fenster</guimenu
-> -> <guimenuitem
->Profil sichern</guimenuitem
->, um die aktuelle Sitzung in ein Profil zu sichern. Verwenden Sie <guimenu
->Fenster</guimenu
-> -> <guimenuitem
->Profil laden</guimenuitem
->, um ein bereits gespeichertes Profil in &bibletime; zu laden.</para>
-	</section>
-
-	<section id="hdbk-config-bt-sword"
-><title
->Sword</title>
-	<para
->Viele Funktionen, die von Sword bereitgestellt werden, können in &bibletime; angepasst werden.</para>
-	<mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-conf-optdialog-sword.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Optionendialog - Sword</phrase
-> </textobject
-> <caption
-> <para
->Der Optionendialog - Sword.</para
-> </caption
-> </mediaobject>
-
-		<section id="hdbk-config-bt-sword-gen"
-><title
->Sword Allgemein</title>
-		<para
->Schlüsselcache für Lexikons</para>
-		<para
->Bibletime kann einen Keycache für Lexikons anlegen. Dies beschleunigt das Öffnen großer Lexika. Es verbraucht allerdings etwas Festplattenkapazität, also sollten Sie dieses Feature abschalten, wenn Sie nur über sehr wenig freien Speicher haben.</para>
-
-		<para
->Scrollverhalten</para>
-		<para
->Per Voreinstellung bewegt der Pfeil nach unten das Anzeigefenster zum nächsten Vers. Mit dieser Option kann man das Verhalten so ändern, dass es zum vorigen Vers springt.</para>
-
-		<para
->Wählen Sie eine Sprache für die Bücher der Bibel</para>
-		<para
->Dieses Feature ermöglicht die Auswahl der Sprache, die für die Buchnamen der Bibel verwendet wird.Z.B. kann die King James Version mit deutschen Buchnamen dargestellt werden.Wenn Ihre Sprache nicht unterstützt wird, und Sie gerne eine Übersetzung anfertigen wollen, dann besuchen Sie bitte die Crosswire Entwicklerseiten.</para>
-		</section>
-
-
-		<section id="hdbk-config-bt-sword-mod"
-><title
->Sword Standardmodule</title>
-		<para
->Hier werden Standardmodule festgelegt.</para>
-		</section>
-		<section id="hdbk-config-bt-sword-filter"
-><title
->Sword Filtereinstellungen</title>
-		<para
->Filter kontrollieren die Erscheinung des Textes in den Anzeigefenstern. Hier können Sie die Voreinstellungen für verschiedene Filter festlegen.</para>
-		<para
->Folgendes kann durch Filter kontrolliert werden:</para>
-
-			<itemizedlist
-> <listitem
-><para
->Zeilenumbruch nach jedem Vers anzeigen</para
-></listitem
-> <listitem
-><para
->Versnummern anzeigen</para
-></listitem
-> <listitem
-><para
->Fußnoten anzeigen</para
-></listitem
-> <listitem
-><para
->Strongnummern anzeigen</para
-></listitem
-> <listitem
-><para
->Überschriften anzeigen</para
-></listitem
-> <listitem
-><para
->Morphologische Tags anzeigen</para
-></listitem
-> <listitem
-><para
->Wurzeln anzeigen</para
-></listitem
-> <listitem
-><para
->Hebräische Vokalzeichen anzeigen</para
-></listitem
-> <listitem
-><para
->Hebräische Kantillationszeichen anzeigen</para
-></listitem
-> <listitem
-><para
->Griechische Akzente anzeigen</para
-></listitem
-> </itemizedlist>
-
-		</section>
-
-	</section>
-
-	<section id="hdbk-config-bt-Accelerators"
-><title
->Tastenkürzel</title>
-	<para
->Es handelt sich um spezielle Tastenbefehle, die anstatt der Menüeinträge und Icons verwendet werden können. Eine Anzahl der Kommandos in &bibletime; haben vordefinierte Tastenkürzel. Allen Kommandos in &bibletime; können hier Tastenküzel zugewiesen werden.</para>
-
-		<table>
-		<title
->Standard-Tastenkürzel</title>
-		<tgroup cols="2">
-		<thead
-> <row
-> <entry
->Aktion</entry
-> <entry
->Tastenkombination</entry
-> </row
-> </thead>
-
-		<tbody
-> <row
-> <entry
->Automatisch Kacheln</entry
-><entry
->Ctrl+Alt+T</entry
-></row
-> <row
-><entry
->Automatisch staffeln </entry
-><entry
->Ctrl+Alt+A </entry
-></row
-> <row
-><entry
->Staffeln </entry
-><entry
->Ctrl+A </entry
-></row
-> <row
-><entry
->Alle schließen </entry
-><entry
->Shift+Ctrl+A</entry
-></row
-> <row
-><entry
->Werkzeugleisten konfigurieren</entry
-><entry
-></entry
-></row
-> <row
-><entry
->Voreinstellungen </entry
-><entry
-></entry
-></row
-> <row
-><entry
->Verlassen </entry
-><entry
->Ctrl+Q</entry
-></row
-> <row
-><entry
->Ausgewählte Einträge entfernen</entry
-><entry
->Ctrl+Alt+D</entry
-></row
-> <row
-><entry
->Hauptgruppe zurücksetzen </entry
-><entry
->Ctrl+Alt+R</entry
-></row
-> <row
-><entry
->In den ausgewählten Modulen suchen </entry
-><entry
->Ctrl+Alt+S</entry
-></row
-> <row
-><entry
->Kacheln </entry
-><entry
->Ctrl+T </entry
-></row
-> </tbody>
-		</tgroup>
-		</table>
-	</section>
-</section>
-</chapter>
-
diff --git a/bibletime-doc/docs/de/handbook/unicode/hdbk-intro.docbook b/bibletime-doc/docs/de/handbook/unicode/hdbk-intro.docbook
deleted file mode 100644
index b8a8847..0000000
--- a/bibletime-doc/docs/de/handbook/unicode/hdbk-intro.docbook
+++ /dev/null
@@ -1,103 +0,0 @@
-<chapter id="hdbk-intro"
-><title
->Einführung</title>
-<para
-> &bibletime; ist ein mächtiges Bibelstudien-Werkzeug, geschrieben für die &kde;Umgebung auf dem Linux Betriebssystem. Es basiert auf der <ulink url="http://www.crosswire.org"
->Sword</ulink
-> Bibliothek, welche die Back-End Funktionalität für &bibletime; zur Verfügung stellt, zum Beispiel Bibeltexte anschauen, Suchen, Lesezeichen anlegen usw. Sword ist das Hauptprodukt der <ulink url="http://www.crosswire.org"
->Crosswire Bibelgesellschaft</ulink
->. </para>
-
-<para
->&bibletime; wurde konzipiert, um mit Dokumenten benutzt zu werden, die in Theological Markup Language (ThML) und im General Bible Format (GBF) vorliegen. Diese Formatierungssprachen zielen auf die Erfordernisse religiöser Texte. Vollständige Informationen über die unterstützten Dokumentenformate können im <ulink url="http://www.crosswire.org/sword/develop/index.jsp"
-> Entwicklungsbereich der Crosswire Bible Society</ulink
-> gefunden werden.</para>
-
-<para
-> Über 200 Dokumente in 50 Sprachen sind auf dem Webserver der <ulink url="http://www.crosswire.org"
->Crosswire Bible Society</ulink
-> verfügbar. Dazu gehören: </para>
-
-<para
-> <variablelist
-> <varlistentry
-> <term
->Bibeln</term
-> <listitem
-> <para
-> Der gesamte Text, optional mit Strong-Nummern und Fußnoten im Text </para
-> </listitem
-></varlistentry
-> <varlistentry
-> <term
->Kommentare</term
-> <listitem
-> <para
-> Mit einem <emphasis
->Persönlichen</emphasis
-> Kommentar können Sie ihre eigenen persönlichen Notizen zu verschiedenen Bereichen der Bibel anlegen. </para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Lexika</term
-> <listitem
-> <para
-> Für Wortdefinitionen und Bibelthemen. Sie können einen Schlüssel aus einer Liste auswählen, der dann angezeigt wird. </para
-> </listitem
-> </varlistentry
-> </variablelist
-> </para>
-<para
->Weitere Dokumente werden zur &sword; Bibliothek hinzugefügt werden, daher schauen Sie dort öfters nach.</para>
-
-<sect1 id="hdbk-intro-changes"
-><title
->Änderungen</title>
-<para
-> Bitte lesen sie die Datei <filename
->Changelog</filename
-> des Quellcode Paketes, falls Sie an detailierteren Änderungen interessiert sind. </para>
-
-<para
->Eine Auflistung der im aktuellen Paket enthaltenen Funktionen kann im Quellcode im <ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/bibletime/bibletime/ChangeLog"
->CVS Log für <filename
->bibletime/bibletime/ChangeLog</filename
-></ulink
-> gefunden werden.</para>
-</sect1>
-
-<sect1 id="hdbk-intro-ToDo"
-><title
->ToDo</title>
-<para
-> Jede Menge! </para>
-<para
-> Wir haben viel zu tun. Da wir ein sehr kleines Team von aktiven Entwicklern sind, ist es sehr schwierig vernünftige Ergebnisse in einer kurzen Zeit zu bekommen. Falls Sie daran interessiert sind dem &bibletime; Team zu helfen, kontaktieren Sie uns bitte auf <ulink url="http://sourceforge.net/pm/?group_id=954"
->SourceForge &bibletime; Hompage</ulink
->. Informationen können ebenso auf der <ulink url="http://www.bibletime.de"
->BibleTime Homepage</ulink
-> gefunden werden.</para>
-
-<para
->Das &bibletime; Projekt benötigt Programmierer / Entwickler, Kritiker, Tester und eifrige Beter. Falls Sie bei einer dieser Aufgaben helfen können oder falls Sie an eine andere denken, wenden Sie sich bitte an uns. Ohne Ihre Hilfe wird &bibletime; sehr sehr langsam weiterentwickelt und es wird sehr lange dauern, bis Sie ein voll funktionsfähiges Bibelstudien Werkzeug bekommen werden. </para>
-</sect1>
-
-<sect1 id="hdbk-intro-motivation"
-><title
->Motivation</title>
-<para
-> Unser Verlangen ist es, Gott zu dienen und unseren Teil dazu beizutragen, dass andere in ihrer Beziehung mit IHM wachsen. Wir haben eine klaffende Lücke gefunden: Es gab keine benutzerfreundliche Bibelstudiensoftware unter Linux. Wir haben &bibletime; entwickelt um diese Lücke zu füllen. Wir haben uns bemüht dies zu einem mächtigen und qualitativen Programm zu machen, das jedoch gleichzeitig einfach und intuitiv zu bedienen ist. Es ist unser Verlangen, dass Gott gepriesen wird, da Er die Quelle aller guten Dinge ist. </para>
-
-<blockquote
-><attribution
->James 1:17, NASB</attribution>
-<para
->Alle gute Gabe und alle vollkommene Gabe kommt von obenherab, von dem Vater des Lichts, bei welchem ist keine Veränderung noch Wechsel des Lichtes und der Finsternis.</para>
-</blockquote>
-
-<para
-> Gott segne Sie, wenn Sie dieses Programm benutzen, und möge Er durch die Arbeit unserer Hände verherrlicht werden. </para>
-</sect1>
-</chapter>
-
diff --git a/bibletime-doc/docs/de/handbook/unicode/hdbk-operation.docbook b/bibletime-doc/docs/de/handbook/unicode/hdbk-operation.docbook
deleted file mode 100644
index 5e36f03..0000000
--- a/bibletime-doc/docs/de/handbook/unicode/hdbk-operation.docbook
+++ /dev/null
@@ -1,959 +0,0 @@
-<chapter id="hdbk-op"
-><title
->Programmbedienung</title>
-<para
-> &bibletime; wird hauptsächlich von dem Modulbaum aus bedient (dieser wird "Hauptgruppe" genannt). Der zweite wichtige Ort zum Arbeiten in &bibletime; ist der MDI Bereich (MDI = Multiple Document Interface). </para>
-
-<section id="hdbk-op-module-tree"
-><title
->Hauptgruppe</title>
-<para
-> Dies ist der Bereich auf der linken Seite des &bibletime; Fensters. Er enthält den Baum der installierten Dokumente (Sword Module) und alle von Ihnen angelegten Lesezeichen. </para>
-<screenshot
-> <screeninfo
->Modulbaum</screeninfo
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-op-module-tree-1.png" format="PNG"/> </imageobject
-> </mediaobject
-> </screenshot>
-</section>
-
-<section id="hdbk-op-module-tree-select"
-><title
->Ein Modul zum Anschauen auswählen</title>
-<para
->Wenn Sie Dokument auswählen wolllen, klicken Sie einfach auf die gewünschte Dokumentengruppe (Bibeln, Kommentare oder Lexika) um den Inhalt der Dokumentengruppe anzuzeigen. Um ein Dokument zu öffnen klicken Sie auf dessen Symbol. </para>
-<screenshot
-> <screeninfo
->Auswahl eines Dokumentes</screeninfo
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-op-module-select-1.png" format="PNG"/> </imageobject
-> </mediaobject
-> </screenshot>
-<tip
-><para
->Hier funktioniert Drag&amp;Drop</para
-></tip>
-<para
-> Ein Dokument kann aus einem bereits geöffneten Dokument heraus geöffnet werden. Klicken Sie einfach auf eine Versnummer (Mauspfeil ändert sich zu einer Hand) und ziehen Sie diese zur Modulliste. Lassen Sie sie hier auf dem Namen des von Ihnen gewünschten Modules fallen; dieses Modul wird nun an der Stelle des herübergezogenen Verses geöffnet. Wenn Sie eine Versnummer auf ein bereits geöffnetes Modul ziehen, wird dieses automatisch zur gewünschten Stelle springen. Dies funktioniert nur für Bibeln und Kommentare. </para>
-<para
-> Zwei weitere Funktionen sind durch &RMB; auf dem Modul verfügbar. "Über dieses ModulA" öffnet ein Fenster mit Informationen über Copyright und andere wichtige Eigenschaften dieses Dokumentes. "Dieses Modul entschlüsseln" öffnet einen kleinen Dialog für verschlüsselte Dokumente. Dies erlaubt es den Besitzern des Schlüssels, diesen einzugeben, um das Modul zu entschlüssenl und damit lesbar zu machen. Die Crosswire Bible Society muss Module verschlüsseln, bis entweder der Copyrightinhaber die Erlaubnis für die Weitergabe des Moduls erteilt, oder der Text in Public Domain übergegangen ist (Copyright verfallen). <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 id="hdbk-op-module-tree-search"
-><title
->Auf den Suchdialog zugreifen</title
-> <para
-> Sie können in einem Modul suchen durch &RMB; auf dem Modulnamen in der Modulliste und Auswahl von "Search in module(s)". Durch Shift-&RMB; auf anderen Modulnamen können Sie mehrere Module auswählen. </para>
-<screenshot
-> <screeninfo
->Auswahl von Lesezeichen</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
->Auf Lesezeichen zugreifen</title
-> <para
-> <tip
-><para
->Hier funktioniert Drag&amp;Drop</para
-></tip
-> Klicken Sie mit der rechten Maustaste auf einen leeren Bereich der Hauptgruppe und wählen Sie <guimenuitem
->"Erzeuge einen neuen Ordner"</guimenuitem
-> um einen neuen Ordner anzulegen. Sie können normale Drag&amp;Drop Funktionen benutzen, um Verse aus den Suchdialogsergebnissen in den Lesezeichen Ordner zu ziehen und um Lesezeichen in Ordnern neu anzuordnen. Es gibt auch eine Import/Export Funktion für Lesezeichen. Wählen Sie "Exportiere Lesezeichen" im <guimenu
->Menü der rechten Maustaste</guimenu
->. Dies wird eine Dialogbox öffnen, in der Sie die Lesezeichen speichern können. Sie können mit anderen Benutzern von BibleTime ausgetauscht werden, archiviert werden usw. Sie können in der gleichen Art und Weise importiert werden. Sie können auch rechts-klicken um Ordnernamen und Beschreibungen von Lesezeichen zu ändern, und um Lesezeichen und Gruppen zu entfernen. </para>
-<screenshot
-> <screeninfo
->Auswahl von Lesezeichen</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) Fenster</title>
-<para
-> Hier werden Dokumente "Anzegefenstern" angezeigt, die speziell auf die verschiedenen Modultypen abgestimmt sind. Die Crosswire Bible Society wird möglicherweise andere Dokumenttypen für Sword schaffen. Wenn sie freigegeben werden, wird &bibletime; sie auch unterstützen. </para>
-
-<section id="hdbk-op-MDI-Window-control-modules">
-<title
->Geöffnete Fenster verwalten</title
-> <para
-> Dokumentenfenster können mit Hilfe von üblichen &kde; Fenster/Titelzeilen Funktionen kontrolliert und verändert werden. Als Erweiterung zu diesen können Sie geöffnete Dokumentenfenster kacheln und stapeln. Benutzen Sie die entsprechenden Knöpfe in der Werkzeugleiste oder die Menüfunktionen im <guimenu
->"Fenster"</guimenu
-> Untermenü der Menüleiste. </para>
-</section>
-
-<section id="hdbk-op-MDI-Window-module-navigation">
-<title
->In geöffneten Dokumenten navigieren</title
-> <para
-> Die Navigation innerhalb eines Dokumentes ist durch das Schlüssel-Kontrollmenü und durch eine Scrollleiste verwirklicht. </para>
-<tip
-><para
->Um zu einer bestimmter Stelle zu springen benutzen Sie die Schlüsselkontrolle.</para
-></tip>
-<tip
-><para
->Um sich in dem Bereich des Dokumentes zu bewegen benutzen Sie die Scrollleiste.</para
-></tip>
-<tip
-><para
->Für Bibeltexte ist die Indexreihenfolge <emphasis
->Buch - Kapitel - Vers</emphasis
-></para
-></tip>
-<tip
-><para
->Für Kommentare ist die Indexreihenfolge <emphasis
->Buch - Kapitel - Vers</emphasis
-></para
-></tip>
-<tip
-><para
->Für Lexika ist der Index <emphasis
->Schlüsselwort</emphasis
-></para
-></tip>
-<tip
-><para
->Drag&amp;Drop funktioniert hier; Wenn Sie einen Vers eines geöffneten Fensters oder ein Lesezeichen ziehen und auf einem anderen Dokumentenfenster fallen lassen, wird dieses von der aktuell angezeigten Stelle zur Stelle des Verses oder des Lesezeichens springen.</para
-></tip>
-</section>
-
-<section id="hdbk-op-MDI-Window-Personal-commentary"
-><title
->Bearbeiten Sie ihren eigenen Kommentar</title
-> <para
-> Die Werkzeugleiste des Kommentarfensters hat einen weiteren Button, mit dem Bild eines Stiftes.<inlinemediaobject
-> <imageobject
-> <imagedata fileref="hdbk-op-pencil.png"/> </imageobject
-> <textobject
-> <phrase
->Geben Sie ihre Notizen ein</phrase
-> </textobject
-> </inlinemediaobject
-> Für das "Personal-commentary" Modul, &LMB; den <guibutton
->Button mit dem Bild eines Stiftes</guibutton
-> um Ihre Notizen einzugeben, oder um eingegebene zu bearbeiten. Wenn Sie fertig sind, &LMB; den <guibutton
->"Speichern" (Ddisketten) Button</guibutton
->, um Ihre Notizen zu sichern. Um die Notizen für einen Vers zu löschen, &LMB; den <guibutton
->Vers löschen Button</guibutton
-> <inlinemediaobject
-> <imageobject
-> <imagedata fileref="hdbk-op-delete-verse.png"/> </imageobject
-> <textobject
-> <phrase
->Vers Löschen 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
->Das Personal Commentary ist ein Sword Modul. Wenn Sie es nicht im Hauptindex finden, dann laden Sie es von der<ulink url="http://www.crosswire.org"
->Crosswire Bible Society</ulink
-> herunter.</para
-></tip>
-<tip
-><para
->Falls Sie nicht in das Modul Persönlicher Kommentar schreiben können, sind die Zugriffsrechte für den persönlichen Kommentar falsch. Setzen Sie die Zugrigffsrechte zurück, um ihrem Benutzer zu erlauben hinein zu schreiben.</para
-></tip>
-<tip
-><para
->Hier funktioniert Drag&amp;Drop, wie bei anderen Kommentaren und Bibeltexten.</para
-></tip>
-</section>
-</section>
-
-<section id="hdbk-op-search"
-><title
->In Dokumenten suchen</title>
-<para
->Teile der Anweisungen zur Benutzung von GCC Regulären Ausdrücken in Dokumente Durchsuchen ist übernommen aus den Hilfedateien der <trademark class="registered"
->Microsoft Windows</trademark
-> Version von &sword;</para>
-
-<section id="hdbk-op-search-functions"
-><title
->Zugriff auf Suchfunktionen</title>
-<para
-> Sie können in einem Dokument suchen indem Sie mit der rechten Maustaste auf den Dokumentennamen innerhalb der <guimenu
->Hauptgruppe</guimenu
-> klicken und dann <guimenuitem
->Durchsuche gewählte Module</guimenuitem
-> auswählen. Durch drücken von Umschalt- oder Strg währende dem klicken auf andere Modulenamen können Sie mehr als eines auswählen. Gehen Sie in der selben Art und Weise vor, um in allen gewählten Modulen zu suchen. </para>
-</section>
-
-<section id="hdbk-op-search-dialog"
-><title
->Benutzung des Suchdialoges</title>
-
-<section id="hdbk-op-search-choose-modules"
-><title
->Das Modul Auswählen Tab benutzen</title>
-<para
->Auf der linken Seite der Modulauswahl sehen Sie eine Liste aller auf Ihrem System installerten Module, die für &bibletime;.verfügbar sind. Auf der rechten Seite befindet sich eine Liste mit allen Modulen, die in der aktuellen Suche durchsucht werden sollen. Um ein Modul von der linken zur rechten Seite zu bewegen, &LMB; darauf um es auszuwählen, dann &LMB; auf einem der <guibutton
->Pfeil-Buttons</guibutton
->.</para>
-<screenshot
-> <screeninfo
->Dialogbox Suchtext</screeninfo
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-op-crch-dia-choose.png" format="PNG"/> </imageobject
-> </mediaobject
-> </screenshot>
-</section>
-<section id="hdbk-op-search-dialog-text"
-><title
->Das "Text" Tab benutzen</title>
-<para
-> Suche Text - In diesem Teil geben Sie den zu suchenden Text ein und Sie setzen Sucheinstellungen. "Reguläre Ausdrücke" benutzen RegExp Syntax um die Suche zu verfeinern. </para>
-
-<section id="hdbk-op-search-properties"
-><title
->Sucheinstellungen</title>
-<!--Using the Search Text Input Field-->
-<para
->Die Textbox in dem Feld Sucheinstellungen ist der Ort, wo Sie den zu suchenden Text eingeben können. Er kann aus einem oder mehreren Worten bestehen, oder auch aus Wortteilen(trennen Sie Wörter und Wortteile mit Leerzeichen) oder Regulären Ausdrücken bestehen. Sie können die Radio Buttons verwenden, um die Suche im "Mehrere Wörter", "Exakte Suche" oder "Reguläre Ausdrücke" Modus auszuführen. Mit einer Checkbox können Sie die Unterscheidung zwischen Groß- und Kleinbuchstaben an- und ausschalten. </para>
-
-<tip
-><para
->Hier funktioniert Drag&amp;Drop, Sie können Verse und Lesezeichen in die Text-Eingabebox ziehen. Sie können Text in die Zwischenablage kopieren und in die Eingabezeile einfügen.</para
-></tip>
-</section>
-
-<section id="hdbk-op-search-dialog-text-input-case">
-<title
->Benutzung des Knopfes für GROSS/klein Unterscheidung</title>
-<para
->Klicken Sie auf die GROß/klein Box, um die Unterscheidung an oder aus zu schalten. Wenn die Box angeschaltet ist, wird die Suche nur Verse finden, in denen der Text genauso wie in der Texteingabezeile auftaucht. Falls die Box ausgeschaltet ist, wird die Suche Treffer finden, sie sich auch in der Groß- und Kleinschreibung unterscheiden. Um &quot;HERR&quot; jedoch nicht &quot;Herr&quot; oder &quot;herr&quot; zu finden, wählen Sie die Option aus. Um mit &quot;HERR&quot; und &quot;Herr&quot; &quot;herr&quot; zu finden, lassen Sie die Option ausgeschaltet.</para>
-</section>
-
-
-<section id="hdbk-op-search-dialog-text-input-multi">
-<title
->Benutzung des "Mehrere Wörter" Button </title>
-<para
->Wenn "Mehrere Wörter" ausgewählt ist, wird die Suche alle Verse finden, die alle Worte (oder Wortteile) enthalten. Die Position und Reihenfolge der The position Worte spielt keine Rolle. Wenn alle Worte in einem Vers enthalten sind, wird er in der Liste der gefundenen Verse angezeigt. Eine Suche nach &quot;prove cause&quot; wird 1 Mose 21:25 finden, &quot;And Abraham re<emphasis
->prove</emphasis
->d Abimelech be <emphasis
->cause</emphasis
-> of a well of water...&quot; Es reicht also sogar, wenn die gesuchten Worte in den Worten des Verses enthalten sind.</para>
-</section>
-
-
-<section id="hdbk-op-search-dialog-text-input-phrase"
-><title
->Benutzung der Genauen Suche</title
-> <para
->Wenn Genaue Suche ausgewählt wurde, wird die Suche alle Zeilen (oder Verse) finden, die genau den in der Eingabezeile eingegebenen Text unter Einbezug aller Leerzeichen enthalten. Der gesuchte Satz muss nicht an einer Wortgrenze starten. Eine Suche nach &quot;amt begehrt&quot; wird 1. Thimotheus 3:1 finden: &quot;Das ist gewißlich wahr: So jemand ein Bischofs<emphasis
->amt begehrt</emphasis
->, der begehrt ein köstlich Werk.&quot; </para>
-</section>
-
-<section id="hdbk-op-search-dialog-text-input-search"
-><title
->Benutzung des Knopfes Text Suchen</title>
-<para
->Klicken Sie den Knopf <guibutton
->Suchen</guibutton
-> um die Suche zu starten.</para>
-
-<screenshot
-> <screeninfo
->Dialogbox Suchtext</screeninfo
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-op-search-dialog-searchtext.png" format="PNG"/> </imageobject
-> </mediaobject
-> </screenshot>
-</section>
-
-<section id="hd-op-sch-dia-txt-scope-options"
-><title
->Suchbereich-Einstellung</title>
-<para
->Definieren Sie den Bereich Ihrer Suche im Panel Suchbereich</para>
-
-<itemizedlist
-> <listitem
-><para
-><guibutton
->Kein Suchbereich</guibutton
-> schaltet den Suchbereich Tab aus. Das ganze Dokument wird durchsucht.</para
-></listitem
-> <listitem
-><para
-><guibutton
->Letztes Suchergebnis</guibutton
-> Die neue Suche wird nur innerhalb der Verse suchen, die in der letzten Suche gefunden wurden. </para
-></listitem
-> <listitem
-><para
-><guibutton
->Suchbereich benutzen</guibutton
-> Die neue Suche wird innerhalb des angegebenen Suchbereiches ausgeführt.</para
-></listitem
-> </itemizedlist>
-
-<para
->Wenn <guibutton
->Kein Suchbereich</guibutton
-> ausgewählt ist, und die KJV Bible nach "Jesus" durchsucht wird, werden 939 Verse gefunden. Wenn dann <guibutton
->Letztes Ergebnis</guibutton
-> ausgewählt ist, und eine weitere Suche nach "Christ", durchgeführt wird, werden 257 Verse der 939 Treffer der letzten Suche übrigbleiben. Wenn dann noch (<guibutton
->Letztes Suchergebnis</guibutton
-> bleibt ausgewählt) nach "Lord" gesucht wird, bleiben von den 257 Versen noch 106 übrig. Alle diese 106 Verse enthalten "Jesus", "Christ" und "Lord". Alle diese Verse enthalten "Jesus", "Christ" und "Lord".</para>
-</section>
-<section id="hd-op-sch-dia-txt-scope-maintain"
-><title
->Bereiche bearbeiten</title
-><para
->Bereiche bearbeiten - Sie können obere und untere Grenzen für die Suche eingeben mit &LMB; <guibutton
->Bereiche beabeiten</guibutton
-> Button.</para>
-
-<mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-op-change-range.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Bereich verändern Box</phrase
-> </textobject
-> </mediaobject>
-
-<para
->Die voreingestellten Einträge zeigen Beispiele der verlangten Syntax. </para>
-<para
-> Wenn der HInzufügen Button geclickt wurde, wird eine Textbox angezeigt, in der der Name für den Bereich eingegeben wird. Geben sie jetzt den gewünschten Bereich ein und clicken Sie <guibutton
->Schließen</guibutton
->. Ihr Bereich wird nun zur Bereichsliste hinzugefügt.</para>
-
-<para
->Eine Anzahl von angepassten Bereichen wurde zur Verfügung gestellt.</para>
-
-<para
->Wenn <guibutton
->Kein Suchbereich</guibutton
-> ausgewählt ist, und die KJV Bible nach "Jesus" durchsucht wird, werden 939 Verse gefunden. Wenn dann <guibutton
->Letztes Ergebnis</guibutton
-> ausgewählt ist, und eine weitere Suche nach "Christ", durchgeführt wird, werden 257 Verse der 939 Treffer der letzten Suche übrigbleiben. Wenn dann noch (<guibutton
->Letztes Suchergebnis</guibutton
-> bleibt ausgewählt) nach "Lord" gesucht wird, bleiben von den 257 Versen noch 106 übrig. Alle diese 106 Verse enthalten "Jesus", "Christ" und "Lord". Alle diese Verse enthalten "Jesus", "Christ" und "Lord".</para>
-
-<tip
-><para
->Drag &amp; Drop funktioniert hier; Sie können Versreferenzen und Lesezeichen in die Bereichsbox fallen lassen, ebenso können Sie normalen Text einfügen.</para
-></tip>
-</section>
-</section>
-
-<section id="hdbk-op-search-dialog-text-result"
-><title
->Benutzung des Tabs Suchergebnis</title>
-<para
-> Suchergebnis - Dies zeigt Ihnen - nach Modulen geordnet - wie viele Treffer des gesuchten Textes gefunden wurden. Klicken auf das Dokument wird die Liste der Referenzen öffnen. Das Klicken auf eine Referenz öffnet diese im Fenster darunter. Ziehen Sie die Referenz und lassen Sie diese auf einem Dokument in der Hauptgruppe fallen, um dieses Modul an der gewünschten Stelle zu öffnen. </para>
-<tip
-><para
->Hier funktioniert Drag&amp;Drop</para
-></tip>
-<tip
-><para
->Wählen Sie eine Versnummer und ziehen Sie diese in die Hauptgruppe um Lesezeichen anzulegen,</para
-></tip>
-<tip
-><para
->Wählen Sie einen Vers aus und ziehen Sie ihn auf ein ungeöffnetes Modul, um dieses zu öffnen und damit dieses die gewünschte Stelle anzeigt (Nur für Bibeln und Kommentare).</para
-></tip>
-<tip
-><para
->Wählen Sie einen Vers aus und ziehen Sie diesen auf ein geöffnetes Dokument, um das Anzeigefenster an diese Stelle springen zu lassen (Nur in Bibeln und Kommentaren).</para
-></tip>
-
-<screenshot
-> <screeninfo
->Dialogbox Suchergebnis</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
->Benutzung des Suchanalyse Teils</title>
-<para
-> Suchanalyse - Dies zeigt eine grafische Analyse der Anzahl der Treffer in jedem Buch. Sie kann das Ergebnis aller Dokumente anzeigen. Sie können den Graphen auch als Bild auf Festplatte abspeichern. </para>
-<screenshot
-> <screeninfo
->Dialogbox Suchanalyse</screeninfo
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-op-search-dialog-searchanal.png" format="PNG"/> </imageobject
-> </mediaobject
-> </screenshot>
-
-</section>
-</section>
-<section id="hdbk-op-search-dialog-text-regexp">
-<title
->Syntax der Suche bei Benutzung von GCC regulären Ausdrücken</title>
-
-<para
->Eine Suche mit regulären Ausdrücken stellt eine Möglichkeit dar, einfache oder komplexe Suchen nach Zeichenketten durchzuführen, die einem Muster oder einer Menge von Mustern (Bereiche) entsprechen. Die einzelnen Muster einer Menge werden durch den horizontalen Strich &quot;|&quot; getrennt. Während es möglich ist, ein Muster zu bauen, dass nach einem Wort oder einem Satz sucht, sucht ein einfaches aus einem einzelnen Wort bestehendes Muster nicht nur nach diesem einen Wort, sondern auch nach jeder Zeichenkette die das gesuchte Wort enthält. Eine Suche nach &quot;gerecht&quot; wird Verse liefern, die das Wort &quot;gerecht&quot; enthalten. Es werden jedoch auch Verse zurückgeliefert, die &quot;<emphasis
->Gerecht</emphasis
->igkeit&quot;, &quot;Un<emphasis
->gerecht</emphasis
->igkeit&quot; oder &quot;<emphasis
->gerecht</emphasis
->er&quot; enthalten. Eine Suche nach &quot;hall not&quot; ist nicht eine Suche nach &quot;hall&quot; UND &quot;not&quot;, sondern nach der Zeichenkette &quot;hall not&quot; mit einem Leerzeichen zwischen dem zweiten &quot;l&quot; und dem &quot;n&quot;. Die Suche nach &quot;hall not&quot; wird Textstellen mit &quot;s<emphasis
->hall not</emphasis
->&quot; finden.</para>
-
-<para
->Die Mächtigkeit der regulären Ausdrücke liegt in den Mustern (oder Vorlagen) die benutzt werden, um die Suche zu definieren. Ein Muster besteht aus normalen Zeichen und einigen besonderen Zeichen, die von einer bestimmten Menge von Regeln interpretiert und benutzt werden. Die besonderen Zeichen enthalten .\[^*$?+. Normale (oder einfache) Zeichen, sind alle die, die keine besonderen Zeichen sind. Der Backslash, &quot;\&quot;, wird benutzt um die besonderen Zeichen in normale und normale in besondere Zeichen umzuwandeln. </para>
-
-<para
->Beispiel: das Muster &quot;<emphasis
->i. love\.</emphasis
->&quot; wird Sätze finden, die mit &quot;h<emphasis
->i</emphasis
->s <emphasis
->love</emphasis
->&quot; oder &quot;<emphasis
->i</emphasis
->n <emphasis
->love</emphasis
->&quot; oder &quot;<emphasis
->i</emphasis
->s <emphasis
->love</emphasis
->&quot; enden, gefolgt von einem Punkt. Der erste Punkt in &quot;i. love\.&quot; ist ein spezielles Zeichen, das ein Platzhalter für ein beliebiges Zeichen an dieser Stelle ist.Der Backslash in &quot;i. love\.&quot; markiert den folgenden Punkt als normales Zeichen (der sonst ein Sonderzeichen ist). </para>
-
-<section id="hdbk-op-search-dialog-text-regexp-rules"
-><title
->Regeln für Suchabfragen mit GCC regulären Ausdrücken</title>
-<itemizedlist
-> <listitem
-><para
->. Der Punkt passt auf jedes Zeichen. Siehe auch <link linkend="period"
-> Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->* Der Stern findet 0 oder mehr Zeichen des vorhergehenden Sets, des vorhergehenden Zeichens oder des vorhergehenden besonderern Zeichens. Siehe auch <link linkend="asterisk"
->Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->+ Das Pluszeichen findet 1 oder mehr Zeichen des vorhergehenden Sets, des vorhergehenden Zeichens oder des vorhergehenden besonderern Zeichens. Siehe auch <link linkend="plus"
->Einzelheiten</link
->.</para
-></listitem
-> <listitem
-><para
->? Das Fragezeichen passt auf 0 oder 1 Zeichen des vorhergehenden Sets, Zeichens oder besonderern Zeichens. Siehe auch <link linkend="question"
->Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->[ ] Eckige Klammern finden ein Zeichens innerhalb der eckigen Klammern [ ]. Siehe auch <link linkend="bracket"
->Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->^ Ein Hochzeichen als erstes Zeichen innerhalb von [ ] heißt NICHT. Siehe auch <link linkend="caret"
->Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->^ Ein Hochzeichen als Beginn eines Musters verankert an den Beginn der Zeile. Siehe auch <link linkend="caret"
->Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->$ Ein Dollarzeichen am Beginn eines Musters verankert an das Ende einer Zeile. Siehe auch <link linkend="dollar"
->Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->| Ein vertikaler Strich hat die Bedeutung des logischen ODER. Siehe auch <link linkend="bar"
->Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->( ) Runde Klammern gruppieren Ausdrücke. <emphasis
->Wird nicht unterstützt!</emphasis
-></para
-></listitem
-> <listitem
-><para
->\ Ein Backslash kann vor jedem besonderem Zeichen benutzt werden, um dieses Zeichen zu finden. Siehe auch <link linkend="backslash"
->Einzelheiten</link
-></para
-></listitem
-> <listitem
-><para
->\ Ein Backslash kann vor jedem normalen Zeichen benutzt werden um es zu einem besonderen Zeichen zu machen. Siehe auch <link linkend="backslash"
->Einzelheiten</link
-></para
-></listitem
-> </itemizedlist>
-
-<section id="period"
-><title
->Der Punkt .</title>
-
-<para
->Der Punkt &quot;.&quot; steht für jedes einzelne Zeichen, sogar für ein Leerzeichen oder für ein Zeichen, dass nicht im Alphabet vorkommt. <emphasis
->s.t</emphasis
-> findet <emphasis
->s</emphasis
->i<emphasis
->t</emphasis
->, <emphasis
->s</emphasis
->e<emphasis
->t</emphasis
->,<emphasis
-> s</emphasis
->o<emphasis
->t</emphasis
->, usw., welche in folgenden Zeichenketten vorkommen können <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
-> findet <emphasis
->b</emphasis
->oo<emphasis
->t</emphasis
->, <emphasis
->b</emphasis
->oa<emphasis
->t</emphasis
-> und <emphasis
->b</emphasis
->ea<emphasis
->t foot.tool </emphasis
->findet <emphasis
->foot</emphasis
->s<emphasis
->tool </emphasis
->und <emphasis
->foot tool</emphasis
-></para>
-</section>
-
-
-<section id="asterisk"
-><title
->Das Sternchen *</title>
-
-<para
->Das Sternchen findet null oder mehr Zeichen des vorhergehenden Sets, Zeichens oder besonderen Zeichens. Die Benutzung einer Punkt Sternchen Kombination &quot;.*&quot; nach einem häufig gefundenem Muster kann die Suche sehr lange dauern lassen und das Programm eingefroren wirken lassen. <emphasis
->be*n</emphasis
-> findet<emphasis
-> beeen, been, ben</emphasis
->, und <emphasis
->bn</emphasis
-> was z.B. &quot;Reu<emphasis
->ben</emphasis
->&quot; und &quot;She<emphasis
->bn</emphasis
->a&quot; finden könnte.</para>
-</section>
-
-
-<section id="plus"
-><title
->Das Pluszeichen +</title>
-<para
->Das Pluszeichen findet ein oder mehr Zeichen des vorhergehenden Sets, Zeichens oder besonderen Zeichens. Die Benutzung einer Pluszeichen Sternchen Kombination &quot;+*&quot; nach einem häufig gefundenem Muster kann die Suche sehr lange dauern lassen und das Programm eingefroren wirken lassen. &quot;<emphasis
->be+n</emphasis
->&quot; findet &quot;<emphasis
->beeen, been</emphasis
->&quot; und &quot;<emphasis
->ben</emphasis
->&quot;, jedoch nicht &quot;<emphasis
->bn</emphasis
->&quot;.</para>
-</section>
-
-
-<section id="question"
-><title
->Das Fragezeichen ?</title>
-<para
->Das Fragezeichen findet 0 oder mehr Zeichen des vorhergehenden Sets, Zeichens oder besonderen Zeichens. <emphasis
->be?n</emphasis
-> findet <emphasis
->ben</emphasis
-> und <emphasis
->bn</emphasis
-> jedoch nicht <emphasis
->been</emphasis
->. <emphasis
->trees?</emphasis
-> findet <emphasis
->trees</emphasis
-> oder <emphasis
->tree</emphasis
->.</para>
-</section>
-
-
-<section id="bracket"
-><title
->Die eckigen Klammern [ ]</title>
-<para
->Die eckigen Klammern schließen eine Menge von Zeichen ein, die Treffer erzielen können. Die Zeichen Punkt, Sternchen, Pluszeichen und Fragezeichen werden innerhalb der Klammern nicht als besondere Zeichen behandelt. Ein Minuszeichen kann benutzt werden, um einen Bereich anzugeben. Falls Sie möchten, dass ein Hochzeichen &quot;^&quot; Teil des Bereiches wird plazieren Sie es nicht direkt hinter die linke Klammer, oder es wird als besonderes Zeichen behandelt. Um den vertikalen Strich &quot;|&quot; in die Menge aufzunehmen, machen Sie ihn zum ersten Zeichen nach der linken eckigen Klammer (oder zweites nach dem besonderen Zeichen &quot;^&quot;). Um ein Minuszeichen in die Menge aufzunehmen machen Sie es zum ersten Zeichen nach der linken Klammer (oder zweites nach dem besonderen Zeichen &quot;^&quot;) oder auch zum letzten Zeichen der Menge. <emphasis
->s[eia]t</emphasis
-> findet <emphasis
->set</emphasis
->, <emphasis
->sit</emphasis
->, und <emphasis
->sat</emphasis
->, jedoch nicht <emphasis
->s</emphasis
->o<emphasis
->t</emphasis
->. <emphasis
->s[eia]+t </emphasis
->findet so wie oben und<emphasis
->seat, seet, siet</emphasis
->, usw. <emphasis
->[a-d]</emphasis
-> findet <emphasis
->a, b, c,</emphasis
-> oder <emphasis
->d</emphasis
->. <emphasis
->[A-Z]</emphasis
-> findet jeden Großbuchstaben. [.;:?!] findet ., ;, :, ?, oder ! jedoch kein Komma. [ ]^-] findet ] oder ^ oder -</para>
-</section>
-
-
-<section id="caret"
-><title
->Das Hochzeichen zu Beginn in den eckigen Klammern [^xxx</title>
-<para
->Wenn das Hochzeichen das erste Zeichen nach der linken Klammer ist, hat es die Bedeutung von NICHT. <emphasis
->s[^io]t</emphasis
-> findet <emphasis
->set, sat</emphasis
->, usw., jedoch nicht <emphasis
->s</emphasis
->i<emphasis
->t</emphasis
-> und <emphasis
->s</emphasis
->o<emphasis
->t</emphasis
->.</para>
-</section>
-
-<section id="caret-s"
-><title
->Das Hochzeichen als Zeilenbeginn Anker ^xxx</title>
-<para
->Wenn das Hochzeichen das erste Zeichen in einem Muster ist, verankert es diese an den Beginn der Zeile. Jeder Treffer muss am Beginn der Zeile liegen. Wegen ungefilterten Formatierungszeichen in einigen Texten funktioniert diese Funktion nicht immer. Sie könnte es jedoch, wenn einige Punkte nach dem Hochzeichen gesetzt werden, um die Formatierungszeichen zu umgehen. <emphasis
->^Am Anfang</emphasis
-> findet Zeilen, die mit &quot;<emphasis
->Amfang</emphasis
->&quot;. beginnen (Vielleicht müssen Sie &quot;<emphasis
->^.....Am Anfang</emphasis
->&quot; benutzen).</para>
-</section>
-
-
-<section id="dollar"
-><title
->Das Dollarzeichen als Zeilenende Anker xxx$</title>
-<para
->Wenn das Dollarzeichen das letzte des Musters ist, verankert es das Muster an das Ende der Zeile. Jeder Treffer muss am Ende der Zeile stattfinden. Wegen ungefilterten Formatierungszeichen in einigen Texten funktioniert diese Funktion nicht immer. Sie könnte es jedoch, wenn einige Punkte vor das Dollarzeichen gesetzt werden, um die Formatierungszeichen zu umgehen. <emphasis
->Amen\.$</emphasis
-> findet Zeilen, die mit &quot;<emphasis
->Amen.</emphasis
->&quot; enden (Vielleicht müssen Sie &quot;Amen\....&quot;, &quot;Amen\..........$&quot;, oder sogar &quot;Amen\....................$&quot; benutzen)</para>
-</section>
-
-
-<section id="bar"
-><title
->Der senkrechte Strich |</title>
-<para
->Der vertikale Strich zwischen Mustern bedeutet ODER. <emphasis
->John|Peter</emphasis
-> findet <emphasis
->John</emphasis
->. <emphasis
->Peter. John .*Peter|Peter .*John</emphasis
-> matches <emphasis
->John</emphasis
-> ... <emphasis
->Peter</emphasis
-> oder <emphasis
->Peter</emphasis
-> ... <emphasis
->John</emphasis
->. (.* slows a search) <emphasis
->pain|suffering|sorrow</emphasis
-> findet<emphasis
->pain</emphasis
->, oder <emphasis
->suffering</emphasis
->, oder <emphasis
->sorrow</emphasis
->.</para>
-</section>
-
-
-<section id="parenth"
-><title
->Die runden Klammern ( ) </title>
-<para
-><emphasis
->Die Benutzung der runden Klammern () wird nicht unterstützt.</emphasis
-></para>
-</section>
-
-
-<section id="backslash"
-><title
->Der Backslash vor einem besonderen Zeichen \*</title>
-<para
->Der Backslash vor einem besonderen Zeichen bedeutet, dass das Zeichen nicht in seiner besonderen Bedeutung behandelt werden soll, sondern dass es das Zeichen selbst sein soll. &quot;<emphasis
->amen\.</emphasis
->&quot; findet &quot;<emphasis
->amen.</emphasis
->&quot;, jedoch nicht &quot;<emphasis
->amen</emphasis
->t&quot; und es wird nicht &quot;firm<emphasis
->amen</emphasis
->t&quot;.</para>
-</section>
-
-<section id="backslash-o"
-><title
->Der Backslash vor einem normalen Zeichen \s</title>
-
-<para
->Der Backslash vor einem normalen Zeichen bedeutet, dass dieses statt der normalen Bedeutung eine besondere haben soll.</para>
-
-<itemizedlist
-> <listitem
-><para
-> \b ausßerhalb von [ ] benutzt, bedeutet es Wortgrenze. Innerhalb von [ ] hat die es die Bedeutung des Backspace. <emphasis
->\brighteous\b</emphasis
-> findet <emphasis
->righteous</emphasis
->, aber nicht un<emphasis
->righteous</emphasis
-> oder <emphasis
->righteous</emphasis
->ness</para
-></listitem
-> <listitem
-><para
->\B steht für keine Wortgrenze. <emphasis
->\Brighteous\B</emphasis
-> findet un<emphasis
->righteous</emphasis
->ness und un<emphasis
->righteous</emphasis
->ly, jedoch nicht <emphasis
->righteous</emphasis
->, un<emphasis
->righteous</emphasis
-> oder <emphasis
-> righteous</emphasis
->ness.</para
-></listitem
-> <listitem
-><para
->\d steht für Zahlen; das Gleiche wie [0-9].</para
-></listitem
-> <listitem
-><para
->\D steht für nicht-Zahlen; das Gleiche wie [^0-9].</para
-></listitem
-> <listitem
-><para
->\s bedeutet Leerzeichen. </para
-></listitem
-> <listitem
-><para
->\S steht für nicht-Leerzeichen. </para
-></listitem
-> <listitem
-><para
->\w bedeutet alphanumerisch; das Gleiche wie [a-zA-Z0-9_].</para
-></listitem
-> <listitem
-><para
->\W bedeutet nicht-alphanumerisch; das Gleiche wie [^a-zA-Z0-9_].</para
-></listitem
-> </itemizedlist>
-
-</section>
-</section>
-</section>
-</section>
-
-<section id="hdbk-op-output"
-><title
->Exortieren und Drucken</title>
-<para
->Bibel-Fenster, Lexikon-Fenster, Kommentar-Fenster</para>
-<para
->Durch &RMB; auf dem Eintrag, der Versnummer oder dem Text des Anzeigefensters wird eine Auswahlbox erscheininen (je nach Modultyp), die Zugriff auf Auswahl-, Nachschlage-, Export- und Druckfunktionen bietet.</para>
-<section id="hdbk-op-select-all"
-><title
->Alle auswählen</title>
-<para
->Ein &LMB; hier wählt den gesamten text des Kapitels aus, das gerade dargestellt wird. </para>
-</section>
-<section id="hdbk-op-lookup"
-><title
->Text im Lexikon nachschlagen</title>
-<para
->Ein &LMB; hier wird ein Submenü mit einer Liste von allen verfügbaren Lexikons öffnen. Ein &LMB; auf einem Lexicon öffnet das Lexikokn mit dem Eintrag, der gerade im aktuellen Text markiert ist. </para>
-</section>
-
-<section id="hdbk-op-copy"
-><title
->Kopieren</title>
-<para
->Ein &LMB; hier wird ein Submenü anzeigen, dass die Möglichkeit bietet, den aktuellen Text in die Zwischenablage zu kopieren. </para>
-<itemizedlist
-> <listitem
-> <para
-> <guimenuitem
->Vers</guimenuitem
-> - Die Nummer des aktuellen Verses (z.B. 1 Mose 1:25). </para
-> </listitem
-> <listitem
-> <para
-> <guimenuitem
->Text des Verses</guimenuitem
-> - Der Text des aktuellen Verses. </para
-> </listitem
-> <listitem
-> <para
-> <guimenuitem
->Vers mit Text</guimenuitem
-> - Sowohl Versnummer und Text des aktuellen Verses </para
-> </listitem
-> <listitem
-> <para
-> <guimenuitem
->Kapitel</guimenuitem
-> - Das ganze Kapitel </para
-> </listitem
-> <listitem
-> <para
-> <guimenuitem
->Ausgewählter Text</guimenuitem
-> - Nur der ausgewählte Text. </para
-> </listitem
-> </itemizedlist>
-<para
-> Dieser Text kann in jede Anwendung kopiert werden, die auf die Zwischenablage zugreifen kann. </para>
-
-</section>
-<section id="hdbk-op-print"
-><title
->Zur Druckschlange hinzufügen</title>
-<para
->Ein &LMB; hier zeigt ein Submenü mit den Druckmöglichkeiten an: </para>
-<itemizedlist
-> <listitem
-> <para
-> <guimenuitem
->Vers mit Text</guimenuitem
-> </para
-> </listitem
-> <listitem
-> <para
-> <guimenuitem
->Kapitel</guimenuitem
-> </para
-> </listitem
-> </itemizedlist>
-<para
-> Wenn Sie diese auswählen, wird der Text zur BibleTime Druckschlange hinzugefügt, aber noch nicht ausgedruckt. Sobald sie alle gewünschten Einträge zur Druckschlange hinzugefügt haben, clicken Sie das Druck-Icon, und der Druckdialog wird angezeigt. Nun können Sie den Text entweder anschauen oder drucken. </para>
-<para
->Das Drucken in &bibletime; ist relativ einfach und als Hilfsmittel gedacht. Wenn Sie ein Dokument oder eine Präsentation erstellen, die Text von &bibletime; Dokumenten enthält, dann kopieren Sie den Text doch über die Zwischenablage in Ihr bevorzugtes Programm. </para>
-</section>
-<section id="hdbk-op-save"
-><title
->Speichern</title>
-<para
->Ein &LMB; hier zeigt ein Submenü mit Speichermöglichkeiten an: </para>
-<itemizedlist
-> <listitem
-> <para
-> <guimenuitem
->Kapitel als normaler Text</guimenuitem
-> - eine Datei mit &UNIX;-formatiertem ASCII-Text wird erstellt. </para
-> </listitem
-> <listitem
-> <para
-> <guimenuitem
->Kapitel als HTML</guimenuitem
-> - Eine HTML Datei wird erstellt. </para
-> </listitem
-> </itemizedlist>
-<para
-> Wenn der Text gespeichert ist, kann er mit jedem Text- oder HTML-Editor bearbeitet werden. </para>
-</section>
-
-
-</section>
-</chapter>
-
-
-
-
-
diff --git a/bibletime-doc/docs/de/handbook/unicode/hdbk-start.docbook b/bibletime-doc/docs/de/handbook/unicode/hdbk-start.docbook
deleted file mode 100644
index 0350068..0000000
--- a/bibletime-doc/docs/de/handbook/unicode/hdbk-start.docbook
+++ /dev/null
@@ -1,74 +0,0 @@
-<chapter id="hdbk-term"
-><title
->&bibletime; starten</title>
-<para
-> &bibletime; ist ein &kde; Programm und ist in den &kde; Arbeitsplatz integriert. Sie können &bibletime; in &kde; <guimenu
->Startmenü</guimenu
-> in der Hauptgruppe finden. <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-start-bticon.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->XX</phrase
-> </textobject
-> </mediaobject
-> </para>
-<para
-> &bibletime; kann von anderen Fenstermanagern aufgerufen werden (wie zum Beispiel gnome), voraussgesetzt &kde; ist installiert. SIe müssen ihr eigenes Symbol anlegen, um das Programm zu starten. Schlagen Sie in der Hilfe des Fenstermanagers nach, wie dies funktioniert. </para>
-<para
-> &bibletime; kann auch von der Kommandozeile eines Terminals aufgerugfen werden. Um &bibletime; zu starten, öffnen Sie ein Terminal (jedes beliebige Xterminal) und geben Sie <command
->&bibletime;</command
-> ein. </para>
-<section id="hdbk-start-sequence"
-><title
->Startvorgang</title>
-<para
-> Wenn &bibletime; startet, könnten Sie einige Meldungen sehen:</para>
-<itemizedlist
-> <listitem
-> <para
-> <interface
->Keine Module installiert</interface
-> - Dies erscheint, wenn Sie vergessen haben Sword Module zu installieren, oder wenn Sword Module nicht gefunden werden können. </para
-> </listitem
-> <listitem
-> <para
-> <interface
->Erster Start</interface
-> - Dies wird angezeigt, wenn &bibletime; das erste Mal startet. </para
-> </listitem
-> <listitem
-> <para
-> <interface
->Tägliche Tipps</interface
-> - Dies wird bei jedem Start angezeigt, es sei denn Sie schalten dies ab. <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-start-sequence-tips.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Tägliche Tipps</phrase
-> </textobject
-> </mediaobject
-> </para
-> </listitem
-> </itemizedlist>
-
-</section>
-<section id="hdbk-start-screen"
-><title
->Elemente des &bibletime; Fensters</title>
-<para
-> Jetzt öffnet sich das &bibletime; Fenster. Die Bedienung wird im nächsten Kapitel erklärt. <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-start-screen-terms.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Das &bibletime; Anwendungsfenster</phrase
-> </textobject
-> </mediaobject
-> </para>
-</section>
-</chapter>
-
-
-
diff --git a/bibletime-doc/docs/de/handbook/unicode/hdbk-toolbars.docbook b/bibletime-doc/docs/de/handbook/unicode/hdbk-toolbars.docbook
deleted file mode 100644
index 899cbc0..0000000
--- a/bibletime-doc/docs/de/handbook/unicode/hdbk-toolbars.docbook
+++ /dev/null
@@ -1,438 +0,0 @@
-<chapter id="hdbk-bars"
-><title
->Werkzeugleiste und Menüleiste</title>
-<para
-></para>
-
-	<section id="hdbk-bars-toolbar"
-><title
->Werkzeugleiste</title>
-
-	<para
-> Die Aktion jedes Knopfes wird in der Dialogbox beschrieben. <action
->Bewegen des Mauspfeils über einen Knopf</action
-> zeigt den Tooltip des Knopfes der die Aktion des Knopfes beschreibt. </para>
-	</section>
-	<section id="hdbk-bars-toolbar-action"
-><title
->Knopf-Aktion</title>
-
-	<para
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-bars-toolbar-action-exit.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Symbol</phrase
-> </textobject
-> </mediaobject
-> Schließt &bibletime; </para>
-
-	<para
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-bars-toolbar-action-print.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Symbol</phrase
-> </textobject
-> </mediaobject
-> Druckt Einträge der Druckschlange. </para>
-
-	<para
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-bars-toolbar-action-search.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Symbol</phrase
-> </textobject
-> </mediaobject
-> Suche in ausgewählten Modulen. </para>
-
-	<para
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-bars-toolbar-action-cascade.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Symbol</phrase
-> </textobject
-> </mediaobject
-> Dokumentenfenster staffeln. </para>
-
-	<para
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-bars-toolbar-action-cascade-auto.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Symbol</phrase
-> </textobject
-> </mediaobject
-> Dokumentenfenster automatisch staffeln. </para>
-
-	<para
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-bars-toolbar-action-tile.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Symbol</phrase
-> </textobject
-> </mediaobject
-> Dokumentenfenster kacheln. </para>
-
-	<para
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-bars-toolbar-action-tile-auto.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Symbol</phrase
-> </textobject
-> </mediaobject
-> Dokumentenfenster automatisch kacheln. </para>
-
-
-	<para
-> <mediaobject
-> <imageobject
-> <imagedata fileref="hdbk-bars-toolbar-close.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->Symbol</phrase
-> </textobject
-> </mediaobject
-> Alle Dokumentenfenster schließen. </para>
-	</section>
-	
-	<section id="hdbk-bars-menubar"
-><title
->Menüzeile</title>
-	<para
-></para>
-	</section>
-
-<section id="hdbk-bars-menubar-file"
-><title
->Datei</title>
-<para
-> <variablelist
-> <varlistentry
-> <term
->Druckschlange leeren</term
-> <listitem
-> <para
->Entfernt alle Einträge aus der &bibletime; Druckschlange. Die &bibletime; Druckschlange wird nicht automatisch gelöscht.</para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
-> Drucken</term
-> <listitem
-> <para
->Dieser Menüeintrag öffnet den <guilabel
->Druckdialog</guilabel
->. Hier können Sie wie in jeder anderen &kde; Anwendung drucken oder betrachten.</para
-> </listitem
-> </varlistentry
-> </variablelist
-> </para>
-</section>
-
-<section id="hdbk-bars-menubar-view"
-><title
->Ansicht</title>
-<para
-> <variablelist
-> <varlistentry
-> <term
->Werkzeugleiste anzeigen</term
-> <listitem
-> <para
->
->Wenn <guimenuitem
->Werkzeigleiste anzeigen</guimenuitem
-> ausgewählt ist, dass wird die Werkzeugleiste angezeigt. Wenn <guimenuitem
->Werkzeigleiste anzeigen</guimenuitem
-> nicht ausgewählt ist, dass wird die Werkzeugleiste versteckt.</para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
-> Zeige Hauptgruppe</term
-> <listitem
-> <para
->Wenn <guimenuitem
->Zeige Hauptgruppe</guimenuitem
-> ausgewählt ist, dann wird der linke Bereich, der die vorhandenen &sword;-Dokumente zeigt, angezeigt. Wenn <guimenuitem
->Zeige Hauptgruppe</guimenuitem
-> nicht ausgewählt ist, dann wird der linke Bereich versteckt.</para
-> </listitem
-> </varlistentry
-> </variablelist
-> </para>
-</section>
-
-<section id="hdbk-bars-menubar-mainindex"
-><title
->Hauptgruppe</title>
-<para
-> <variablelist
-> <varlistentry
-><term
->In Modulen suchen</term
-> <listitem
-> <para
-> Wenn <guimenuitem
->Durchsuche gewählte Module</guimenuitem
-> ausgewählt ist, dann wird der<guilabel
->Suchdialog</guilabel
->  angezeigt. Jedes im linken  Bereich ausgewählte Dokument sind in der Module auswählen Karteikarte vorausgewählt. </para
-> </listitem
-> </varlistentry
-> <varlistentry
-><term
->Hauptgruppe zurücksetzen</term
-> <listitem
-> <para
-> Wenn <guimenuitem
->Hauptgruppe zurücksetzen</guimenuitem
-> ausgewählt wird, wird der linke Bereich neu aufgebaut.Jede Einstellung sowie die Lesezeichen werden gelöscht. </para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Entferne ausgewählte Elemente</term
-> <listitem
-> <para
-> Wenn <guimenuitem
->Entferne ausgewählte Einträge</guimenuitem
-> ausgewählt wird, wird jeder in der <guilabel
->Hauptgruppe</guilabel
-> gewählte Eintrag gelöscht. Diese Aktion kann nur teilweise durch <guimenuitem
->Hauptgruppe zurücksetzen</guimenuitem
-> rückgängig gemacht werden. Benutzen Sie diese Funktion mit Vorsicht. </para
-> </listitem
-> </varlistentry
-> </variablelist
-> </para>
-</section>
-
-<section id="hdbk-bars-menubar-Window"
-><title
->Fenster</title>
-<para
-> <variablelist
-> <varlistentry
-> <term
->Profil speichern</term
-> <listitem
-><para
->Speichert die aktuelle Konfiguration zum gewählten Profil</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
->Profile laden</term
-> <listitem
-><para
->Lädt den Inhalt des gewählten Profiles in die aktuelle Sitzung von &bibletime;.</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
->Profile einrichten</term
-> <listitem
-><para
->Dies öffnet den <guilabel
->Profile</guilabel
-> Teil des <guilabel
->Optionendialoges</guilabel
->. Hier erzeugen und verwalten Sie die Profile.</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
->Vollbild Modus</term
-> <listitem
-><para
->Wenn <guimenuitem
->Vollbild Modus</guimenuitem
-> ausgewählt wurde, wird &bibletime; die gesamte Fläche des Monitors bedecken. Um dies wieder rückgängig zu machen, wählen Sie <guimenuitem
->Vollbild Modus</guimenuitem
-> erneut aus. </para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
->Staffeln</term
-> <listitem
-><para
->Geöffnete Dokumentenfenster staffeln</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
->Kacheln</term
-> <listitem
-> <para
->Geöffnete Dokumentenfenster kacheln</para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Automatisch staffeln</term
-> <listitem
-> <para
-> Staffelt automatisch die neu geöffneten Anzeigefenster </para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Automatisch Kacheln</term
-> <listitem
-> <para
->ditto für das kacheln neu geöffneter Anzeigefenster</para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Alle Schließen</term
-> <listitem
-> <para
->Schließt alle geöffneten Anzeigefenster</para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Liste des geöffneten Module</term
-> <listitem
-> <para
->zeigt eine Liste aller zur Zeit gewählter Module.</para
-> </listitem
-> </varlistentry
-> </variablelist
-> </para>
-</section>
-
-<section id="hdbk-bars-menubar-settings"
-><title
->Einstellungen</title>
-<para
-> <variablelist
-> <varlistentry
-> <term
->Werkzeugleiste einrichten</term
-> <listitem
-> <para
->Zeigt den <guilabel
->Werkzeugleiste einrichten</guilabel
-> Dialog.</para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->&bibletime; einrichten</term
-> <listitem
-> <para
->Öffnet den <guilabel
->Optionendialog</guilabel
->. Von diesem Dialog aus können Sie alle Einstellungen wie Schriften, Profile, Sword-Einstellungen und Tastenkürzel vornehmen. </para
-> </listitem
-> </varlistentry
-> </variablelist
-> </para>
-</section>
-
-<section id="hdbk-bars-menubar-Help"
-><title
->Hilfe</title>
-<para
-> <variablelist
-> <varlistentry
-> <term
->Handbuch</term
-> <listitem
-><para
->Wählen Sie <guimenuitem
->Handbuch</guimenuitem
-> aus, um dieses Dokument im &kde; Hilfezentrum zu lesen. </para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
->Installation</term
-> <listitem
-><para
->Wählen Sie <guimenuitem
->Installation</guimenuitem
-> aus, um die Installationsanleitung für &bibletime; im &kde; Hilfezentrum zu öffnen. </para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
->Anleitung zum Bibelstudium</term
-> <listitem
-><para
->Wählen Sie <guimenuitem
->Anleitung zum Bibelstudium</guimenuitem
-> um einen guten Grundlagentext mit Empfelungen zum Bibelstudium zu öffnen. </para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
->Was ist das?</term
-> <listitem
-> <para
-> Dies erlaubt ihnen auf bestimmte Elemente zu klicken, um eine Kontextinformation zu erhalten. </para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Fehlerbericht</term
-> <listitem
-> <para
-> Schicken Sie einen Fehlerbericht zu den Entwicklern des Programmes, um die Entwicklung zu unterstützen. Bevor Sie einen Fehlerbericht schicken, konfigurieren Sie die Anwendung zum Fehlerberichten so, dass es ihr Mailprogramm benutzt. Dies kann durch <guibutton
->konfigurieren</guibutton
-> im <guilabel
->Einen Fehlerbericht schicken...</guilabel
-> Dialog gemacht werden. </para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Täglicher Tipp</term
-> <listitem
-> <para
->Öffnet den <guilabel
->Tipp des Tages</guilabel
-> Dialog.</para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Über &bibletime;</term
-> <listitem
-> <para
-> Öffnet ein Fenster mit allgemeinen Informationen zu &bibletime; </para
-> </listitem
-> </varlistentry
-> <varlistentry
-> <term
->Über &kde;</term
-> <listitem
-> <para
-> Öffnet ein Fenster mit allgemeinen Informationen zu &kde; </para
-> </listitem
-> </varlistentry
-> </variablelist
-> </para>
-</section>
-
-
-
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/handbook/unicode/index.docbook b/bibletime-doc/docs/de/handbook/unicode/index.docbook
deleted file mode 100644
index 5823b68..0000000
--- a/bibletime-doc/docs/de/handbook/unicode/index.docbook
+++ /dev/null
@@ -1,121 +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
->Das BibleTime-Handbuch</title>
-
-<authorgroup>
-<author
-> <firstname
->Fred</firstname
-> <othername
-></othername
-> <surname
->Saalbach</surname
-> <affiliation
-> <address
-><email
->info@bibletime.de</email
-></address
-> </affiliation
-> </author>
-<author
-> <firstname
->Jeffrey</firstname
-> <surname
->Hoyt</surname
-> </author>
-</authorgroup>
-
-ROLES_OF_TRANSLATORS
-
-<copyright>
-<year
->1999</year>
-<year
->2000</year>
-<year
->2001</year>
-<holder
->BibleTimeinfo@bibletime.de</holder>
-</copyright>
-
-<legalnotice>
-
-<para
->Der BibleTime Hilfedialog ist ein Teil von 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
->09/February/2002</date>
-<releaseinfo
->2.00</releaseinfo>
-
-<abstract>
-<para
-> &bibletime; ist eine in der Studie der Bibel zu helfende Anwendung. </para>
-</abstract>
-
-<keywordset>
-<application
->KDE</application>
-<keyword
->bibletime</keyword>
-<keyword
->Bibletime</keyword>
-<keyword
->sword</keyword>
-<keyword
->crosswire</keyword>
-<keyword
->Hilfedialog</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/bibletime-doc/docs/de/helpdialog/Makefile.am b/bibletime-doc/docs/de/helpdialog/Makefile.am
deleted file mode 100644
index c63c09d..0000000
--- a/bibletime-doc/docs/de/helpdialog/Makefile.am
+++ /dev/null
@@ -1,39 +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 = html unicode 
-
-po-files:
-	for f in `ls ../../en/helpdialog/pot/*.pot`; do \
-		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/helpdialog\/pot\/"//`; \
-		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \
-		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \
-		msgmerge -o po/$$pofile.new po/$$pofile $$f; \
-		if diff po/$$pofile po/$$pofile.new > /dev/null; then \
-		rm po/$$pofile.new; \
-		else \
-		mv po/$$pofile.new po/$$pofile; \
-		fi; \
-	done;
-
-
-unicode-files:
-	for f in `ls ../../en/helpdialog/unicode/*.docbook`; do \
-		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/helpdialog\/unicode\/"//`; \
-		newfile=`echo $$f | sed s/"..\/..\/en\/helpdialog\/unicode\/"//`; \
-		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \
-		po2xml $$f po/$$pofile > unicode/$$newfile; \
-	done;
-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/bibletime-doc/docs/de/helpdialog/Makefile.in b/bibletime-doc/docs/de/helpdialog/Makefile.in
deleted file mode 100644
index e93f598..0000000
--- a/bibletime-doc/docs/de/helpdialog/Makefile.in
+++ /dev/null
@@ -1,495 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = html unicode 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/helpdialog/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/helpdialog
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/helpdialog/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-po-files:
-	for f in `ls ../../en/helpdialog/pot/*.pot`; do \
-		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/helpdialog\/pot\/"//`; \
-		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \
-		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \
-		msgmerge -o po/$$pofile.new po/$$pofile $$f; \
-		if diff po/$$pofile po/$$pofile.new > /dev/null; then \
-		rm po/$$pofile.new; \
-		else \
-		mv po/$$pofile.new po/$$pofile; \
-		fi; \
-	done;
-
-unicode-files:
-	for f in `ls ../../en/helpdialog/unicode/*.docbook`; do \
-		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/helpdialog\/unicode\/"//`; \
-		newfile=`echo $$f | sed s/"..\/..\/en\/helpdialog\/unicode\/"//`; \
-		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \
-		po2xml $$f po/$$pofile > unicode/$$newfile; \
-	done;
-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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/helpdialog/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/helpdialog/html/Makefile.am b/bibletime-doc/docs/de/helpdialog/html/Makefile.am
deleted file mode 100644
index c22e0e9..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/Makefile.am
+++ /dev/null
@@ -1,31 +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 = help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/helpdialog/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;
diff --git a/bibletime-doc/docs/de/helpdialog/html/Makefile.in b/bibletime-doc/docs/de/helpdialog/html/Makefile.in
deleted file mode 100644
index b5e2ef1..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/html/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/helpdialog/html/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/helpdialog/html
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/helpdialog/html/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/helpdialog/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/helpdialog/html/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/helpdialog/html/help-first-startup.html b/bibletime-doc/docs/de/helpdialog/html/help-first-startup.html
deleted file mode 100644
index 206cde1..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/help-first-startup.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 1. Der erste Start</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibletime, Sword, Crosswire Bible Society, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Hilfe"><link rel="up" href="index.html" title="BibleTime Hilfe"><link rel="previous" href="index.html" title="BibleTime Hilfe"><link rel="next" href="help-first-time-search.html" title="Chapter 2. Der erste Aufruf des Suchdialoges "></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>Der erste Start</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-first-time-search.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="help-first-startup"></a>Chapter 1. Der erste Start</h2></div></div><div class="table"><p><a name="id2798697"></a><b>Table 1.1. Der erste Start von BibleTime! Diese Tabelle beschreibt die Funktionen von BibleTime!</b></p><table summary="Der erste Start von BibleTime! Diese Tabelle beschreibt die Funktionen von BibleTime!" border="1"><colgroup><col><col></colgroup><thead><tr><th><i> Funktion </i></th><th><i> Beschreibung </i></th></tr></thead><tbody><tr><td><i>MDI</i></td><td> MDI ist die Abk�rzung f�r <i>Multiple Document Interface</i>. Mit der Hilfe von MDI ist es m�glich mehr als ein Anzeigefenster zur selben Zeit ge�ffnet zu haben! Sie k�nnen so zum Beispiel zwei verschiedene Bibeln Seite an Seite anschauen und ihren Text vergleichen. Aber es ist ebenfalls m�glich nur ein Fenster so wie in fr�heren Versionen von BibleTime ge�ffnet zu haben. Das Men� <i>Fenster</i> dient zum Arbeiten mit der MDI Schnittstelle. Der MDI Bereich wird nur Anzeigefenster enthalten, nichts anderes. Diese saubere Darstellung vermeidet die Verwirrung der Benutzern durch zu viele M�glichkeiten. </td></tr><tr><td><i>Anzeigefenster</i></td><td> Ein Anzeigefenster ist ein Fenster innerhalb des MDI Bereiches von BibleTime Ein Anzeigefenster pr�sentiert den Inhalt eines Dokumentes (SwordModul) in einem vern�nftigen Format (Bibeln werden zum Beispiel als HTML-Text mit Verkn�pfungen auf Versreferenzen dargestellt). Wir benutzen Anzeigefenster um einen allgemeinen Ansatz f�r die Zukunft zu haben. Crosswire wird Sword erweitern sowie mehr Material ver�ffentlichen. Wenn neue Modultypen f�r Sword entstehen, werden wir einfach zus�tzliche Typen von Anzeigefenstern hinzuf�gen. Dieser Ansatz macht BibleTime f�r die Zukunft erweiterbar und macht es m�glich jede Art von Modulen anzuzeigen, die in Zukunft erzeugt werden k�nnen (zum Beispiel Karten oder Sound-Module). </td></tr><tr><td><i> Hauptgruppe </i></td><td> Die Hauptgruppe ist der Baum auf der linken Seite von BibleTime Anwendungsfenster. Die Hauptgruppe kombiniert Lesezeichenverwaltung und Moduleverwaltung. Um mit der Hauptgruppe zu arbeiten benutzen Sie das Men� der rechte Maustaste. Die Hauptgruppe ist Drag&amp;Drop f�hig: Sie k�nnen Versreferenzen aus einem ge�ffneten Anzeigefenster oder aus dem Suchdialog ziehen um ein Lesezeichen anzulegen, und Sie k�nnen Eintr�ge im Baum bewegen (z.B. Gruppen oder Lesezeichen in andere Gruppen bewegen). </td></tr><tr><td><i>Suchschnittstelle</i></td><td> Die Suchfunktion befindet sich nun in einem eigenen Fenster. Klicken Sie mit der rechten Maustaste auf ein Modul und w�hlen Sie <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Suche in gew�hlten Modulen</span> um den Suchdialog zu �ffnen. Der Dialog enth�lt Bereiche, in denen Suchbegriffe eingegeben, Suchbereiche gesetzt und in den gefundenen Eintr�gen navigiert werden kann. Die letzte Karteikarte zeigt die grafische Suchanalyse. </td></tr><tr><td><i>Drag and Drop</i></td><td> Drag&amp;Drop ist ein wichtiger Teil von BibleTime! Sie k�nnen Dokumente, Versreferenzen, Lesezeichen, Ordner, Suchergebnisse usw. herumziehen. Orte, an denen Sie diese fallen lassen k�nnen, sind die Hauptgruppe, die Anzeigefenster und der Kommentareditor. Spielen Sie einfach etwas herum um herauszufinden wie unser Drag&amp;Drop-System arbeitet! Wir hoffen, dass es ihnen gef�llt! </td></tr></tbody></table></div><div class="table"><p><a name="id2799325"></a><b>Table 1.2. Hier ist eine kurze Liste von URLs mit mehr Informationen �ber BibleTime!</b></p><table summary="Hier ist eine kurze Liste von URLs mit mehr Informationen �ber BibleTime!" border="1"><colgroup><col><col></colgroup><thead><tr><th><i>URL</i></th><th><i>Beschreibung</i></th></tr></thead><tbody><tr><td><i><a href="http://www.bibletime.de/" target="_top">www.bibletime.de</a></i></td><td> Dies ist die Homepage von BibleTime! Gehen Sie zu dieser Seite um Dokumentationsseiten zu lesen. Vergessen sie nicht das FAQ auf <a href="http://www.bibletime.de" target="_top">www.bibletime.de</a> zu lesen, es enth�lt Antworten auf Fragen, die Sie wahrscheinlich haben. </td></tr><tr><td><i><a href="http://www.crosswire.org" target="_top">www.crosswire.org</a></i></td><td> Dies ist das Seite von Crosswire Bible Society! Crosswire Bible Society ist die Bibelgesellschaft, welche die Textbibliothek und den Installationsmanager f�r Sword herstellt. Sie k�nnen die Bibeltexte von dieser Seite herunterladen. Die meisten der auf Crosswire erh�ltlichen Texte sind entweder Public Domain oder sind von dem Copyrighthalter f�r Crosswire Bible Society zur Verteilung bereitgestellt worden. Module, die nicht zur freien Verteilung herausgegeben wurden, sind verschl�sselt. Bitte lesen Sie die Seite <a href="help-module-encrypted.html" title="Chapter 4. Das Modul ist verschl�sselt">Hilfedialog f�r verschl�sselte Module</a> vor dem Herunterladen von Modulen. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="help-first-time-search.html">Next</a></td></tr><tr><td width="33%" align="left">BibleTime Hilfe�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Der erste Aufruf des Suchdialoges </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/helpdialog/html/help-first-time-search.html b/bibletime-doc/docs/de/helpdialog/html/help-first-time-search.html
deleted file mode 100644
index 4116f34..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/help-first-time-search.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 2. Der erste Aufruf des Suchdialoges </title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibletime, Sword, Crosswire Bible Society, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Hilfe"><link rel="up" href="index.html" title="BibleTime Hilfe"><link rel="previous" href="help-first-startup.html" title="Chapter 1. Der erste Start"><link rel="next" href="help-initbackend-failed.html" title="Chapter 3. Initialisierung des Backends ist fehlgeschlagen! "></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>Der erste Aufruf des Suchdialoges </h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-first-startup.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="help-initbackend-failed.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="help-first-time-search"></a>Chapter 2. Der erste Aufruf des Suchdialoges </h2></div></div><p>Sie haben den Suchdialog zum ersten Mal ge�ffnet!</p><p>Diese Seite beschreibt, was der Suchdialog ist, wie man ihn benutzt und wie man effiziente Suchen durchf�hrt.</p><div class="qandaset"><dl><dt>2.1 <a href="help-first-time-search.html#id2798482"> Was ist der Suchdialog? </a></dt><dt>2.2 <a href="help-first-time-search.html#id2798544"> Wie suche ich nach Text? </a></dt></dl><div class="qandaentry"><div class="question"><p><a name="id2798482"></a><b>2.1 </b> Was ist der Suchdialog? </p></div><div class="answer"><p><a name="id2798516"></a><b> </b> Der Suchdialog ist der Dialog, in dem sie die installierten Sword Dokumente (Module) mit BibleTime durchsuchen k�nnen. Sie k�nnen Text eingeben und diese Text in den Dokumenten suchen. Die gefundenen Eintr�ge erscheinen in einer Liste, so dass Sie mit ihnen arbeiten k�nnen. </p></div></div><div class="qandaentry"><div class="question"><p><a name="id2798544"></a><b>2.2 </b> Wie suche ich nach Text? </p></div><div class="answer"><p><a name="id2798553"></a><b> </b> Um einen Text zu suchen, klicken sie auf den ersten Eintrag der Karteikarten im oberen Bereich des Dialoges. Geben Sie nun Ihren Text in der Eingabezeile zu Beginn der Seite ein. Falls Sie keine besonderen Sucheigenschaften nutzen wollen, lassen Sie die Einstellungen unber�hrt und klicken Sie auf den Knopf <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Suchen</span> am unteren Ende des Dialoges. Der Fortschritt der Suche wird in den beiden Anzeigen unten angezeigt. Die erste Anzeige zeigt den Fortschritt f�r das aktuelle Modul, die zweite zeigt die Prozent der gesamten Suche. Es ist m�glich in mehr als einem Modul zu suchen, daher werden zwei Anzeigen ben�tigt. Falls Sie jedoch die Suche erweitern m�chten, bieten wir Ihnen folgende M�glichkeiten an: </p><p> <i> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Mehrere W�rter</span> </i> </p><p> Die eingegebenen W�rter k�nnen in einer anderen Reihenfolge auftreten, als sie eingegeben wurden. Sie k�nnen sogar Teil eines Wortes sein. </p><p> <i> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Genaue Suche</span> </i> </p><p> Der Text wird exakt so gesucht, wie Sie ihn eingegeben haben; der Text wird ohne Unterscheidung von Gro�- und Kleinbuchstaben gesucht, au�er Sie haben GRO�/klein aktiviert. </p><p> <i> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Regul�re Ausdr�cke</span> </i> </p><p> Wenn Sie diese Art der Suche benutzen, werden GNU regul�re Ausdr�cke benutzt. </p><p> Im Normalfall werden alle Suchen ohne die Unterscheidung von GROSS/klein durchgef�hrt. Um die Unterscheidung anzuschalten aktivieren Sie die Box <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">GROSS/klein</span>. Falls Sie Probleme mit den Suchtypen, der Unterscheidung von GROSS/klein oder anderen f�r die Suche relevanten Dinge bekommen, finden Sie in unserem Handbuch mehr Informationen. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="help-first-startup.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="help-initbackend-failed.html">Next</a></td></tr><tr><td width="33%" align="left">Der erste Start�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Initialisierung des Backends ist fehlgeschlagen! </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/helpdialog/html/help-initbackend-failed.html b/bibletime-doc/docs/de/helpdialog/html/help-initbackend-failed.html
deleted file mode 100644
index a269f41..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/help-initbackend-failed.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 3. Initialisierung des Backends ist fehlgeschlagen! </title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibletime, Sword, Crosswire Bible Society, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Hilfe"><link rel="up" href="index.html" title="BibleTime Hilfe"><link rel="previous" href="help-first-time-search.html" title="Chapter 2. Der erste Aufruf des Suchdialoges "><link rel="next" href="help-module-encrypted.html" title="Chapter 4. Das Modul ist verschl�sselt"></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>Initialisierung des Backends ist fehlgeschlagen! </h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-first-time-search.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="help-module-encrypted.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="help-initbackend-failed"></a>Chapter 3. Initialisierung des Backends ist fehlgeschlagen! </h2></div></div><p>Die Initialisierung von BibleTimes backend ist fehlgeschlagen!</p><p>Wenn Sie diese Meldung erhalten, haben Sie einen Programmfehler freilegt, den wir kennen m�ssen �ber.</p><p>Senden Sie bitte einen Programmfehler-Report mit etwas Informationen und zeigen Sie uns, wie man das Problem reproduziert. </p><p> Email wir bei <a href="mailto:info@bibletime.de" target="_top">info@bibletime.de!</a></p><p>Vielen Dank f�r Ihre Hilfe!</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="help-first-time-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="help-module-encrypted.html">Next</a></td></tr><tr><td width="33%" align="left">Der erste Aufruf des Suchdialoges �</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Das Modul ist verschl�sselt</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/helpdialog/html/help-module-encrypted.html b/bibletime-doc/docs/de/helpdialog/html/help-module-encrypted.html
deleted file mode 100644
index b42ebf5..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/help-module-encrypted.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 4. Das Modul ist verschl�sselt</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibletime, Sword, Crosswire Bible Society, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Hilfe"><link rel="up" href="index.html" title="BibleTime Hilfe"><link rel="previous" href="help-initbackend-failed.html" title="Chapter 3. Initialisierung des Backends ist fehlgeschlagen! "><link rel="next" href="help-sword-module-trouble.html" title="Chapter 5. 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>Das Modul ist verschl�sselt</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-initbackend-failed.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="help-sword-module-trouble.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="help-module-encrypted"></a>Chapter 4. Das Modul ist verschl�sselt</h2></div></div><p>Das von ihnen ausgew�hlte Modul ist verschl�sselt. </p><p> Diese Beschreibt, was Verschl�sselung f�r Sie bedeutet.</p><div class="qandaset"><dl><dt>4.1 <a href="help-module-encrypted.html#id2798986"> Was ist ein verschl�sseltes Modul? </a></dt><dt>4.2 <a href="help-module-encrypted.html#id2798881"> Wie entschl�ssele ich ein Modul? </a></dt><dt>4.3 <a href="help-module-encrypted.html#id2799030"> Warum sind Module verschl�sselt? </a></dt></dl><div class="qandaentry"><div class="question"><p><a name="id2798986"></a><b>4.1 </b> Was ist ein verschl�sseltes Modul? </p></div><div class="answer"><p><a name="id2798966"></a><b> </b> Ein verschl�sseltes Modul (Dokument) ist ein Modul, dass mit einem Passwort gesichert ist. Nur ein Benutzer mit dem richtigen Passwort kann das Modul entschl�sseln um es zu lesen. </p></div></div><div class="qandaentry"><div class="question"><p><a name="id2798881"></a><b>4.2 </b> Wie entschl�ssele ich ein Modul? </p></div><div class="answer"><p><a name="id2798891"></a><b> </b> F�r normale Benutzer ist es traurigerweise zur Zeit leider nicht m�glich, verschl�sselte Module zu benutzen. Das Problem ist, dass die Copyrightinhaber ihre Module nicht f�r Sword ver�ffentlichen m�chten. Aber falls Sie einen Schl�ssel haben, klicken Sie mit der rechten Maustaste auf ein Modul und w�hlen Sie &quot;Entschl�ssele Modul...&quot;. Ein Dialog erscheint, geben Sie hier bitte den Schl�ssel ein, um das Modul aufzuschlie�en. </p></div></div><div class="qandaentry"><div class="question"><p><a name="id2799030"></a><b>4.3 </b> Warum sind Module verschl�sselt? </p></div><div class="answer"><p><a name="id2799040"></a><b> </b> Module sind verschlossen, weil die Copyrightinhaber der Module ihre Texte nicht f�r das Sword Projekt ver�ffentlichen m�chten. Bitte kontaktieren Sie die Copyrightinhaber und bitten Sie, die Module verf�gbar zu machen. Falls Sie daf�r bezahlen m�chten, sagen Sie dies; dies ist etwas, was siem�gen. Wir wissen, dass freie Module wirklich sch�n w�ren; versuchen Sie deshalb diese zu bekommen. Sie k�nnen auch <a href="http://www.crosswire.org/sword/copyright/" target="_top">Crosswire Bible Society</a> besuchen und die Informationen �ber die Anstrengungen lesen, die unternommen wurden die Texte durch Crosswire zu verbreiten. Vielen Dank f�r Ihre Anstrengungen! </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="help-initbackend-failed.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="help-sword-module-trouble.html">Next</a></td></tr><tr><td width="33%" align="left">Initialisierung des Backends ist fehlgeschlagen! �</td><td width="34%" align="center"><a href="index.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/bibletime-doc/docs/de/helpdialog/html/help-no-mods-d.html b/bibletime-doc/docs/de/helpdialog/html/help-no-mods-d.html
deleted file mode 100644
index e734a7c..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/help-no-mods-d.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 6. Initialisierung des Modulverzeichnisses ist fehlgeschlagen!</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibletime, Sword, Crosswire Bible Society, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Hilfe"><link rel="up" href="index.html" title="BibleTime Hilfe"><link rel="previous" href="help-sword-module-trouble.html" title="Chapter 5. Sword."><link rel="next" href="help-no-modules.html" title="Chapter 7. Keine Module installiert!"></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>Initialisierung des Modulverzeichnisses ist fehlgeschlagen!</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-sword-module-trouble.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="help-no-modules.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="help-no-mods-d"></a>Chapter 6. Initialisierung des Modulverzeichnisses ist fehlgeschlagen!</h2></div></div><p>Es gibt kein mods.d Verzeichnis!</p><p>Diese Seite beschreibt, wass das <tt>mods.d</tt> Verzeichnis ist und wie man dieses Problem l�st! </p><div class="qandaset"><dl><dt>6.1 <a href="help-no-mods-d.html#id2798980"> Was ist das mods.d Verzeichnis? </a></dt><dt>6.2 <a href="help-no-mods-d.html#id2799073"> Wie l�se ich dieses Problem? </a></dt><dt>6.3 <a href="help-no-mods-d.html#id2737801"> Kann ich BibleTime ohne das mods.d Verzeichnis starten? </a></dt></dl><div class="qandaentry"><div class="question"><p><a name="id2798980"></a><b>6.1 </b> Was ist das <tt>mods.d</tt> Verzeichnis? </p></div><div class="answer"><p><a name="id2798965"></a><b> </b> Das Verzeichnis <tt>mods.d</tt> ist das Verzeichnis, welches die Konfigurationsdaten der Module ent�lt! Sie ben�tigen dieses Verzeichnis, sonst k�nnen Sie Bibletime und Sword nicht nutzen! Bitte lesen Sie die Installationsanweisungen. </p></div></div><div class="qandaentry"><div class="question"><p><a name="id2799073"></a><b>6.2 </b> Wie l�se ich dieses Problem? </p></div><div class="answer"><p><a name="id2737765"></a><b> </b> Die L�sung besteht darin, ein <tt>mods.d</tt> Verzeichnis anzulegen: Bitte wechseln Sie in ihr Sword Verzeichnis und geben Sie &quot;<span class="command"><b>mkdir mods.d</b></span>&quot; ein um das Verzeichnis anzulegen. Nun kopieren Sie die Konfigurationsdateien in dieses Verzeichnis und l�schen Sie (falls sie existiert) die Datei mods.conf, da sie nicht mehr ben�tigt wird. Das mods.d Verzeichnis hat diese Datei ersetzt. </p></div></div><div class="qandaentry"><div class="question"><p><a name="id2737801"></a><b>6.3 </b> Kann ich BibleTime ohne das mods.d Verzeichnis starten? </p></div><div class="answer"><p><a name="id2737814"></a><b> </b> Ja, das ist m�glich. Aber es ist nicht sehr hilfreich. Im Hauptindex wird es keine Module geben. Es ist m�glich, BibleTime so zu testen, aber es ist unm�glich, ohne Module zu arbeiten. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="help-sword-module-trouble.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="help-no-modules.html">Next</a></td></tr><tr><td width="33%" align="left">Sword.�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Keine Module installiert!</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/helpdialog/html/help-no-modules.html b/bibletime-doc/docs/de/helpdialog/html/help-no-modules.html
deleted file mode 100644
index 48ddeb6..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/help-no-modules.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 7. Keine Module installiert!</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibletime, Sword, Crosswire Bible Society, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Hilfe"><link rel="up" href="index.html" title="BibleTime Hilfe"><link rel="previous" href="help-no-mods-d.html" title="Chapter 6. Initialisierung des Modulverzeichnisses ist fehlgeschlagen!"></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>Keine Module installiert!</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-no-mods-d.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="help-no-modules"></a>Chapter 7. Keine Module installiert!</h2></div></div><p>Es sind keine Sword Module installiert! </p><p>Diese Seite beschreibt, was Module sind und wie man dieses Problem l�st </p><div class="qandaset"><dl><dt>7.1 <a href="help-no-modules.html#id2737139"> Was ist ein Modul? </a></dt><dt>7.2 <a href="help-no-modules.html#id2737544"> Wie l�se ich dieses Problem? </a></dt><dt>7.3 <a href="help-no-modules.html#id2737579"> Was soll ich machen, wenn es nicht funktioniert? </a></dt></dl><div class="qandaentry"><div class="question"><p><a name="id2737139"></a><b>7.1 </b> Was ist ein Modul? </p></div><div class="answer"><p><a name="id2737511"></a><b> </b> Ein Sword Module ist die Basis von BibleTime. Ein Modul kann eine Bibel, ein Kommentar oder ein Lexicon sein. Sp�ter werden wir Karten und andere interessante Dinge haben. Es ist nicht m�glich mit BibleTime zu arbeiten, wenn keine Module installiert sind, obwohl es m�glich ist BibleTime ohne installiert Module zu testen. Wenn Module in BibleTime angezeigt werden, nennen wir sie Dokumente. </p></div></div><div class="qandaentry"><div class="question"><p><a name="id2737544"></a><b>7.2 </b> Wie l�se ich dieses Problem? </p></div><div class="answer"><p><a name="id2737554"></a><b> </b>Bitte laden Sie einige Module herunter und installieren Sie diese! Sie bekommen die Module unter <a href="http://www.crosswire.org" target="_top">www.crosswire.org</a>. Bitte lesen Sie die Installationsanweisungen. </p></div></div><div class="qandaentry"><div class="question"><p><a name="id2737579"></a><b>7.3 </b> Was soll ich machen, wenn es nicht funktioniert? </p></div><div class="answer"><p><a name="id2737589"></a><b> </b> Bitte lesen Sie die Dokumentation auf <a href="http://www.bibletime.de" target="_top">www.bibletime.de</a>. Falls Sie es nicht zum Funktionieren bekommen, schicken Sie bitte eine eMail an <a href="mailto:info@bbibletime.de" target="_top">info@bibletime.de </a>. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="help-no-mods-d.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">Initialisierung des Modulverzeichnisses ist fehlgeschlagen!�</td><td width="34%" align="center"><a href="index.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/bibletime-doc/docs/de/helpdialog/html/help-sword-module-trouble.html b/bibletime-doc/docs/de/helpdialog/html/help-sword-module-trouble.html
deleted file mode 100644
index cdf0470..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/help-sword-module-trouble.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 5. Sword.</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibletime, Sword, Crosswire Bible Society, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Hilfe"><link rel="up" href="index.html" title="BibleTime Hilfe"><link rel="previous" href="help-module-encrypted.html" title="Chapter 4. Das Modul ist verschl�sselt"><link rel="next" href="help-no-mods-d.html" title="Chapter 6. Initialisierung des Modulverzeichnisses ist fehlgeschlagen!"></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('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('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('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('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="help-module-encrypted.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="help-no-mods-d.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="help-sword-module-trouble"></a>Chapter 5. Sword.</h2></div></div><p>Das Sword Modul konnte nicht ge�ffnet werden. Dieser Fehler wird normalerweise durch ein veraltetes oder besch�digtes Modul verursacht. Bitte besuchen Sie die <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a>, um ein Update des Moduls zu erhalten.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2737760"></a>Note</h3><p>Momentan kann Sword dieses Problem nicht abfangen. BibleTime und Sword st�rzen ohne Fehlermeldung ab. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="help-module-encrypted.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="help-no-mods-d.html">Next</a></td></tr><tr><td width="33%" align="left">Das Modul ist verschl�sselt�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Initialisierung des Modulverzeichnisses ist fehlgeschlagen!</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/helpdialog/html/index.html b/bibletime-doc/docs/de/helpdialog/html/index.html
deleted file mode 100644
index 244c177..0000000
--- a/bibletime-doc/docs/de/helpdialog/html/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>BibleTime Hilfe</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibletime, Sword, Crosswire Bible Society, Hilfedialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Hilfe"><link rel="next" href="help-first-startup.html" title="Chapter 1. Der erste Start"></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>BibleTime Hilfe</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-first-startup.html">Next</a></td></tr></tbody></table></div></div><div class="book" id="id2735340"><div class="titlepage"><div><h1 class="title"><a name="id2735340"></a>BibleTime Hilfe</h1></div><div><h3 class="author">Fred  Saalbach</h3><div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:info@bibletime.de">info@bibletime.de</a>&gt;</tt></div></div><h3 class="author">Jeffrey Hoyt</h3></div><div>Revision <span class="releaseinfo">1.01.00<br></span></div><div><p class="copyright">Copyright � 1999, 2000, 2001 Das BibleTime-Team, info@bibletime.de</p></div><div><div class="legalnotice"><p>Der BibleTime Hilfedialog ist Teil von 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" id="id2799482"><a name="id2799482"></a><p> BibleTime ist eine in der Studie der Bibel zu helfende Anwendung. </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="help-first-startup.html">Der erste Start</a></dt><dt>2 <a href="help-first-time-search.html">Der erste Aufruf des Suchdialoges </a></dt><dt>3 <a href="help-initbackend-failed.html">Initialisierung des Backends ist fehlgeschlagen! </a></dt><dt>4 <a href="help-module-encrypted.html">Das Modul ist verschl�sselt</a></dt><dt>5 <a href="help-sword-module-trouble.html">Sword.</a></dt><dt>6 <a href="help-no-mods-d.html">Initialisierung des Modulverzeichnisses ist fehlgeschlagen!</a></dt><dt>7 <a href="help-no-modules.html">Keine Module installiert!</a></dt></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="help-first-startup.html">Next</a></td></tr><tr><td width="33%" align="left">�</td><td width="34%" align="center">�</td><td width="33%" align="right">�Der erste Start</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/Makefile.am b/bibletime-doc/docs/de/helpdialog/unicode/Makefile.am
deleted file mode 100644
index 8a07e8d..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/Makefile.am
+++ /dev/null
@@ -1,31 +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 = help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/helpdialog/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/Makefile.in b/bibletime-doc/docs/de/helpdialog/unicode/Makefile.in
deleted file mode 100644
index 7482e65..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/unicode/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/helpdialog/unicode/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/helpdialog/unicode
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/helpdialog/unicode/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/helpdialog/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/helpdialog/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/helpdialog/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/helpdialog/unicode/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/help-first-startup.docbook b/bibletime-doc/docs/de/helpdialog/unicode/help-first-startup.docbook
deleted file mode 100644
index 4a63003..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/help-first-startup.docbook
+++ /dev/null
@@ -1,118 +0,0 @@
-<chapter id="help-first-startup">
-<title
->Der erste Start</title>
-
-<table>
-<title
->Der erste Start von &bibletime;! Diese Tabelle beschreibt die Funktionen von &bibletime;!</title>
-<tgroup cols="2">
-<thead
-> <row
-> <entry
-> <emphasis
-> Funktion </emphasis
-> </entry
-> <entry
-> <emphasis
-> Beschreibung </emphasis
-> </entry
-> </row
-> </thead>
-<tbody
-> <row
-> <entry
-> <emphasis
->MDI</emphasis
-> </entry
-> <entry
-> MDI ist die Abkürzung für <emphasis
->Multiple Document Interface</emphasis
->. Mit der Hilfe von MDI ist es möglich mehr als ein Anzeigefenster zur selben Zeit geöffnet zu haben! Sie können so zum Beispiel zwei verschiedene Bibeln Seite an Seite anschauen und ihren Text vergleichen. Aber es ist ebenfalls möglich nur ein Fenster so wie in früheren Versionen von &bibletime; geöffnet zu haben. Das Menü <emphasis
->Fenster</emphasis
-> dient zum Arbeiten mit der MDI Schnittstelle. Der MDI Bereich wird nur Anzeigefenster enthalten, nichts anderes. Diese saubere Darstellung vermeidet die Verwirrung der Benutzern durch zu viele Möglichkeiten. </entry
-> </row
-> <row
-> <entry
-> <emphasis
->Anzeigefenster</emphasis
-> </entry
-> <entry
-> Ein Anzeigefenster ist ein Fenster innerhalb des MDI Bereiches von &bibletime; Ein Anzeigefenster präsentiert den Inhalt eines Dokumentes (&sword;Modul) in einem vernünftigen Format (Bibeln werden zum Beispiel als HTML-Text mit Verknüpfungen auf Versreferenzen dargestellt). Wir benutzen Anzeigefenster um einen allgemeinen Ansatz für die Zukunft zu haben. Crosswire wird &sword; erweitern sowie mehr Material veröffentlichen. Wenn neue Modultypen für &sword; entstehen, werden wir einfach zusätzliche Typen von Anzeigefenstern hinzufügen. Dieser Ansatz macht &bibletime; für die Zukunft erweiterbar und macht es möglich jede Art von Modulen anzuzeigen, die in Zukunft erzeugt werden können (zum Beispiel Karten oder Sound-Module). </entry
-> </row
-> <row
-> <entry
-> <emphasis
-> Hauptgruppe </emphasis
-> </entry
-> <entry
-> Die Hauptgruppe ist der Baum auf der linken Seite von &bibletime; Anwendungsfenster. Die Hauptgruppe kombiniert Lesezeichenverwaltung und Moduleverwaltung. Um mit der Hauptgruppe zu arbeiten benutzen Sie das Menü der rechte Maustaste. Die Hauptgruppe ist Drag&amp;Drop fähig: Sie können Versreferenzen aus einem geöffneten Anzeigefenster oder aus dem Suchdialog ziehen um ein Lesezeichen anzulegen, und Sie können Einträge im Baum bewegen (z.B. Gruppen oder Lesezeichen in andere Gruppen bewegen). </entry
-> </row
-> <row
-> <entry
-> <emphasis
->Suchschnittstelle</emphasis
-> </entry
-> <entry
-> Die Suchfunktion befindet sich nun in einem eigenen Fenster. Klicken Sie mit der rechten Maustaste auf ein Modul und wählen Sie <guimenuitem
->Suche in gewählten Modulen</guimenuitem
-> um den Suchdialog zu öffnen. Der Dialog enthält Bereiche, in denen Suchbegriffe eingegeben, Suchbereiche gesetzt und in den gefundenen Einträgen navigiert werden kann. Die letzte Karteikarte zeigt die grafische Suchanalyse. </entry
-> </row
-> <row
-> <entry
-> <emphasis
->Drag and Drop</emphasis
-> </entry
-> <entry
-> Drag&amp;Drop ist ein wichtiger Teil von &bibletime;! Sie können Dokumente, Versreferenzen, Lesezeichen, Ordner, Suchergebnisse usw. herumziehen. Orte, an denen Sie diese fallen lassen können, sind die Hauptgruppe, die Anzeigefenster und der Kommentareditor. Spielen Sie einfach etwas herum um herauszufinden wie unser Drag&amp;Drop-System arbeitet! Wir hoffen, dass es ihnen gefällt! </entry
-> </row
-> </tbody>
-</tgroup>
-</table>
-
-<table>
-<title
->Hier ist eine kurze Liste von URLs mit mehr Informationen über &bibletime;!</title>
-<tgroup cols="2">
-<thead
-> <row
-> <entry
-> <emphasis
->URL</emphasis
-> </entry
-> <entry
-> <emphasis
->Beschreibung</emphasis
-> </entry
-> </row
-> </thead>
-<tbody
-> <row
-> <entry
-> <emphasis
-><ulink url="http://www.bibletime.de/"
->www.bibletime.de</ulink
-></emphasis
-> </entry
-> <entry
-> Dies ist die Homepage von &bibletime;! Gehen Sie zu dieser Seite um Dokumentationsseiten zu lesen. Vergessen sie nicht das &FAQ; auf <ulink url="http://www.bibletime.de"
->www.bibletime.de</ulink
-> zu lesen, es enthält Antworten auf Fragen, die Sie wahrscheinlich haben. </entry
-> </row
-> <row
-> <entry
-> <emphasis
-><ulink url="http://www.crosswire.org"
->www.crosswire.org</ulink
-></emphasis
-> </entry
-> <entry
-> Dies ist das Seite von &crosswire;! &crosswire; ist die Bibelgesellschaft, welche die Textbibliothek und den Installationsmanager für &sword; herstellt. Sie können die Bibeltexte von dieser Seite herunterladen. Die meisten der auf Crosswire erhältlichen Texte sind entweder Public Domain oder sind von dem Copyrighthalter für &crosswire; zur Verteilung bereitgestellt worden. Module, die nicht zur freien Verteilung herausgegeben wurden, sind verschlüsselt. Bitte lesen Sie die Seite <link linkend="help-module-encrypted"
->Hilfedialog für verschlüsselte Module</link
-> vor dem Herunterladen von Modulen. </entry
-> </row
-> </tbody>
-</tgroup>
-</table>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/help-first-time-search.docbook b/bibletime-doc/docs/de/helpdialog/unicode/help-first-time-search.docbook
deleted file mode 100644
index d45f1cb..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/help-first-time-search.docbook
+++ /dev/null
@@ -1,65 +0,0 @@
-<chapter id="help-first-time-search">
-<title
->Der erste Aufruf des Suchdialoges </title>
-
-<para
->Sie haben den Suchdialog zum ersten Mal geöffnet!</para>
-<para
->Diese Seite beschreibt, was der Suchdialog ist, wie man ihn benutzt und wie man effiziente Suchen durchführt.</para>
-
-<qandaset>
-<qandaentry>
-<question>
-<para
-> Was ist der Suchdialog? </para>
-</question>
-<answer>
-<para
-> Der Suchdialog ist der Dialog, in dem sie die installierten &sword; Dokumente (Module) mit &bibletime; durchsuchen können. Sie können Text eingeben und diese Text in den Dokumenten suchen. Die gefundenen Einträge erscheinen in einer Liste, so dass Sie mit ihnen arbeiten können. </para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para
-> Wie suche ich nach Text? </para>
-</question>
-<answer>
-<para
-> Um einen Text zu suchen, klicken sie auf den ersten Eintrag der Karteikarten im oberen Bereich des Dialoges. Geben Sie nun Ihren Text in der Eingabezeile zu Beginn der Seite ein. Falls Sie keine besonderen Sucheigenschaften nutzen wollen, lassen Sie die Einstellungen unberührt und klicken Sie auf den Knopf <guibutton
->Suchen</guibutton
-> am unteren Ende des Dialoges. Der Fortschritt der Suche wird in den beiden Anzeigen unten angezeigt. Die erste Anzeige zeigt den Fortschritt für das aktuelle Modul, die zweite zeigt die Prozent der gesamten Suche. Es ist möglich in mehr als einem Modul zu suchen, daher werden zwei Anzeigen benötigt. Falls Sie jedoch die Suche erweitern möchten, bieten wir Ihnen folgende Möglichkeiten an: </para>
-<para
-> <emphasis
-> <guilabel
->Mehrere Wörter</guilabel
-> </emphasis
-> </para>
-<para
-> Die eingegebenen Wörter können in einer anderen Reihenfolge auftreten, als sie eingegeben wurden. Sie können sogar Teil eines Wortes sein. </para>
-<para
-> <emphasis
-> <guilabel
->Genaue Suche</guilabel
-> </emphasis
-> </para>
-<para
-> Der Text wird exakt so gesucht, wie Sie ihn eingegeben haben; der Text wird ohne Unterscheidung von Groß- und Kleinbuchstaben gesucht, außer Sie haben GROß/klein aktiviert. </para>
-<para
-> <emphasis
-> <guilabel
->Reguläre Ausdrücke</guilabel
-> </emphasis
-> </para>
-<para
-> Wenn Sie diese Art der Suche benutzen, werden GNU reguläre Ausdrücke benutzt. </para>
-<para
-> Im Normalfall werden alle Suchen ohne die Unterscheidung von GROSS/klein durchgeführt. Um die Unterscheidung anzuschalten aktivieren Sie die Box <guilabel
->GROSS/klein</guilabel
->. Falls Sie Probleme mit den Suchtypen, der Unterscheidung von GROSS/klein oder anderen für die Suche relevanten Dinge bekommen, finden Sie in unserem Handbuch mehr Informationen. </para>
-</answer>
-</qandaentry>
-</qandaset>
-</chapter>
-
-
-
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/help-initbackend-failed.docbook b/bibletime-doc/docs/de/helpdialog/unicode/help-initbackend-failed.docbook
deleted file mode 100644
index 71db10b..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/help-initbackend-failed.docbook
+++ /dev/null
@@ -1,21 +0,0 @@
-<chapter id="help-initbackend-failed">
-<title
->Initialisierung des Backends ist fehlgeschlagen! </title>
-<para
->Die Initialisierung von &bibletime;s backend ist fehlgeschlagen!</para>
-
-<para
->Wenn Sie diese Meldung erhalten, haben Sie einen Programmfehler freilegt, den wir kennen müssen über.</para>
-
-
-<para
->Senden Sie bitte einen Programmfehler-Report mit etwas Informationen und zeigen Sie uns, wie man das Problem reproduziert. </para>
-<para
-> Email wir bei <ulink url="mailto:info@bibletime.de"
->info@bibletime.de!</ulink
-></para>
-<para
->Vielen Dank für Ihre Hilfe!</para>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/help-module-encrypted.docbook b/bibletime-doc/docs/de/helpdialog/unicode/help-module-encrypted.docbook
deleted file mode 100644
index f8d1523..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/help-module-encrypted.docbook
+++ /dev/null
@@ -1,45 +0,0 @@
-<chapter id="help-module-encrypted">
-<title
->Das Modul ist verschlüsselt</title>
-<para
->Das von ihnen ausgewählte Modul ist verschlüsselt. </para>
-<para
-> Diese Beschreibt, was Verschlüsselung für Sie bedeutet.</para>
-<qandaset>
-<qandaentry>
-<question>
-<para
-> Was ist ein verschlüsseltes Modul? </para>
-</question>
-<answer>
-<para
-> Ein verschlüsseltes Modul (Dokument) ist ein Modul, dass mit einem Passwort gesichert ist. Nur ein Benutzer mit dem richtigen Passwort kann das Modul entschlüsseln um es zu lesen. </para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para
-> Wie entschlüssele ich ein Modul? </para>
-</question>
-<answer>
-<para
-> Für normale Benutzer ist es traurigerweise zur Zeit leider nicht möglich, verschlüsselte Module zu benutzen. Das Problem ist, dass die Copyrightinhaber ihre Module nicht für Sword veröffentlichen möchten. Aber falls Sie einen Schlüssel haben, klicken Sie mit der rechten Maustaste auf ein Modul und wählen Sie "Entschlüssele Modul...". Ein Dialog erscheint, geben Sie hier bitte den Schlüssel ein, um das Modul aufzuschließen. </para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para
-> Warum sind Module verschlüsselt? </para>
-</question>
-<answer>
-<para
-> Module sind verschlossen, weil die Copyrightinhaber der Module ihre Texte nicht für das &sword; Projekt veröffentlichen möchten. Bitte kontaktieren Sie die Copyrightinhaber und bitten Sie, die Module verfügbar zu machen. Falls Sie dafür bezahlen möchten, sagen Sie dies; dies ist etwas, was siemögen. Wir wissen, dass freie Module wirklich schön wären; versuchen Sie deshalb diese zu bekommen. Sie können auch <ulink url="http://www.crosswire.org/sword/copyright/"
->&crosswire;</ulink
-> besuchen und die Informationen über die Anstrengungen lesen, die unternommen wurden die Texte durch Crosswire zu verbreiten. Vielen Dank für Ihre Anstrengungen! </para>
-
-</answer>
-</qandaentry>
-</qandaset>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/help-no-mods-d.docbook b/bibletime-doc/docs/de/helpdialog/unicode/help-no-mods-d.docbook
deleted file mode 100644
index 3feb8ef..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/help-no-mods-d.docbook
+++ /dev/null
@@ -1,54 +0,0 @@
-<chapter id="help-no-mods-d">
-<title
->Initialisierung des Modulverzeichnisses ist fehlgeschlagen!</title>
-
-<para
->Es gibt kein mods.d Verzeichnis!</para>
-
-<para
->Diese Seite beschreibt, wass das <filename
->mods.d</filename
-> Verzeichnis ist und wie man dieses Problem löst! </para>
-<qandaset>
-<qandaentry>
-<question>
-<para
-> Was ist das <filename
->mods.d</filename
-> Verzeichnis? </para>
-</question>
-<answer>
-<para
-> Das Verzeichnis <filename
->mods.d</filename
-> ist das Verzeichnis, welches die Konfigurationsdaten der Module entält! Sie benötigen dieses Verzeichnis, sonst können Sie Bibletime und &sword; nicht nutzen! Bitte lesen Sie die Installationsanweisungen. </para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para
-> Wie löse ich dieses Problem? </para>
-</question>
-<answer>
-<para
-> Die Lösung besteht darin, ein <filename
->mods.d</filename
-> Verzeichnis anzulegen: Bitte wechseln Sie in ihr &sword; Verzeichnis und geben Sie "<command
->mkdir mods.d</command
->" ein um das Verzeichnis anzulegen. Nun kopieren Sie die Konfigurationsdateien in dieses Verzeichnis und löschen Sie (falls sie existiert) die Datei mods.conf, da sie nicht mehr benötigt wird. Das mods.d Verzeichnis hat diese Datei ersetzt. </para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para
-> Kann ich &bibletime; ohne das mods.d Verzeichnis starten? </para>
-</question>
-<answer>
-<para
-> Ja, das ist möglich. Aber es ist nicht sehr hilfreich. Im Hauptindex wird es keine Module geben. Es ist möglich, &bibletime; so zu testen, aber es ist unmöglich, ohne Module zu arbeiten. </para>
-</answer>
-</qandaentry>
-</qandaset>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/help-no-modules.docbook b/bibletime-doc/docs/de/helpdialog/unicode/help-no-modules.docbook
deleted file mode 100644
index a9e1e68..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/help-no-modules.docbook
+++ /dev/null
@@ -1,50 +0,0 @@
-<chapter id="help-no-modules">
-<title
->Keine Module installiert!</title>
-
-<para
->Es sind keine &sword; Module installiert! </para>
-<para
->Diese Seite beschreibt, was Module sind und wie man dieses Problem löst </para>
-
-<qandaset>
-<qandaentry>
-<question>
-<para
-> Was ist ein Modul? </para>
-</question>
-<answer>
-<para
-> Ein &sword; Module ist die Basis von &bibletime;. Ein Modul kann eine Bibel, ein Kommentar oder ein Lexicon sein. Später werden wir Karten und andere interessante Dinge haben. Es ist nicht möglich mit &bibletime; zu arbeiten, wenn keine Module installiert sind, obwohl es möglich ist &bibletime; ohne installiert Module zu testen. Wenn Module in &bibletime; angezeigt werden, nennen wir sie Dokumente. </para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para
-> Wie löse ich dieses Problem? </para>
-</question>
-<answer>
-<para
->Bitte laden Sie einige Module herunter und installieren Sie diese! Sie bekommen die Module unter <ulink url="http://www.crosswire.org"
->www.crosswire.org</ulink
->. Bitte lesen Sie die Installationsanweisungen. </para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para
-> Was soll ich machen, wenn es nicht funktioniert? </para>
-</question>
-<answer>
-<para
-> Bitte lesen Sie die Dokumentation auf <ulink url="http://www.bibletime.de"
->www.bibletime.de</ulink
->. Falls Sie es nicht zum Funktionieren bekommen, schicken Sie bitte eine eMail an <ulink url="mailto:info@bbibletime.de"
->info@bibletime.de </ulink
->. </para>
-</answer>
-</qandaentry>
-</qandaset>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/help-sword-module-trouble.docbook b/bibletime-doc/docs/de/helpdialog/unicode/help-sword-module-trouble.docbook
deleted file mode 100644
index 6c50aca..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/help-sword-module-trouble.docbook
+++ /dev/null
@@ -1,12 +0,0 @@
-<chapter id="help-sword-module-trouble">
-<title
->Sword.</title>
-<para
->Das Sword Modul konnte nicht geöffnet werden. Dieser Fehler wird normalerweise durch ein veraltetes oder beschädigtes Modul verursacht. Bitte besuchen Sie die <ulink url="http://www.crosswire.org"
->Crosswire Bible Society</ulink
->, um ein Update des Moduls zu erhalten.</para>
-<note
-> <para
->Momentan kann Sword dieses Problem nicht abfangen. &bibletime; und Sword stürzen ohne Fehlermeldung ab. </para
-> </note>
-</chapter>
diff --git a/bibletime-doc/docs/de/helpdialog/unicode/index.docbook b/bibletime-doc/docs/de/helpdialog/unicode/index.docbook
deleted file mode 100644
index 1cf7733..0000000
--- a/bibletime-doc/docs/de/helpdialog/unicode/index.docbook
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE"
-><!-- change language only here -->
-
-  <!-- user entities -->
-  <!-- application name entities -->
-  <!ENTITY bibletime '<application
->BibleTime</application
->'>
-  <!ENTITY sword '<application
->Sword</application
->'>
-  <!ENTITY swordInstmgr '<application
->Sword Installmgr</application
->'>
-  <!ENTITY crosswire '<application
->Crosswire Bible Society</application
->'>
-
-  <!-- called file entities -->
-  <!ENTITY hdchap1 SYSTEM "help-first-startup.docbook">
-  <!ENTITY hdchap2 SYSTEM "help-first-time-search.docbook">
-  <!ENTITY hdchap3 SYSTEM "help-initbackend-failed.docbook">
-  <!ENTITY hdchap4 SYSTEM "help-module-encrypted.docbook">
-  <!ENTITY hdchap5 SYSTEM "help-sword-module-trouble.docbook">
-  <!ENTITY hdchap6 SYSTEM "help-no-mods-d.docbook">
-  <!ENTITY hdchap7 SYSTEM "help-no-modules.docbook">
-
-]>
-
-<book lang="&language;">
-
-<bookinfo>
-<title
->&bibletime; Hilfe</title>
-
-<authorgroup>
-<author
-> <firstname
->Fred</firstname
-> <othername
-></othername
-> <surname
->Saalbach</surname
-> <affiliation
-> <address
-><email
->info@bibletime.de</email
-></address
-> </affiliation
-> </author>
-<author
-> <firstname
->Jeffrey</firstname
-> <surname
->Hoyt</surname
-> </author>
-</authorgroup>
-
-ROLES_OF_TRANSLATORS
-
-<copyright>
-<year
->1999</year>
-<year
->2000</year>
-<year
->2001</year>
-<holder
->Das &bibletime;-Team, info@bibletime.de</holder>
-</copyright>
-
-<legalnotice>
-
-<para
->Der &bibletime; Hilfedialog ist Teil von &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
->12/18/2001</date>
-<releaseinfo
->1.01.00</releaseinfo>
-
-<abstract>
-<para
-> &bibletime; ist eine in der Studie der Bibel zu helfende Anwendung. </para>
-</abstract>
-
-<keywordset>
-<application
->KDE</application>
-<keyword
->Bibletime</keyword>
-<keyword
->Sword</keyword>
-<keyword
->Crosswire Bible Society</keyword>
-<keyword
->Hilfedialog</keyword>
-</keywordset>
-
-</bookinfo>
-
-&hdchap1;
-&hdchap2;
-&hdchap3;
-&hdchap4;
-&hdchap5;
-&hdchap6;
-&hdchap7;
-
-</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/bibletime-doc/docs/de/howto/Makefile.am b/bibletime-doc/docs/de/howto/Makefile.am
deleted file mode 100644
index 6e5e2e3..0000000
--- a/bibletime-doc/docs/de/howto/Makefile.am
+++ /dev/null
@@ -1,39 +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 = html unicode 
-
-po-files:
-	for f in `ls ../../en/howto/pot/*.pot`; do \
-		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/howto\/pot\/"//`; \
-		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \
-		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \
-		msgmerge -o po/$$pofile.new po/$$pofile $$f; \
-		if diff po/$$pofile po/$$pofile.new > /dev/null; then \
-		rm po/$$pofile.new; \
-		else \
-		mv po/$$pofile.new po/$$pofile; \
-		fi; \
-	done;
-
-
-unicode-files:
-	for f in `ls ../../en/howto/unicode/*.docbook`; do \
-		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/howto\/unicode\/"//`; \
-		newfile=`echo $$f | sed s/"..\/..\/en\/howto\/unicode\/"//`; \
-		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \
-		po2xml $$f po/$$pofile > unicode/$$newfile; \
-	done;
-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/bibletime-doc/docs/de/howto/Makefile.in b/bibletime-doc/docs/de/howto/Makefile.in
deleted file mode 100644
index 3bc2e17..0000000
--- a/bibletime-doc/docs/de/howto/Makefile.in
+++ /dev/null
@@ -1,495 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = html unicode 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/howto/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/howto
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/howto/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-po-files:
-	for f in `ls ../../en/howto/pot/*.pot`; do \
-		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/howto\/pot\/"//`; \
-		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \
-		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \
-		msgmerge -o po/$$pofile.new po/$$pofile $$f; \
-		if diff po/$$pofile po/$$pofile.new > /dev/null; then \
-		rm po/$$pofile.new; \
-		else \
-		mv po/$$pofile.new po/$$pofile; \
-		fi; \
-	done;
-
-unicode-files:
-	for f in `ls ../../en/howto/unicode/*.docbook`; do \
-		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/howto\/unicode\/"//`; \
-		newfile=`echo $$f | sed s/"..\/..\/en\/howto\/unicode\/"//`; \
-		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \
-		po2xml $$f po/$$pofile > unicode/$$newfile; \
-	done;
-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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/howto/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/howto/html/Makefile.am b/bibletime-doc/docs/de/howto/html/Makefile.am
deleted file mode 100644
index c5601ff..0000000
--- a/bibletime-doc/docs/de/howto/html/Makefile.am
+++ /dev/null
@@ -1,5 +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/bibletime-doc/docs/de/howto/html/Makefile.in b/bibletime-doc/docs/de/howto/html/Makefile.in
deleted file mode 100644
index 55242ab..0000000
--- a/bibletime-doc/docs/de/howto/html/Makefile.in
+++ /dev/null
@@ -1,364 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=h2-rules-context.html h2-importance.html h2-importance-exhortations.html h2-basics-interpretation.html h2-basics.html h2-importance-wars.html h2-basics-worksheet.html h2-rules.html h2-importance-liberates.html index.html h2-basics-expository.html h2-rules-normal.html h2-basics-approaches.html h2-importance-breathed.html h2-importance-once.html h2-basics-types.html h2-rules-parables.html h2-rules-hcontest.html h2-importance-supplement.html h2-importance-works.html 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/html/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/howto/html/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/howto/html
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/howto/html/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/howto/html/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/howto/html/h2-basics-approaches.html b/bibletime-doc/docs/de/howto/html/h2-basics-approaches.html
deleted file mode 100644
index a5f336c..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-basics-approaches.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Ann�herung an Gottes Wort</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Grundlagen des Bibelstudiums"><link rel="previous" href="h2-basics.html" title="Chapter 2. Grundlagen des Bibelstudiums"><link rel="next" href="h2-basics-types.html" title="Arten des Bibelstudiums"></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>Ann�herung an Gottes Wort</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Grundlagen des Bibelstudiums</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"><a name="h2-basics-approaches"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-approaches"></a>Ann�herung an Gottes Wort</h2></div></div><p>H�ren und Lesen geben eine �bersicht �ber die Schrift, w�hrend das Studieren und Auswendiglernen eine Detailsicht der Schrift gibt. Das Nachdenken �ber die Schriften vereinigt das H�ren, Lesen, Studieren und Ausweniglernen und verfestigt die Worte in unseren K�pfen.</p><div class="section"><a name="h2-basics-approaches-hear"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-hear"></a>H�ren </h3></div></div><p>Lukas 11,28 <i>&#8220;Er aber sprach: Ja selig sind die, die das Wort Gottes h�ren und bewahren.&#8221;</i></p></div><div class="section"><a name="h2-basics-approaches-read"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-read"></a>Lesen </h3></div></div><p>Offenbarung 1,3 <i>&#8220;Selig ist, der da liest und die da h�ren die Worte der Weissagung und behalten, was darin geschrieben ist; denn die Zeit ist nahe.&#8221;</i></p><p>1. Timotheus 4,13<i>&#8220;Fahre fort mit Vorlesen, mit Ermahnen, mit Lehren, bis ich komme. &#8221;</i></p></div><div class="section"><a name="h2-basics-approaches-study"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-study"></a>Studieren </h3></div></div><p>Apostelgeschichte 17,11 <i>&#8220;Diese aber waren freundlicher als die in Thessalonich; sie nahmen das Wort bereitwillig auf und forschten t�glich in der Schrift, ob sich's so verhielte.&#8221;</i></p><p>2. Timotheus 2,15 <i>&#8220;Bem�he [in der engl. KJV `Study'] dich darum, dich vor Gott zu erweisen als einen rechtschaffenen und untadeligen Arbeiter Arbeiter, der das Wort der Wahrheit recht austeilt. &#8221;</i></p></div><div class="section"><a name="h2-basics-approaches-memorize"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-memorize"></a>Auswendiglernen </h3></div></div><p>Psalm 119,11 <i>&#8220;Ich behalte dein Wort in meinem Herzen;/ lass mich nicht abirren von deinen Geboten&#8221;</i></p></div><div class="section"><a name="h2-basics-approaches-meditate"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-meditate"></a>Nachdenken</h3></div></div><p>Psalmen 1,2-3 <i>&#8220;Sondern hat Lust am Gesetz des Herrn / und sinnt �ber seinem Gesetz Tag und Nacht! Der ist wie ein Baum, gepflanzt an Wasserb�chen, der seine Frucht bringt zu seiner Zeit, und seine Bl�tter verwelken nicht. / Und was er macht, das ger�t wohl.&#8221;</i></p><p>Die Seeleute verdeutlichen dies, indem sie sagen, dass der Daumen alle Finger ber�hren kann, wir k�nnen �ber Gottes Wort nachdenken w�hrend wir eins der ersten vier Dinge tun. Dar�ber nachzudenken ist ein Schl�ssel zur Offenbarung. Ein junger Christ muss die Bibel mehr h�ren und lesen als sie zu studieren und Dinge zu lernen. Durch diese Vorgehensweis werden sie mit der allumfassenden Botschaft  der Bibel vetraut. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Grundlagen des Bibelstudiums�</td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right">�Arten des Bibelstudiums</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-basics-expository.html b/bibletime-doc/docs/de/howto/html/h2-basics-expository.html
deleted file mode 100644
index 3539fdd..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-basics-expository.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><title>Eine Textauszugsstudie von Matth�us 6,1-18</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Grundlagen des Bibelstudiums"><link rel="previous" href="h2-basics-interpretation.html" title="Grundlagen einer richtiger Auslegung"><link rel="next" href="h2-basics-worksheet.html" title="Arbeitsblatt: Wie man eine Konkordanz benutzt"></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>Eine Textauszugsstudie von Matth�us 6,1-18</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Grundlagen des Bibelstudiums</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"><a name="h2-basics-expository"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-expository"></a>Eine Textauszugsstudie von Matth�us 6,1-18</h2></div></div><p>Lass uns Matth�us 6,1-18 zusammen studieren. Lesen Sie den Text durch. Sehen Sie dabei zuerst nach den Schl�sselversen, d.h. nach den Versen, die den gesamten Abschnitt zusammenfassen. Denken Sie, dass sie fertig sind? Testen sie es, indem sie verschiedene Stellen heraussuchen und dann �berlegen ob diese zum Gedanken des Schl�sselverses passen. Wenn Sie ihn gefunden haben, schreiben Sie ihn als R�mische Zahl 1 ihrer �bersicht:</p><pre class="screen">
-I. H�TE DICH DAVOR, DEINE RECHTSCHAFFENHEIT VOR ANDEREN AUSZU�BEN UM BEMERKT ZU WERDEN
-</pre><p>Was bedeutet &quot;Rechtschaffenheit aus�ben&quot;? Gibt der Text irgendwelche Beispiele? Welcher Lebensbereich wird behandelt? Unsere Motive! Welche Untertitel entwickeln diesen Gedanken?</p><pre class="screen">
-  A. Wenn du spendest
-  B. Wenn du fastest
-  C. Wenn du betest
-</pre><p>F�llen Sie jetzt die �bersicht mit spezifischen Anweisungen, wie man falsche Wege seine Rechtsschaffenheit auszu�ben vermeiden kann:</p><pre class="screen">
-  A. Wenn du gibst
-     1. BLASE KEINE TROMPETE. (WIE K�NNTE JEMAND HEUTE &quot;EINE TROMPETE BLASEN&quot;?)
-     2. GIB IM VERBORGENEN. USW.
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Grundlagen einer richtiger Auslegung�</td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right">�Arbeitsblatt: Wie man eine Konkordanz benutzt</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-basics-interpretation.html b/bibletime-doc/docs/de/howto/html/h2-basics-interpretation.html
deleted file mode 100644
index 94f3b7c..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-basics-interpretation.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Grundlagen einer richtiger Auslegung</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Grundlagen des Bibelstudiums"><link rel="previous" href="h2-basics-types.html" title="Arten des Bibelstudiums"><link rel="next" href="h2-basics-expository.html" title="Eine Textauszugsstudie von Matth�us 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>Grundlagen einer richtiger Auslegung</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Grundlagen des Bibelstudiums</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"><a name="h2-basics-interpretation"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-interpretation"></a>Grundlagen einer richtiger Auslegung</h2></div></div><div class="section"><a name="h2-basics-interpretation-content"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-interpretation-content"></a>Inhalt</h3></div></div><p>Was sagt es aus? Was sagt es in der urspr�nglichen Sprache aus? Seien Sie vorsichtig mit Definitionen. Lesen Sie nicht hinein, was nicht ausgesagt wird.</p></div><div class="section"><a name="h2-basics-interpretation-context"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-interpretation-context"></a>Kontext</h3></div></div><p>Kontext.</p></div><div class="section"><a name="h2-basics-interpretation-cross"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-interpretation-cross"></a>Querverweise</h3></div></div><p> Was sagen andere Verse �ber dieses Thema in anderen Teilen der Bibel aus? Gott widerspricht sich nicht selbst, deshalb muss unsere Auslegung den Test durch andere Stellen bestehen.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Arten des Bibelstudiums�</td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right">�Eine Textauszugsstudie von Matth�us 6,1-18</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-basics-types.html b/bibletime-doc/docs/de/howto/html/h2-basics-types.html
deleted file mode 100644
index 6131b50..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-basics-types.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Arten des Bibelstudiums</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Grundlagen des Bibelstudiums"><link rel="previous" href="h2-basics-approaches.html" title="Ann�herung an Gottes Wort"><link rel="next" href="h2-basics-interpretation.html" title="Grundlagen einer richtiger Auslegung"></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>Arten des Bibelstudiums</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Grundlagen des Bibelstudiums</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"><a name="h2-basics-types"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-types"></a>Arten des Bibelstudiums</h2></div></div><div class="section"><a name="basics-types-topical"></a><div class="titlepage"><div><h3 class="title"><a name="basics-types-topical"></a>Thematische Studie</h3></div></div><p>Suchen Sie sich ein bestimmtes Thema heraus und folgen Sie ihm unter Benutzung von Querverweisen oder einer Konkordanz.</p></div><div class="section"><a name="h2-basics-types-character"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-types-character"></a>Charakterstudie</h3></div></div><p>Das Studieren des Lebens einer Person der Bibel, z.B. Josephs Leben in 1. Mose 37-50</p></div><div class="section"><a name="basics-types-expository"></a><div class="titlepage"><div><h3 class="title"><a name="basics-types-expository"></a>Textauszugsstudie</h3></div></div><p>Studieren eines Absatzes, Kapitels oder Buches.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Ann�herung an Gottes Wort�</td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right">�Grundlagen einer richtiger Auslegung</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-basics-worksheet.html b/bibletime-doc/docs/de/howto/html/h2-basics-worksheet.html
deleted file mode 100644
index d3e75ae..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-basics-worksheet.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><head><title>Arbeitsblatt: Wie man eine Konkordanz benutzt</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Grundlagen des Bibelstudiums"><link rel="previous" href="h2-basics-expository.html" title="Eine Textauszugsstudie von Matth�us 6,1-18"><link rel="next" href="h2-rules.html" title="Chapter 3. Regeln der Bibelauslegung (Hermeneutik)"></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>Arbeitsblatt: Wie man eine Konkordanz benutzt</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Grundlagen des Bibelstudiums</td><td align="right" class="right"><a accesskey="n" href="h2-rules.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="h2-basics-worksheet"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-worksheet"></a>Arbeitsblatt: Wie man eine Konkordanz benutzt</h2></div></div><div class="section"><a name="h2-basics-worksheet-select"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-worksheet-select"></a>Um einen speziellen Vers zu finden</h3></div></div><div class="orderedlist"><ol type="1"><li><p><a name="id2738399"></a>Suchen Sie sich das Schl�sselwort oder das ungew�hnlichste Wort des Verses heraus.</p></li><li><p><a name="id2738408"></a>Schlagen Sie dieses Wort alphabetisch nach.</p></li><li><p><a name="id2738414"></a>Gehen Sie die Spalte der Auflistung durch, bis Sie ihren Vers finden.</p></li></ol></div><pre class="screen">
-	Finde diese Verse:
-		&quot;Die Schl�ge des Freundes meinen es gut.&quot;
-		&quot;Wir sind die Botschafter Christi.&quot;
-		Die Geschichte �ber den Reichen Mann und Lazarus.
-</pre></div><div class="section"><a name="h2-basics-worksheet-study"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-worksheet-study"></a>Eine thematische Studie durchf�hren </h3></div></div><p>Lassen Sie uns von der Annahme ausgehen, dass sie eine Studie des Wortes &quot;Erl�sung&quot; machen m�chten. Als erstes w�rden Sie das Wort in der Konkordanz nachschlagen und die aufgelisteten Stellen nachschlagen. Dann k�nnten Sie verwandte Worte und die f�r sie angegebenen Stellen nachschlagen , z.B. &quot;erl�sen, erl�st, L�segeld&quot;, sogar &quot;kaufen&quot; oder &quot;erkauft&quot;. </p></div><div class="section"><a name="h2-basics-worksheet-clarify"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-worksheet-clarify"></a>Wortbedeutungen im Griechischen oder Hebr�ischen klarstellen</h3></div></div><p>Was w�re, wenn Sie einen Widerspruch zwischen Matth�us 7,1 &quot;Richtet nicht, damit ihr nicht gerichtet werdet&quot; und 1. Korinther 2,15 (Lutherbibel von 1545) &quot;Der Geistliche aber richtet alles und wird von niemand gerichtet.&quot; entdecken w�rden? Vielleicht wurden hier zwei verschiedene griechische W�rter benutzt, die beide mit &quot;richten&quot; im Deutschen �bersetzt wurden? (Wir benutzen ab jetzt Strongs Nummern). </p><div class="orderedlist"><ol type="1"><li><p><a name="id2738493"></a>Schlagen Sie nun &quot;richten&quot; nach.</p></li><li><p><a name="id2738499"></a>Gehen Sie die Spalte der Eintr�ge bis Matth�us 7,1 durch. Rechts steht eine Nummer: 2919. Diese bezieht sich auf das verwendete griechische Wort. Schreiben Sie es auf.</p></li><li><p><a name="id2738510"></a>Schlagen Sie nun &quot;richten&quot; nach.</p></li><li><p><a name="id2738516"></a>Gehen Sie die Spalte bis 1. Korinther 2,15 durch . . . . . 350.</p></li><li><p><a name="id2738523"></a>Benutzen Sie nun ein Griechisch Lexikon (Erinnern Sie sich: Sie sind im NT, also ist die Sprache Griechisch, w�hrend das AT in Hebr�isch ist). Vergleichen Sie die Bedeutung von 2219 mit der Bedeutung von 350 und Sie haben ihre Antwort! </p></li></ol></div></div><div class="section"><a name="h2-basics-worksheet-names"></a><div class="titlepage"><div><h3 class="title"><a name="h2-basics-worksheet-names"></a>Die Bedeutung von Namen finden</h3></div></div><p>Mit den selben Schritten k�nnen wir die Bedeutung von griechischen oder Hebr�ischen Namen finden.</p><p>Schlagen Sie die folgenden Namen nach und schreiben Sie deren Bedeutung auf:</p><div class="itemizedlist"><ul><li><p><a name="id2738568"></a>Nabal </p></li><li><p><a name="id2738575"></a>Abigail </p></li><li><p><a name="id2738581"></a>Joshua </p></li><li><p><a name="id2738587"></a>Barnabas</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Eine Textauszugsstudie von Matth�us 6,1-18�</td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right">�Regeln der Bibelauslegung (Hermeneutik)</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-basics.html b/bibletime-doc/docs/de/howto/html/h2-basics.html
deleted file mode 100644
index f9046cd..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-basics.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><head><title>Chapter 2. Grundlagen des Bibelstudiums</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="index.html" title="Das Biblestudy HowTo"><link rel="previous" href="h2-importance-supplement.html" title="Anhang: Bibellesepl�ne"><link rel="next" href="h2-basics-approaches.html" title="Ann�herung an Gottes Wort"></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>Grundlagen des Bibelstudiums</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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. Grundlagen des Bibelstudiums</h2></div></div><div class="section"><a name="h2-basics-purpose"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-purpose"></a>Unsere Absicht, wenn wir uns der Bibel ann�hern</h2></div></div><p> Johannes 5,39-40<i>&quot;Ihr sucht in der Schrift, denn ihr meint, ihr habt das ewige Leben darin; und sie ist's die von mir zeugt; aber ihr wollt nicht zu mir kommen, dass ihr das Leben h�ttet.&quot;</i> </p><p>Die Hauptabsicht des Buches ist es uns zu der Person zu bringen. Martin Luther sagte &#8220;Wir gehen nur zur Wiege um des Kindes willen&#8221;; genauso ist es mit dem Bibelstudium, wir tun es nicht um unser selbst willen, sondern wegen der Kameradschaft mit Gott. </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>Die Juden, zu denen Jesus sprach [...] glaubten, dass das Besitzen der Schrift gleichbedeutend dem Besitzen des Lebens war. Hillel pflegte zu sagen, &#8216;He who has gotten to himself words of Torah has gotten to himself the life of the world to come.&#8217; Ihr Studium war in sich zu Ende. Hier wurden sie schmerzhaft get�uscht.</p><p>Es gibt weder Verdienst noch Profit beim Lesen der Schrift als Selbstzweck, nur wenn sie uns wirkungsvoll auf Jesus Christus hinf�hrt. Jedesmal wenn wenn wir die Bibel lesen brauchen wir die eifrige Erwartung, durch sie Christus zu finden.</p></td><td width="10%" valign="top">�</td></tr><tr><td colspan="2" align="right" valign="top">--<span class="attribution">John R.W. Stott, <i>Christ the
-Controversialist</i>, 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Anhang: Bibellesepl�ne�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Ann�herung an Gottes Wort</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-importance-breathed.html b/bibletime-doc/docs/de/howto/html/h2-importance-breathed.html
deleted file mode 100644
index 2597df3..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-importance-breathed.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><head><title>Ein Buch, das Gott eingegeben hat</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"><link rel="previous" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"><link rel="next" href="h2-importance-works.html" title="Ein Buch, das arbeitet"></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>Ein Buch, das Gott eingegeben hat</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Wert des Wortes des Gottes</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"><a name="h2-importance-breathed"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-breathed"></a>Ein Buch, das Gott eingegeben hat</h2></div></div><p><i>Heb.4,12 &#8216; Denn das Wort Gottes ist lebendig und kr�ftig...&#8217;</i>, Jesus sagte <i>(Mt. 4,4), &#8216;Er aber antwortete und sprach: Es steht geschrieben: &quot;Der Mensch lebt nicht vom Brot allein, sondern von einem jeden Wort, das aus den Mund Gottes geht.&quot; &#8217;</i> Wenn wir die Bibel lesen ist Gottes Geist da, um es in unsere Herzen hinein zu legen in einer immerwieder frischen Art. </p><p>2. Timotheus 3:16 erkl�rt <i>&#8216;Denn alle Schrift, von Gott eingegeben [w�rtlich Gott-gehaucht].&#8217;</i> Glauben Sie das? Bevor Sie antworten, ziehen Sie Jesu' Einstellung bez�glich der Schrift in Betracht. </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>Er bezog sich auf die menschlichen Autoren, aber aktzeptierte es als Tatsache, dass hinter ihnen allen ein g�ttlicher Autor stand. Er konnte sowohl 'Mose sagt' als auch 'Gott sagte' sagen (Markus 7,10). Er konnte einen Kommentar des Erz�hlers in 1. Mose 2,24 als einen Ausspruch des Sch�pfers selbst zitieren (Matth�us 19,4-5). �hnlich sagt Er 'Wie fein hat von euch Heuchlern Jesaja geweissagt, wie geschrieben steht', und das, was er weiter zitierte, war die direkte Rede Gottes, des Herrn (Markus 7,6 &amp; Jesaja 29,13). Durch Jesus selbst Jesus haben die Autoren des neuen Testamentes ihre �berzeugung der doppelten Urheberschaft der Schrift. F�r sie wahr es genauso richtig zu sagen 'Nachdem Gott vorzeiten vielfach und auf vielerlei Weise geredet hat zu den V�tern durch die Propheten' (Hebr�er 1,1) wie 'getrieben von dem heiligen Geist haben Menschen im Namen Gottes geredet' (2. Petrus 1,21) zu sagen. Gott hat weder in dieser Art und Weise gesprochen um die Pers�nlichkeit des menschlichen Autoren zu tilgen, noch haben M�nner in dieser Art und Weise gesprochen um das Wort des g�ttlichen Autoren zu zerst�ren. God sprach. M�nner sprachen. Keiner der beiden Wahrheiten ist es erlaubt von der anderen abzulenken. ... </p><p> Dies war Christi Auffassung der Schriften. Ihr Zeuge war Gottes Zeuge. Das Zeugnis der Bibel ist das Zeugnis Gottes. Und der Hauptgrund, warum Christen an den g�ttlichen Ursprung der Bibel glauben ist, dass Jesus Christus selbst sie gelehrt hat. </p></td><td width="10%" valign="top">�</td></tr><tr><td colspan="2" align="right" valign="top">--<span class="attribution">John R.W. Stott, <i>Christ the Controversialist</i>,
-InterVarsity Press 1978, pp.93-95 </span></td><td width="10%" valign="top">�</td></tr></table><p>2. Timotheus 3,16 geht noch weiter: <i>&#8216;ist n�tze zur Lehre, zur Zurechtweisung, zur Besserung, zur Erziehung in der Gerechtigkeit, dass der Mensch Gottes vollkommen sei, zu allem guten Werk geschickt. &#8217;</i> Wenn wir aktzeptieren, dass die Bibel wirklich Gottes Reden zu uns ist, wird die Folge daraus sein, dass sie unsere Autorit�t in allen Dingen des Glaubens und Wandels ist. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Wert des Wortes des Gottes�</td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right">�Ein Buch, das arbeitet</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-importance-exhortations.html b/bibletime-doc/docs/de/howto/html/h2-importance-exhortations.html
deleted file mode 100644
index 0714627..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-importance-exhortations.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Ermahnungen</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"><link rel="previous" href="h2-importance-wars.html" title="Ein Buch, das Krieg f�hrt"><link rel="next" href="h2-importance-once.html" title="Anhang: &#8220;Einer f�r Alle&#8221;"></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>Ermahnungen</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Wert des Wortes des Gottes</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"><a name="h2-importance-exhortations"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-exhortations"></a>Ermahnungen</h2></div></div><p> 2. Thimotheus 2,15<i>&#8216;Bem�he dich darum, dich vor Gott zu erweisen als einen rechtschaffenen und untadeligen Arbeiter, der das Wort der Wahrheit recht austeilt.&#8217;</i> </p><p> Kollosser 3,16<i>&#8216; La�t das Wort Christi reichlich unter euch wohnen: lehrt und ermahnt einander in aller Weisheit; mit Psalmen, Lobges�ngen und geistlichen Liedern singt Gott dankbar in euren Herzen. &#8217;</i> </p><p>Wen Sie in etwas reich sind, wie viel haben Sie dann davon? </p><p> Nicht wenig!</p><p> Prediger 12,11+12 <i>&#8216;Die Worte der Weisen sind wie Stacheln, und wie eingeschlagene N�gel sind die einzelnen Spr�che; sie sind von einem Hirten gegeben. Und �ber dem allen, mein Sohn, la� dich warnen; denn des vielen B�chermachens ist kein Ende, und viel Studieren macht den Leib m�de. &#8217;</i> </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Ein Buch, das Krieg f�hrt�</td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right">�Anhang: &#8220;Einer f�r Alle&#8221;</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-importance-liberates.html b/bibletime-doc/docs/de/howto/html/h2-importance-liberates.html
deleted file mode 100644
index 58fbc96..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-importance-liberates.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Ein Buch, das befreit</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"><link rel="previous" href="h2-importance-works.html" title="Ein Buch, das arbeitet"><link rel="next" href="h2-importance-wars.html" title="Ein Buch, das Krieg f�hrt"></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>Ein Buch, das befreit</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Wert des Wortes des Gottes</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"><a name="h2-importance-liberates"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-liberates"></a>Ein Buch, das befreit</h2></div></div><p> Johanner 8,32 <i>&#8216;und werdet die Wahrheit erkennen, und die Wahrheit wird euch frei machen. &#8217;</i> Dies wird normalerweise durch sich selbst zitiert. Ist die ein bedingtes oder ein unbedingtes Versprechen? Findet es Anwendung auf alle Arten von Weisheit? Finden Sie die Antwort heraus, indem Sie die erste H�lfte des Satzes in Vers 31 untersuchen <i>&#8216;Wenn ihr bleiben werdet in meinem Wort, so seid ihr Warhaftig meine J�nger...&#8217;</i></p><p>Wir sehen, dass es ein bedingtes Versprechen ist, dass speziell von der Wahrheit Gottes Wortes spricht.</p><p>Das griechische Wort f�r &quot;Wind&quot;, welches in Eph. 4:14 benutzt wird, meint einen <i>gewaltsamen Wind</i>. <i>Als Folge sind wir nicht l�nger Kinder, hin- und hergeworfen von den Wellen und bewegt von jedem Wind der Lehre [...]</i>. Eine Sache, die das Studieren der Bibel in uns bewirkt ist ,dass sie uns in der Wahrheit verwurzelt, mit der Folge, dass wir nicht leicht &#8220;weggeblasen werden&#8221;.</p><p><i>Jesus aber antwortete und sprach zu ihnen, &#8216;Ihr irrt, weil ihr weder die Schrift kennt noch die Kraft Gottes.&#8217;</i> Matth�us 22,29</p><p>Welche beiden Dinge m�ssen wir kennen, um von Fehlern abgehalten zu werden?</p><div class="itemizedlist"><ul><li><p><a name="id2798920"></a>Gottes Wort</p></li><li><p><a name="id2798926"></a>Gottes Kraft </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Ein Buch, das arbeitet�</td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right">�Ein Buch, das Krieg f�hrt</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-importance-once.html b/bibletime-doc/docs/de/howto/html/h2-importance-once.html
deleted file mode 100644
index c185efc..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-importance-once.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><head><title>Anhang: &#8220;Einer f�r Alle&#8221;</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"><link rel="previous" href="h2-importance-exhortations.html" title="Ermahnungen"><link rel="next" href="h2-importance-supplement.html" title="Anhang: Bibellesepl�ne"></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>Anhang: &#8220;Einer f�r Alle&#8221;</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Wert des Wortes des Gottes</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"><a name="h2-importance-once"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-once"></a>Anhang: &#8220;Einer f�r Alle&#8221;</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>Die Wahrheit betreffend der Endg�ltigkeit Gottes Initiative in Christus wird durch ein Wort des Griechischen Testamentes ausgedr�ckt, n�mlich durch das Adverb <i>hapax</i> und <i>ephapax</i>. Es wird normalerweise in der &quot;Authorized Version&quot; mit &quot;einmal&quot; �bersetzt, in der Bedeutung von &quot;einmal f�r immer&quot; [<i>Anm. d. �bers.: eng. &quot;once for all&quot; kann auch als &quot;entg�ltig&quot; �bersetzt werden</i>]. Es wird f�r das benutzt, was ewige G�ltigkeit hat und niemals Wiederholung ben�tigt und es wird im Neuen Testament auf Offenbarung und Erl�sung angewandt. Folglich bezieht sich Judas auf den Glauben, der einmal f�r immer den Heiligen �bergeben wurde (Judas 3), und R�mer sagt <i>&#8220;Denn was er gestorben ist, das ist er der S�nde ein f�r allemal [...]&#8221;</i> (R�mer 6,10, siehe auch 1. Petrus 3,18; Hebr�er 9,26-28). </p><p> Folglich k�nnen wir sagen, dass Gott einmal f�r immer gesprochen hat und das Christus einmal f�r immer gelitten hat. Dies bedeutet, dass die christliche Offenbarung und die christliche Erl�sung gleicherweise in Christus erf�llt sind. Nichts kann zu beiden hinzugef�gt werden ohne schadend f�r Christus zu sein... Die beiden Fundamente [<i>Anm. d. �bers. eigentlich rock = Felsen</i>] auf die die protestantische Reformation aufgebaut wurde sind -- Gottes offenbartes Wort ohne den Erg�nzungen menschlicher Traditionen und Christi vollendetes Werk ohne den Erg�nzungen menschlicher Verdienste. Die gro�en Losungen der Reformer waren <i>sola scriptura</i> f�r die Autorit�t und <i>sola gratia</i> f�r unsere Erl�sung.</p></td><td width="10%" valign="top">�</td></tr><tr><td colspan="2" align="right" valign="top">--<span class="attribution">John R. W. Stott, <i>Christ the Controversialist,</i>
-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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Ermahnungen�</td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right">�Anhang: Bibellesepl�ne</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-importance-supplement.html b/bibletime-doc/docs/de/howto/html/h2-importance-supplement.html
deleted file mode 100644
index 30151e9..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-importance-supplement.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Anhang: Bibellesepl�ne</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"><link rel="previous" href="h2-importance-once.html" title="Anhang: &#8220;Einer f�r Alle&#8221;"><link rel="next" href="h2-basics.html" title="Chapter 2. Grundlagen des Bibelstudiums"></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>Anhang: Bibellesepl�ne</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Wert des Wortes des Gottes</td><td align="right" class="right"><a accesskey="n" href="h2-basics.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="h2-importance-supplement"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-supplement"></a>Anhang: Bibellesepl�ne</h2></div></div><p> Hier sind einige einfache Programme f�r Sie, um systematisch ihre Bibel zu lesen. Sie k�nnen mehrere gleichzeitig durchf�hren, so zum Beispiel #1 mit #4 oder #2 mit #5. Ver�ndern Sie das Programm von Jahr zu Jahr um es frisch zu halten. </p><div class="orderedlist"><ol type="1"><li><p><a name="id2736628"></a>Das neue Testament in einem Jahr: Lesen Sie jeden Tag ein Kapitel, f�nf Tage die Woche.</p></li><li><p><a name="id2736618"></a> Die Spr�che in einem Monat: Lesen Sie jeden Tag ein Kapitel der Spr�che, dem aktuellen Tag des Monats entsprechend.</p></li><li><p><a name="id2736643"></a>Die Psalmen in einem Monat: Lesen Sie t�glich 5 Psalmen in einem Intervall von 30, am 20. m�ssten Sie zum Beispiel die Psalmen 20,50,80,110 &amp; 140 lesen.</p></li><li><p><a name="id2736651"></a>Psalme &amp; Spr�che in 6 Monaten: Lesen Sie sich durch die Psalmen und Spr�che mit einem Kapitel t�glich.</p></li><li><p><a name="id2736661"></a>Das alte Testament ohne Psalmen und Spr�chen in 2 Jahren: Wenn Sie t�glich ein Kapitel lesen und wenn sie die Psalmen und Spr�che auslassen, werden Sie das alte Testament in 2 Jahren und 2 Wochen durchlesen. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Anhang: &#8220;Einer f�r Alle&#8221;�</td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right">�Grundlagen des Bibelstudiums</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-importance-wars.html b/bibletime-doc/docs/de/howto/html/h2-importance-wars.html
deleted file mode 100644
index 81646c1..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-importance-wars.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Ein Buch, das Krieg f�hrt</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"><link rel="previous" href="h2-importance-liberates.html" title="Ein Buch, das befreit"><link rel="next" href="h2-importance-exhortations.html" title="Ermahnungen"></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>Ein Buch, das Krieg f�hrt</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Wert des Wortes des Gottes</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"><a name="h2-importance-wars"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-wars"></a>Ein Buch, das Krieg f�hrt</h2></div></div><p> Epheser 6,10-18 ist ein Bild f�r unsere geistliche Bewaffnung.</p><div class="table"><p><a name="id2798954"></a><b>Table 1.3. Geistliche R�stung</b></p><table summary="Geistliche R�stung" border="1"><colgroup><col><col></colgroup><thead><tr><th>Frage</th><th>Antwort</th></tr></thead><tbody><tr><td>Wie viele der aufgelisteten Waffen sind Verteidigungswaffen?</td><td>5</td></tr><tr><td>Wie viele sind Angriffswaffen?</td><td>Eine</td></tr><tr><td>Welche? </td><td>das Wort - <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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Ein Buch, das befreit�</td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right">�Ermahnungen</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-importance-works.html b/bibletime-doc/docs/de/howto/html/h2-importance-works.html
deleted file mode 100644
index 840b406..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-importance-works.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Ein Buch, das arbeitet</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"><link rel="previous" href="h2-importance-breathed.html" title="Ein Buch, das Gott eingegeben hat"><link rel="next" href="h2-importance-liberates.html" title="Ein Buch, das befreit"></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>Ein Buch, das arbeitet</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Wert des Wortes des Gottes</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"><a name="h2-importance-works"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-works"></a>Ein Buch, das arbeitet</h2></div></div><p> Was wird das Studium der Bibel f�r sie tun? 1. Thessalonicher 2,14 sagt, dass die Bibel <i>&#8216; auch wirkt in euch, die ihr glaubet.&#8217; </i> Schreiben Sie neben jede Schrift die Arbeit nieder, die das Wort durchf�hrt. </p><div class="table"><p><a name="id2798643"></a><b>Table 1.2. Was bringt das Bibelstudium f�r Christen?</b></p><table summary="Was bringt das Bibelstudium f�r Christen?" border="1"><colgroup><col><col></colgroup><thead><tr><th>Referenz</th><th>Aktion</th></tr></thead><tbody><tr><td>Epheser 5,26 </td><td>es reinigt -- &#8220;[...] Er hat sie gereinigt durch das Wasserbad im Wort...&#8221;</td></tr><tr><td> Apostelgeschichte 20,32 </td><td> es erbaut -- &#8220; Und nun befehle ich euch Gott und dem Wort seiner Gnade, der da m�chtig ist, euch zu erbauen und euch das Erbe zu geben mit allen, die geheiligt sind. &#8221;</td></tr><tr><td> R�mer 15,4 </td><td> es ermutigt -- &#8220;Denn was zuvor geschrieben ist, dass ist uns zur Lehre geschrieben, damit wir durch Geduld und den Trost der Schrift Hoffnung haben. &#8221;</td></tr><tr><td> R�mer 10,17 </td><td> es gibt Glauben -- &#8220;So kommt der Glaube aus der Predigt, das Predigen aber durch das Wort Christi.&#8221;</td></tr><tr><td> 1. Korinther 10,11 </td><td> es warnt -- &#8220; Die wiederfuhr ihnen als ein Vorbild. Es ist aber geschrieben uns zur Warnung [...]&#8221;</td></tr><tr><td> Matth�us 4,4 </td><td> Nahrung -- &#8220;Er aber antwortete und sprach: Es steht geschrieben: &quot;Der Mensch lebt nicht vom Brot allein, sondern von einem jeden Wort, das aus dem Wort Gottes geht.&quot;&#8221;</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Ein Buch, das Gott eingegeben hat�</td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right">�Ein Buch, das befreit</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-importance.html b/bibletime-doc/docs/de/howto/html/h2-importance.html
deleted file mode 100644
index 3853cce..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-importance.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><head><title>Chapter 1. Wert des Wortes des Gottes</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="index.html" title="Das Biblestudy HowTo"><link rel="previous" href="index.html" title="Das Biblestudy HowTo"><link rel="next" href="h2-importance-breathed.html" title="Ein Buch, das Gott eingegeben hat"></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>Wert des Wortes des Gottes</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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. Wert des Wortes des Gottes</h2></div></div><p>Gottes Wort zu verstehen ist von gro�er Wichtigkeit f�r alle, die Gottes Namen anrufen. Das Studium der Bibel ist einer der ersten Wege um zu lernen mit Gott zu kommunizieren.</p><div class="section"><a name="h2-importance-unique"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-unique"></a>Ein Buch, das einzigartig ist</h2></div></div><p> Die Bibel ist in vielen Dingen �berragend. Sie ist einzigartig in: </p><div class="itemizedlist"><ul><li><p><a name="id2798350"></a> Verbreitung. Verkaufserl�se aus Bibel in Nordamerika: Mehr als 500 Millionen Dollar pro Jahr. Die Bibel ist sowohl insgesamt als auch j�hrlich der Bestseller. </p></li><li><p><a name="id2798366"></a> Urheberschaft. Sie wurde in einem Zeitraum von 1600 Jahren von 40 verschiedenen Autoren verschiedener Milieus geschrieben. Sie liest sich jedoch, als ob sie von einem einzigen geschrieben wurde. </p></li><li><p><a name="id2738772"></a> Erhaltung. F. F. Bruce vergleicht im Buch <i>Are New Testament Documents Reliable?</i> die Manuskripte des neuen Testamentes mit anderen alten Texten: </p></li></ul></div><div class="table"><p><a name="id2799388"></a><b>Table 1.1. Vergleich der Schriften des Neuen Testamentes mit anderen alten Texten</b></p><table summary="Vergleich der Schriften des Neuen Testamentes mit anderen alten Texten" border="1"><colgroup><col><col><col><col><col></colgroup><thead><tr><th>Werk</th><th>Erstellungszeit</th><th>Erstausgabe</th><th>Zeitspanne</th><th>Anzahl von Kopien</th></tr></thead><tbody><tr><td>Herodot</td><td>448-428 v.Chr..</td><td>900 n.Chr.</td><td>1300 Jahre</td><td>8</td></tr><tr><td>Tacitus</td><td>100 n.Chr.</td><td>1100 n.Chr.</td><td>1000 Jahre</td><td>20</td></tr><tr><td>C�sars <i>Gallischer Krieg</i></td><td>50-58 v.Chr.</td><td>900 n.Chr.</td><td>950 Jahre</td><td>10</td></tr><tr><td>Livius' <i>R�mische Geschichte</i></td><td>59 v.Chr. - 17 n.Chr.</td><td>900 n.Chr.</td><td>900 Jahre</td><td>20</td></tr><tr><td>Neues Testament</td><td>40 n.Chr. - 100 n.Chr.</td><td>130 n.Chr. Teile der Manuskripte. 350 n.Chr. alle Manuskripte</td><td>30 - 310 Jahre</td><td>5000 Grieschische &amp; 10,000 Lateinische </td></tr></tbody></table></div><p>Es existieren zehn Kopien von C�sars <i>Gallischem Krieg</i>, die erste wurde 900 Jahre nachdem C�sars das Original schrieb, kopiert usw. F�r das neue Testament haben wir vollst�ndige Manuskripte, die auf 350 n.Chr. datiert werden; Schriftst�cke aus den 200er Jahren, die den gr��ten Teil des Neuen Testamentes enthalten und und Fragment des Johannesevangeliums von 130 n.Chr. Wie viele Ausgaben haben wir, um sie miteinander zu vergleichen? 500 in Griechisch und 10000 in Lateinisch! </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 der Wahrheit und F�lle der Beweise, auf der er aufbaut steht der Text des Neuen Testamentes absolut und unerreichbar alleine �ber den anderen alten Prosaschriften.&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 <i>Questions of Life</i> 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Das Biblestudy HowTo�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Ein Buch, das Gott eingegeben hat</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-rules-context.html b/bibletime-doc/docs/de/howto/html/h2-rules-context.html
deleted file mode 100644
index 3eb4c11..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-rules-context.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Regel 2 - Auslegung im biblischen Zusammenhang</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-rules.html" title="Chapter 3. Regeln der Bibelauslegung (Hermeneutik)"><link rel="previous" href="h2-rules.html" title="Chapter 3. Regeln der Bibelauslegung (Hermeneutik)"><link rel="next" href="h2-rules-hcontest.html" title="Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang"></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>Regel 2 - Auslegung im biblischen Zusammenhang</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Regeln der Bibelauslegung (Hermeneutik)</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"><a name="h2-rules-context"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-context"></a>Regel 2 - Auslegung im biblischen Zusammenhang</h2></div></div><p>Schriftauslegung in Harmonie mit anderen Schriften. Was sagen die Verse jeder Seite aus? Was ist das Thema des Kapitels? Des Buches? Stimmt ihre Auslegung mit diesen �berein? Wenn nicht, so ist sie fehlerhaft. Normalerweise vesorgt uns der Zusammenhang mit dem, was wir zu richtigen Auslegung des Abschnitts ben�tigen. Kontext ist K�nig. Wenn immer noch Verwirrung �ber die Bedeutung nach der Auslegung des Textes �n seinem Zusammenhang besteht, m�ssen wir weiter nachforschen.</p><div class="section"><a name="h2-rules-context-ex2a"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-context-ex2a"></a>Beispiel 2A</h3></div></div><p>In einer vorherigen Unterrichtsstunde haben wir Johannes 3,5 <i>&#8220;geboren ... aus Wasser und Geist&#8221;</i> In Bezug auf den Kontext, was ist das Wasser in dieser Diskussion?</p><p>Wassertaufe steht hier nicht in der Diskussion, was eine gro�e Verschiebung des von Jesus und Nikodemus diskutierten Themas w�re. Halten Sie Ausschau nach einem pl�tzlichen Wechsel des Themas, es k�nnte ein Hinweis sein, dass ihre Auslegung entgleist ist! Das Wasser ist die lebensspendende Fl�ssigkeit, &#8216;geboren aus Wasser&#8217; = nat�rliche Geburt.</p></div><div class="section"><a name="h2-rules-context-ex2b"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-context-ex2b"></a>Beispiel 2B</h3></div></div><p>1 Korinther 14,34 <i>&#8220;[...] die Frauen [sollen] schweigen in der Gemeindeversammlung&#8221;</i> muss mit in den bibilischen Zusammenheng von 1. Korinther 11,5 &#8216;Ein Frau aber, die betet oder prophetisch redet...&#8217; genommen werden.</p></div><div class="section"><a name="h2-rules-context-ex2c"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-context-ex2c"></a>Beispiel 2C</h3></div></div><p>Apostelgeschichte 2,38 <i>Petrus sprach zu ihnen: &#8220;Tut Bu�e, und jeder lasse sich taufen auf den Namen Jesu Christi zur Vergebung eurer S�nden...&#8221;</i> Ist dies Wiedergeburt durch Taufe? Wenn es der einzige Vers der Schrift w�re, den wir h�tten, m�ssten wir das folgern. Aber in dem Licht der klaren Lehre an anderen Stelle, dass Wiedergeburt durch den Glauben an Christus geschieht, m�ssen wir es anderes auslegen. Petrus dr�ngt die Taufe als einen Weg f�r seine H�rer auf das Evangelium zu antworten. Wenn die Taufe der Weg w�re, wiedergeboren zu werden, wie k�nnte Paulus dann in 1. Kor. 1,17 schreiben <i>&#8220;Denn Christus hat mich nicht gesandt zu taufen, sondern das Evangelium zu verk�nden&#8221;</i>? </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Regeln der Bibelauslegung (Hermeneutik)�</td><td width="34%" align="center"><a href="h2-rules.html">Up</a></td><td width="33%" align="right">�Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-rules-hcontest.html b/bibletime-doc/docs/de/howto/html/h2-rules-hcontest.html
deleted file mode 100644
index 5dfa967..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-rules-hcontest.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-rules.html" title="Chapter 3. Regeln der Bibelauslegung (Hermeneutik)"><link rel="previous" href="h2-rules-context.html" title="Regel 2 - Auslegung im biblischen Zusammenhang"><link rel="next" href="h2-rules-normal.html" title="Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache"></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>Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Regeln der Bibelauslegung (Hermeneutik)</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"><a name="h2-rules-hcontest"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-hcontest"></a>Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang</h2></div></div><p> Zuallererst fragen wir nicht &quot;Was bedeutet dies f�r mich?&quot; sondern &quot;Was hat es f�r den urspr�nglichen Autoren bedeutet?&quot;; sp�ter k�nnen wir fragen &quot;Was bedeutet es f�r mich?&quot; Wir m�ssen den geschichtlichen und kulturellen Hintergrund des Autoren und der Empf�nger in Betracht ziehen.</p><div class="section"><a name="h2-rules-hcontest-ex3a"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-hcontest-ex3a"></a>Beispiel 3A</h3></div></div><p> &quot;3 Tage &amp; 3 N�chte&quot; (Mt.12,40) haben zur &quot;MittwochsKreuzigungstheorie&quot; gef�hrt, besonders der Kult der Armstrongism. <i> Anm. des �bers.: Leider weiss ich nicht, was Armstronism f�r ein Kult ist</i>. Wie  konnte Jesus am Freitag sterben und am Sonntag Morgen auferstehen (&quot;...am dritten Tage auferstehen&quot; (Mt. 16,21))? Genaue Bedeutungen von &quot;drei&quot; oder &quot;Tagen&quot; helfen nicht, den scheinbaren Widerspruch zu erkl�ren.</p><p>Wir ben�tigen einen geschichtlichen Leckerbissen: Die Juden z�hlten jeden Teil eines Tages als vollen Tag, so wie wir Eimer Wasser z�hlen w�rden (wenn wir sechs und einen halben Eimer Wasser h�tten, w�rden wir sagen dass es sieben Eimer Wasser sind sogar wenn der letzte nur teilweise voll ist). Dies istdie j�dische Art. Jeder Teil eines Tages wurde als voller Tag gez�hlt, Tage begannen um 18h und endeten um 6h. Freitag von 15h bis 18h = 1. Tag. Freitag von 18h bis Samstag 18h = 2. Tag. Samstag 18.00h bis Sonntag vielleicht 5h = 3. Tag. Die Auslegung im kulturellen Kontext bringt uns aus den Schwierigkeiten heraus.</p></div><div class="section"><a name="h2-rules-hcontest-ex3b"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-hcontest-ex3b"></a>Beispiel 3B</h3></div></div><p>1. Mose 15,7-21. Der historische Zusammenhang ist, dass das teilen von Tieren in zwei Teile und dass nachfolgende Gehen zwischen ihnen der normale Weg zu Abrahams Zeit war, einen Vetrag zu schlie�en. Beide Vetragspartner gingen dazwischen hindurch, den Pfand nehmend, dass Zerst�ckelung auf sie kommen solle, wenn sie nicht ihren Teil des Vertrages halten. Aber in diesem Falle geht nur Gott hindurch, was dies zu einem einseitigen Vetrag macht.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Regel 2 - Auslegung im biblischen Zusammenhang�</td><td width="34%" align="center"><a href="h2-rules.html">Up</a></td><td width="33%" align="right">�Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-rules-normal.html b/bibletime-doc/docs/de/howto/html/h2-rules-normal.html
deleted file mode 100644
index bfdbfd5..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-rules-normal.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-rules.html" title="Chapter 3. Regeln der Bibelauslegung (Hermeneutik)"><link rel="previous" href="h2-rules-hcontest.html" title="Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang"><link rel="next" href="h2-rules-parables.html" title="Regel 5 - Verstehen des Zwecks einer Parabeln und des Unterschiedes zwischen einer Parabel und einer Allegorie"></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>Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Regeln der Bibelauslegung (Hermeneutik)</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"><a name="h2-rules-normal"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-normal"></a>Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache</h2></div></div><p>Lassen Sie w�rtliche Sprache w�rtlich sein und bildliche Sprache bildlich sein. Und achten Sie auf Idiome, die eine besondere Bedeutung haben.</p><div class="section"><a name="h2-rules-normal-ex4a"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-normal-ex4a"></a>Beispiel 4A</h3></div></div><p>&#8216;b�ses Auge&#8217; in Mt.6,23. </p><p>Regel 1 - Definition von &#8216;b�se&#8217; und &#8216;Auge&#8217; - hilft hier nicht. Regel 2, Zusammenhang: Dies scheint uns nur noch mehr zu verwirren. Es scheint nicht mit dem zu passen, was davor und danach steht! Dies sollte uns zeigen, dass wir es nicht richtig verstehen.</p><p>Was wir hier haben ist ein hebr�isches Idiom, &#8216;b�ses Auge&#8217;. Lasst uns andere Benutzungen dieses Idioms nachschlagen: Mt. 20,15 &#8216;<i>Oder habe ich nicht die Macht zu tun, was ich will, mit dem was mein ist? Siehst du scheel [w�rtl. &#8216;b�se&#8217;] drein, weil ich so g�tig [w�rtl. &#8216;gut&#8217;] bin?</i>&#8217;. Wir sehen, dass ein &#8216;B�ses Auge&#8217; zu haben ein Idiom f�r geizig oder neidisch sein ist.Jetzt  gehen Sie zur�ck zu Mt. 6 und sehen Sie, wie dieses Verst�ndnis so perfekt in den Zusammenhang passt.</p><div class="section"><a name="h2-rules-normal-ex4b"></a><div class="titlepage"><div><h4 class="title"><a name="h2-rules-normal-ex4b"></a>Beispiel 4B</h4></div></div><p>Jesaja 59,1 &#8220;<i>[...] des Herrn Arm ist nicht zu kurz</i>&#8221; Deut.33:27 &#8220;<i> unter den ewigen Armen.</i>&#8221; Verweise auf K�rperteile von Gott werden von den &#8220;Mormonen&#8221; [Anm. des �bers.: im eng. &quot;Latter-Day Saints&quot;] um nachzuweisen, dass Gott einst ein Mann wie wir war. Nachdem sie die Menschen davon �berzeugt haben, beginnen sie weiter zu lehren, dass wir Gott werden k�nnen wie er es tat. Auf einem Vortrag den Walter  Martin (Autor von <i>Kingdom of the Cults</i>) gab, forderte eine Gruppe von Mormonen�ltesten  ihn mit einer Versaufz�hlung wie diesen heraus. Dr. Martin forderte die Mormonen dann heraus, eine weitere Stelle zu lesen: Psalm 91,4 &#8220;<i>Er wird dich mit seinen Fittichen decken, und Zuflucht wirst du haben unter seinen Fl�geln...</i>&#8221;. W.M. folgerte &quot;Mit den selben Regeln der Auslegung, mit denen sie gerade festgestellt haben, dass Gott ein Mann ist, haben sie gerade festgestellt, dass Gott ein Vogel ist.&quot; Die Mormonen mussten lachen, als sie die L�cherlichkeit ihrer Position realisierten. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang�</td><td width="34%" align="center"><a href="h2-rules.html">Up</a></td><td width="33%" align="right">�Regel 5 - Verstehen des Zwecks einer Parabeln und des Unterschiedes zwischen einer Parabel und einer Allegorie</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/h2-rules-parables.html b/bibletime-doc/docs/de/howto/html/h2-rules-parables.html
deleted file mode 100644
index 1518285..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-rules-parables.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Regel 5 - Verstehen des Zwecks einer Parabeln und des Unterschiedes zwischen einer Parabel und einer Allegorie</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="h2-rules.html" title="Chapter 3. Regeln der Bibelauslegung (Hermeneutik)"><link rel="previous" href="h2-rules-normal.html" title="Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache"></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>Regel 5 - Verstehen des Zwecks einer Parabeln und des Unterschiedes zwischen einer Parabel und einer Allegorie</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">Regeln der Bibelauslegung (Hermeneutik)</td><td align="right" class="right"></td></tr></tbody></table></div></div><div class="section"><a name="h2-rules-parables"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-parables"></a>Regel 5 - Verstehen des Zwecks einer Parabeln und des Unterschiedes zwischen einer Parabel und einer Allegorie</h2></div></div><p>Eine Allegorie ist: EINE GESCHICHTE; IN DER JEDES ELEMENT EINE BEDEUTUNG HAT </p><p>Jede Parabel ist eine Allegorie, whar oder falsch?</p><p>Einige Gleichnisse sind Allegorien, zum Beispiel ist das Gleichnis des S�hmanns eine Allegorie. Der Samen ist das Wort Gottes, die Dornen sind Sorgen und Gier, usw. Die meisten Gleichnisse sind keine Allegorien, sondern einfache Geschichten, um einen bestimmten Punkt zu verdeutlichen. Es ist gef�hrlich unsere Lehren von Gleichnissen zu gewinnen; sie k�nnen so gedreht werden, alle Dinge auszusagen. Wir m�ssen unsere Lehre von klaren Schriftstellen bekommen, die es auslegen; wenn ein Gleichnis dies zus�tzlich verdeutlicht ist es hilfreich.</p><div class="section"><a name="h2-rules-parables-ex5a"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-parables-ex5a"></a>Beispiel 5A</h3></div></div><p>Das Gleichnis der Witwe mit dem ungerechten Richter in Lukas 18,1-8. Diese Geschichte verdeutlicht eine Lektion: Mut im Gebet. [Anm. d. �b.: im Engl. &quot;boldnessin prayer&quot;]. Wenn wir das Ganze in eine Allegorie verwandeln, was haben wir dann?</p><p>Alle Arten von Gewalt geschehen in der Bedeutung: Gott ist widerwillig die Rechte der Witwen zu sch�tzen, Gebete &quot;�rgern&quot; Ihn, usw.</p></div><div class="section"><a name="h2-rules-parables-ex5b"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-parables-ex5b"></a>Beispiel 5B</h3></div></div><p>Das Gleichniss der unehrlichen Verwalters in Lukas 16,1-9. Was ist der Knackpunkt des Gleichnisses? Ist es eine Allegorie? </p><p>Der Verwalter wird nur f�r eine Sache gelobt, seine Schlauheit in der Benutzung von Dingen, die er vorbereiten muss f�r eine Zeit, in der er sie nicht haben w�rde. Aber er wird nicht f�r sein unethisches Verhalten gelobt, n�mlich seinen Herren zu hintergehen. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache�</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/bibletime-doc/docs/de/howto/html/h2-rules.html b/bibletime-doc/docs/de/howto/html/h2-rules.html
deleted file mode 100644
index 9f29cb6..0000000
--- a/bibletime-doc/docs/de/howto/html/h2-rules.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><head><title>Chapter 3. Regeln der Bibelauslegung (Hermeneutik)</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="up" href="index.html" title="Das Biblestudy HowTo"><link rel="previous" href="h2-basics-worksheet.html" title="Arbeitsblatt: Wie man eine Konkordanz benutzt"><link rel="next" href="h2-rules-context.html" title="Regel 2 - Auslegung im biblischen Zusammenhang"></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>Regeln der Bibelauslegung (Hermeneutik)</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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. Regeln der Bibelauslegung (Hermeneutik)</h2></div></div><p>Wir haben bereits von den &#8216;3 C&#8217; gelernt: Inhalt (=&quot;content&quot;), Kontext (=&quot;context&quot;) Querverweise (=&quot;cross-reference&quot;). Wir m�chten dies nun durch kurzes Erforschen der biblischen Hermeneutik erweitern. Das Ziel der biblischen Hermeneutik ist es, die Bedeutung zu entdecken, wie sie von dem urspr�nglichen Autoren gemeint war. W�hrend viele Anwendungen eines Abschnittes m�glich sind, ist jedoch nur eine Auslegung m�glich. Die Schriften selbst sagen, dass kein Manuskript eine eigene Auslegung hat (2. Petrus 1,20 <i>&#8220;Und das sollt ihr vor allem wissen, dass keine Weissagung in der Schrift eine Sache eigener Auslegung ist&#8221;</i>))- Verschiedene Regeln sind Hilfen zum Entdecken der richtigen Bedeutung; durch das Ignorieren dieser Regeln haben Menschen viele Schwierigkeiten f�r sich selbst und ihre Nachfolger gebracht. 2. Petrus 3,16 <i>&#8220;...in denen einige Dinge schwer zu verstehen sind, welche die Unwissenden und Leichfertigen verdrehen, wie auch die anderen Schriften zu ihrer eigenen Verdammnis.&#8221;</i></p><p>Wie gehen wir nun vor, um die [urspr�nglich] gewollte Bedeutung eines Abschnittes zu entdecken? Lassen Sie uns annehmen, dass ihre Aufmerksamkeit auf einen bestimmten Vers gezogen wurde, dessen Bedeutung ihnen nicht klar ist. Wie studieren Sie ihn? Behalten Sie sich diese Regeln:</p><div class="section"><a name="h2-rules-exact"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-exact"></a>Regel 1: Legen Sie der genauen Bedeutung der W�rter aus.</h2></div></div><p>Je pr�ziser wir mit der exakten, urspr�nglichen Bedeutung der W�rter sein k�nnen, desto besser ist unsere Auslegung. Versuchen Sie die exakte Bedeutung zu finden, indem sie die folgenden Schritte befolgen:</p><div class="section"><a name="h2-rules-exact-definition"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-exact-definition"></a>Schritt 1) Bestimmung</h3></div></div><p>Schlagen Sie die Bestimmung in einem Griechisch oder Hebr�isch Lexikon nach. F�r Verben ist die Verbform ebenfalls entscheidend.</p></div><div class="section"><a name="h2-rules-exact-crossref"></a><div class="titlepage"><div><h3 class="title"><a name="h2-rules-exact-crossref"></a>Schritt 2) Querverweise</h3></div></div><p>Vergleichen Sie Schrift mit Schrift. Zu sehen, wie das selbe griechische oder hebr�ische Wort (nicht das deutsche Wort) in der Schrift benutzt wird, kann die Bestimmung kl�ren oder neu beleuchten. Wie benutzt der selbe Autor das Wort anderswo? Und andere Autoren? Ihre Referenzwerkzeuge k�nnten ihnen auch die Benutzung des Wortes in nicht-biblisches Dokumenten geben. How does the same author Warum m�ssen wir in die urspr�ngliche Sprache gehen; warum ist das Deutsche Wort nicht gut genug? WEIL MEHR ALS EIN GRIECHISCHES WORT IN DAS SELBE DEUTSCHE �BERSETZT WERDEN KANN, UND WEIL DIE GRIECHISCHEN W�RTER VERSCHIEDENE ABSTUFUNGEN HABEN KANN.</p><div class="section"><a name="h2-rules-exact-crossref-ex1a"></a><div class="titlepage"><div><h4 class="title"><a name="h2-rules-exact-crossref-ex1a"></a>Beispiel 1A</h4></div></div><p>Johannes 20,17 <i>&#8216;R�hre mich nicht an&#8217;</i> klingt hart, nicht? Es klingt, dass Jesus nicht ber�hrt werden wollte, jetzt wo er auferstanden ist, dass er zu heilig or etwas �hnliches ist. Aber das scheint nicht richtig zu sein, darum lasst es uns in Spiros Zodhiates' <i>The Complete Word Study New Testament</i> (AMG Publishers, 1991). nachschlagen.</p><p>Bestimmung: Nach dem Aufschlagen von Johannes 20,17 sehen wir �ber dem Wort &#8220;R�hre&#8221; &#8220;pim680&#8221;. Die Buchstaben geben uns einen Code f�r den Teil der Sprache, und die Nummer bezieht sich auf das Stronglexikon. Lasst uns die Bedeutung nachschlagen (S. 879). &#8220;680. Haptomai; von hapto (681), ber�hren. Bezieht sich auf solche Behandlung auf ein Objekt, die darauf einen ver�ndernden Einflu� aus�bt. Unterscheidet sich von pselaphao (5584), was nur bedeutet, die Oberfl�che von etwas zu ber�hren.&#8221; Schlagen wir nun &#8220;pim&#8221; nach. Die Grammatikcodes in Zodhiates kommen direkt nach der Offenbarung; auf Seite 849 sehen wir, dass pim f�r &#8220;Pr�sens Imperativ Aktiv (80)&#8221; steht. Auf Seite 857 steht &#8220;Pr�sens Imperativ. In der gesprochenen Rede kann es ein Gebot bezeichnen, etwas in der Zukunft zu tun, was eine andauernde oder wiederholte Handlung einschlie�t oder, wenn es verneint ist, ein Gebot aufzuh�ren etwas zu tun.&#8221; Dies hier ist ein verneinter Befehl, so dass es daf�r da ist etwas zu stoppen was schon geschieht. Was haben wir nun?</p><p><i>MARIA KLAMMERT SICH BEREITS AN JESUS, UND ER SAGT DAMIT AUFZUH�HREN IHN ZU HALTEN!</i></p></div><div class="section"><a name="h2-rules-exact-crossref-ex1b"></a><div class="titlepage"><div><h4 class="title"><a name="h2-rules-exact-crossref-ex1b"></a>Beispiel 1B</h4></div></div><p>In Jakobus 5,14 lesen wir, dass <i>Die �ltesten sollen f�r jemanden, der krank ist, beten und ihn mit �l salben</i>. Was ist dieses salben?</p><p>Bedeutung von aleipho (218) - &#8220;�len&#8221; (Stroong); wir haben jedoch auch ein anderes griechisches Wort, das mit &#8220;ein�len&#8221; �bersetzt wird, chrio (5548) - &#8220;einschmieren oder einreiben mit �l, d.h. segnen f�r einen amtlichen oder religi�sen Dienst&#8221; (Strong). Da es ein Verb ist, ziehen Sie die Form auch in Betracht, &#8220;apta&#8221; Aorist Partizip Aktiv. &#8220;Das Aorist Partizip dr�ckt einfache Handlung aus, im Gegensatz zur andauernden Handlung... Wenn die Beziehung zum Hauptverb temporal ist, kennzeichnet es normalerweise eine Handlung, die fr�her als die des Hauptverbes stattfindet. &#8221; (Zodhiates S. 851)</p><pre class="screen">
-Querverweise f�r aleipho:
-  Matth�us.6,17 Wenn du aber fastest, so salbe dein Haupt...
-  Markus 16,1 Und als der Sabbat vergangen war, kauften Maria von Magdalena  und Maria, die Mutter des Jakobus, und Salome wohlriechende �le, um  hinzugehen und ihn zu salben.
-  Markus 6,13 [...] und salbten viele Kranke mit �l und machten sie gesund.
-  Lukas 7,38 ...und k��te seine F��e und salbt sie mit Salb�l
-  Johannes 12,3 Maria ... salbte die F��e Jesu und trocknete mit ihrem Haar  seine F��e ...
-
-Querverweise f�r chrio:
-  Lukas 4,18 &quot;Der Geist des Herrn ist auf mir, weil er mich gesalbt hat zu  verk�ndigen...&quot;
-  Apostelgeschichte 4,27 ...Jesus, den du gesalbt hast... 
-  Apostelgeschichte 10,378 wie Gott Jesus von Nazareth gesalbt hat mit  heiligem Geist und Kraft
-  2. Korinther 1,21 Gott ist's aber, der ... uns gesalbt
-</pre><p>Was ist nun der Unterschied zwischen aleipho und chrio? Schauen Sie erneut die Querverweise und die Definitionen an und sammeln Sie die Unterschiede: ALEIPHO IST PRAKTISCHE BENUTZUNG VON �L UND CHRIO IST DIE GEISTLICHE. </p><p>Zur Illustration (obwohl hier das Wort nicht benutzt wird) der praktischen Benutzung von �l zu dieser Zeit ist der barmherzige Samariter, der f�r den von R�ubern geschlagenen Mann sorgte und mit �l und Wein die Wunden s�uberte. �l hatte also eine medizinische Bedeutung zur Zeit Jesu. </p><p>Jetzt lasst uns das durch diese Wortstudie Gelernte auf Jakobus 5,14 anwenden <i>&#8216;Ist jemand unter euch krank, der rufe zu sich die �ltesten der Gemeinde, dass sie �ber ihm beten und ihn salben mit �l im Namen des Herrn.&#8217;</i> Ist hier &#8220;salben&#8221; geistlich oder praktisch? Praktisch!</p><p> Und die Form im griechischen, das Partizip Aorist, k�nnte besser mit &#8220;gesalbt haben&#8221; �bersetzt werden, so dass in der Reihenfolge erst dass Salben und dann das Gebet kommt (&#8220;Im Namen des Herrn&#8221; bezieht sich aus Gebet, nicht auf das Salben). Jakobus 5 sagt, dass die �ltesten der kranken Person Medizin geben und f�r ihn im Namen des Herrn beten sollen. Dr�ckt dass nicht das wunderbare Gleichgewicht zwischen Praktischem und Geistlichem in unseren Gott aus? </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">Arbeitsblatt: Wie man eine Konkordanz benutzt�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Regel 2 - Auslegung im biblischen Zusammenhang</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/html/index.html b/bibletime-doc/docs/de/howto/html/index.html
deleted file mode 100644
index e0663b8..0000000
--- a/bibletime-doc/docs/de/howto/html/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Das Biblestudy HowTo</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="Bibel, Studieren, Anleitung"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="Das Biblestudy HowTo"><link rel="next" href="h2-importance.html" title="Chapter 1. Wert des Wortes des Gottes"></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>Das Biblestudy HowTo</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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" id="id2735442"><div class="titlepage"><div><h1 class="title"><a name="id2735442"></a>Das Biblestudy HowTo</h1></div><div><h3 class="author">Bob Harman</h3></div><div>Revision <span class="releaseinfo">1.01.00<br></span></div><div><p class="copyright">Copyright � 2001, 2002 BibleTimeinfo@bibletime.de</p></div><div><p class="copyright">Copyright � 2001, 2002 Bob Harman</p></div><div><div class="legalnotice"><p> This 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:N_Cov_Church@compuserve.com">N_Cov_Church@compuserve.com</a>&gt;</tt></p><p><i>Anm. des �bersetzers:</i> Der deutsche Text der Bibelstellen ist der deutschen revidierten Lutherbibel von 1984 entnommen. Ich �bernehme keinerlei Garantie f�r die �bersetzung, weder f�r falsche Wiedergabe noch f�r unw�rtliche und sinnverf�lschende �bersetzung. Ich habe mit bestem Wissen und K�nnen �bersetzt. Da ich jedoch kein �bersetzer bin, k�nnen sich Fehler eingeschlichen sein. Die Originalfassung wird in Englisch mit BibleTime mitgeliefert.</p></div></div><div><div><div class="abstract"><p><a name="id2799339"></a><b>Zusammenfassung</b></p><p> Die Anleitung zum Bibelstudium ist ein Handbuch zum Studieren der Bibel. </p><p>Bibletime Anleitung.</p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="h2-importance.html">Wert des Wortes des Gottes</a></dt><dd><dl><dt> <a href="h2-importance.html#h2-importance-unique">Ein Buch, das einzigartig ist</a></dt><dt> <a href="h2-importance-breathed.html">Ein Buch, das Gott eingegeben hat</a></dt><dt> <a href="h2-importance-works.html">Ein Buch, das arbeitet</a></dt><dt> <a href="h2-importance-liberates.html">Ein Buch, das befreit</a></dt><dt> <a href="h2-importance-wars.html">Ein Buch, das Krieg f�hrt</a></dt><dt> <a href="h2-importance-exhortations.html">Ermahnungen</a></dt><dt> <a href="h2-importance-once.html">Anhang: &#8220;Einer f�r Alle&#8221;</a></dt><dt> <a href="h2-importance-supplement.html">Anhang: Bibellesepl�ne</a></dt></dl></dd><dt>2 <a href="h2-basics.html">Grundlagen des Bibelstudiums</a></dt><dd><dl><dt> <a href="h2-basics.html#h2-basics-purpose">Unsere Absicht, wenn wir uns der Bibel ann�hern</a></dt><dt> <a href="h2-basics-approaches.html">Ann�herung an Gottes Wort</a></dt><dd><dl><dt> <a href="h2-basics-approaches.html#h2-basics-approaches-hear">H�ren </a></dt><dt> <a href="h2-basics-approaches.html#h2-basics-approaches-read">Lesen </a></dt><dt> <a href="h2-basics-approaches.html#h2-basics-approaches-study">Studieren </a></dt><dt> <a href="h2-basics-approaches.html#h2-basics-approaches-memorize">Auswendiglernen </a></dt><dt> <a href="h2-basics-approaches.html#h2-basics-approaches-meditate">Nachdenken</a></dt></dl></dd><dt> <a href="h2-basics-types.html">Arten des Bibelstudiums</a></dt><dd><dl><dt> <a href="h2-basics-types.html#basics-types-topical">Thematische Studie</a></dt><dt> <a href="h2-basics-types.html#h2-basics-types-character">Charakterstudie</a></dt><dt> <a href="h2-basics-types.html#basics-types-expository">Textauszugsstudie</a></dt></dl></dd><dt> <a href="h2-basics-interpretation.html">Grundlagen einer richtiger Auslegung</a></dt><dd><dl><dt> <a href="h2-basics-interpretation.html#h2-basics-interpretation-content">Inhalt</a></dt><dt> <a href="h2-basics-interpretation.html#h2-basics-interpretation-context">Kontext</a></dt><dt> <a href="h2-basics-interpretation.html#h2-basics-interpretation-cross">Querverweise</a></dt></dl></dd><dt> <a href="h2-basics-expository.html">Eine Textauszugsstudie von Matth�us 6,1-18</a></dt><dt> <a href="h2-basics-worksheet.html">Arbeitsblatt: Wie man eine Konkordanz benutzt</a></dt><dd><dl><dt> <a href="h2-basics-worksheet.html#h2-basics-worksheet-select">Um einen speziellen Vers zu finden</a></dt><dt> <a href="h2-basics-worksheet.html#h2-basics-worksheet-study">Eine thematische Studie durchf�hren </a></dt><dt> <a href="h2-basics-worksheet.html#h2-basics-worksheet-clarify">Wortbedeutungen im Griechischen oder Hebr�ischen klarstellen</a></dt><dt> <a href="h2-basics-worksheet.html#h2-basics-worksheet-names">Die Bedeutung von Namen finden</a></dt></dl></dd></dl></dd><dt>3 <a href="h2-rules.html">Regeln der Bibelauslegung (Hermeneutik)</a></dt><dd><dl><dt> <a href="h2-rules.html#h2-rules-exact">Regel 1: Legen Sie der genauen Bedeutung der W�rter aus.</a></dt><dd><dl><dt> <a href="h2-rules.html#h2-rules-exact-definition">Schritt 1) Bestimmung</a></dt><dt> <a href="h2-rules.html#h2-rules-exact-crossref">Schritt 2) Querverweise</a></dt></dl></dd><dt> <a href="h2-rules-context.html">Regel 2 - Auslegung im biblischen Zusammenhang</a></dt><dd><dl><dt> <a href="h2-rules-context.html#h2-rules-context-ex2a">Beispiel 2A</a></dt><dt> <a href="h2-rules-context.html#h2-rules-context-ex2b">Beispiel 2B</a></dt><dt> <a href="h2-rules-context.html#h2-rules-context-ex2c">Beispiel 2C</a></dt></dl></dd><dt> <a href="h2-rules-hcontest.html">Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang</a></dt><dd><dl><dt> <a href="h2-rules-hcontest.html#h2-rules-hcontest-ex3a">Beispiel 3A</a></dt><dt> <a href="h2-rules-hcontest.html#h2-rules-hcontest-ex3b">Beispiel 3B</a></dt></dl></dd><dt> <a href="h2-rules-normal.html">Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache</a></dt><dd><dl><dt> <a href="h2-rules-normal.html#h2-rules-normal-ex4a">Beispiel 4A</a></dt></dl></dd><dt> <a href="h2-rules-parables.html">Regel 5 - Verstehen des Zwecks einer Parabeln und des Unterschiedes zwischen einer Parabel und einer Allegorie</a></dt><dd><dl><dt> <a href="h2-rules-parables.html#h2-rules-parables-ex5a">Beispiel 5A</a></dt><dt> <a href="h2-rules-parables.html#h2-rules-parables-ex5b">Beispiel 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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">�Wert des Wortes des Gottes</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/howto/unicode/Makefile.am b/bibletime-doc/docs/de/howto/unicode/Makefile.am
deleted file mode 100644
index d42d5df..0000000
--- a/bibletime-doc/docs/de/howto/unicode/Makefile.am
+++ /dev/null
@@ -1,31 +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)/de/bibletime/howto/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/howto; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/howto/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/common;
diff --git a/bibletime-doc/docs/de/howto/unicode/Makefile.in b/bibletime-doc/docs/de/howto/unicode/Makefile.in
deleted file mode 100644
index c41dc3c..0000000
--- a/bibletime-doc/docs/de/howto/unicode/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/unicode/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/howto/unicode/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/howto/unicode
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/howto/unicode/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/howto; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/howto/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/howto/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/howto/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/howto/unicode/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/howto/unicode/how2-basics.docbook b/bibletime-doc/docs/de/howto/unicode/how2-basics.docbook
deleted file mode 100644
index 64298d3..0000000
--- a/bibletime-doc/docs/de/howto/unicode/how2-basics.docbook
+++ /dev/null
@@ -1,278 +0,0 @@
-<chapter id="h2-basics"
-><title
->Grundlagen des Bibelstudiums</title>
-
-<section id="h2-basics-purpose">
-<title
->Unsere Absicht, wenn wir uns der Bibel annähern</title>
-<para
-> Johannes 5,39-40<emphasis
->"Ihr sucht in der Schrift, denn ihr meint, ihr habt das ewige Leben darin; und sie ist's die von mir zeugt; aber ihr wollt nicht zu mir kommen, dass ihr das Leben hättet."</emphasis
-> </para>
-
-<para
->Die Hauptabsicht des Buches ist es uns zu der Person zu bringen. Martin Luther sagte <quote
->Wir gehen nur zur Wiege um des Kindes willen</quote
->; genauso ist es mit dem Bibelstudium, wir tun es nicht um unser selbst willen, sondern wegen der Kameradschaft mit Gott. </para>
-<blockquote
-><attribution
->John R.W. Stott, <emphasis
->Christ the
-Controversialist</emphasis
->, InterVarsity Press 1978, pp.97, 104.</attribution>
-<para
->Die Juden, zu denen Jesus sprach [...] glaubten, dass das Besitzen der Schrift gleichbedeutend dem Besitzen des Lebens war. Hillel pflegte zu sagen, <quote
->He who has gotten to himself words of Torah has gotten to himself the life of the world to come.</quote
-> Ihr Studium war in sich zu Ende. Hier wurden sie schmerzhaft getäuscht.</para>
-<para
->Es gibt weder Verdienst noch Profit beim Lesen der Schrift als Selbstzweck, nur wenn sie uns wirkungsvoll auf Jesus Christus hinführt. Jedesmal wenn wenn wir die Bibel lesen brauchen wir die eifrige Erwartung, durch sie Christus zu finden.</para
->  </blockquote>
-</section>
-
-<section id="h2-basics-approaches">
-<title
->Annäherung an Gottes Wort</title>
-<para
->Hören und Lesen geben eine Übersicht über die Schrift, während das Studieren und Auswendiglernen eine Detailsicht der Schrift gibt. Das Nachdenken über die Schriften vereinigt das Hören, Lesen, Studieren und Ausweniglernen und verfestigt die Worte in unseren Köpfen.</para>
-
-<section id="h2-basics-approaches-hear">
-<title
->Hören </title>
-<para
->Lukas 11,28 <emphasis
-><quote
->Er aber sprach: Ja selig sind die, die das Wort Gottes hören und bewahren.</quote
-></emphasis
-></para>
-</section>
-
-<section id="h2-basics-approaches-read">
-<title
->Lesen </title
-> <para
->Offenbarung 1,3 <emphasis
-><quote
->Selig ist, der da liest und die da hören die Worte der Weissagung und behalten, was darin geschrieben ist; denn die Zeit ist nahe.</quote
-></emphasis
-></para>
-<para
->1. Timotheus 4,13<emphasis
-><quote
->Fahre fort mit Vorlesen, mit Ermahnen, mit Lehren, bis ich komme. </quote
-></emphasis
-></para>
-</section>
-
-<section id="h2-basics-approaches-study"
-><title
->Studieren </title>
-<para
->Apostelgeschichte 17,11 <emphasis
-><quote
->Diese aber waren freundlicher als die in Thessalonich; sie nahmen das Wort bereitwillig auf und forschten täglich in der Schrift, ob sich's so verhielte.</quote
-></emphasis
-></para>
-<para
->2. Timotheus 2,15 <emphasis
-><quote
->Bemühe [in der engl. KJV `Study'] dich darum, dich vor Gott zu erweisen als einen rechtschaffenen und untadeligen Arbeiter Arbeiter, der das Wort der Wahrheit recht austeilt. </quote
-></emphasis
-></para>
-</section>
-
-<section id="h2-basics-approaches-memorize">
-<title
->Auswendiglernen </title>
-<para
->Psalm 119,11 <emphasis
-><quote
->Ich behalte dein Wort in meinem Herzen;/ lass mich nicht abirren von deinen Geboten</quote
-></emphasis
-></para
-> </section>
-
-<section id="h2-basics-approaches-meditate"
-><title
->Nachdenken</title>
-<para
->Psalmen 1,2-3 <emphasis
-><quote
->Sondern hat Lust am Gesetz des Herrn / und sinnt über seinem Gesetz Tag und Nacht! Der ist wie ein Baum, gepflanzt an Wasserbächen, der seine Frucht bringt zu seiner Zeit, und seine Blätter verwelken nicht. / Und was er macht, das gerät wohl.</quote
-></emphasis
-></para>
-<para
->Die Seeleute verdeutlichen dies, indem sie sagen, dass der Daumen alle Finger berühren kann, wir können über Gottes Wort nachdenken während wir eins der ersten vier Dinge tun. Darüber nachzudenken ist ein Schlüssel zur Offenbarung. Ein junger Christ muss die Bibel mehr hören und lesen als sie zu studieren und Dinge zu lernen. Durch diese Vorgehensweis werden sie mit der allumfassenden Botschaft  der Bibel vetraut. </para
-> </section>
-</section>
-
-<section id="h2-basics-types"
-><title
->Arten des Bibelstudiums</title
-> <section
-id="basics-types-topical"
-><title
->Thematische Studie</title
-> <para
->Suchen Sie sich ein bestimmtes Thema heraus und folgen Sie ihm unter Benutzung von Querverweisen oder einer Konkordanz.</para>
-</section>
-
-<section id="h2-basics-types-character"
-><title
->Charakterstudie</title>
-<para
->Das Studieren des Lebens einer Person der Bibel, z.B. Josephs Leben in 1. Mose 37-50</para
-></section
-> <section
-id="basics-types-expository"
-><title
->Textauszugsstudie</title
-> <para
->Studieren eines Absatzes, Kapitels oder Buches.</para
-></section>
-</section>
-
-<section id="h2-basics-interpretation">
-<title
->Grundlagen einer richtiger Auslegung</title>
-
-<section id="h2-basics-interpretation-content">
-<title
->Inhalt</title>
-<para
->Was sagt es aus? Was sagt es in der ursprünglichen Sprache aus? Seien Sie vorsichtig mit Definitionen. Lesen Sie nicht hinein, was nicht ausgesagt wird.</para
-> </section>
-
-<section id="h2-basics-interpretation-context"
-><title
->Kontext</title>
-<para
->Kontext.</para>
-</section>
-
-<section id="h2-basics-interpretation-cross"
-><title
->Querverweise</title>
-<para
-> Was sagen andere Verse über dieses Thema in anderen Teilen der Bibel aus? Gott widerspricht sich nicht selbst, deshalb muss unsere Auslegung den Test durch andere Stellen bestehen.</para>
-</section>
-</section>
-
-<section id="h2-basics-expository"
-><title
->Eine Textauszugsstudie von Matthäus 6,1-18</title>
-<para
->Lass uns Matthäus 6,1-18 zusammen studieren. Lesen Sie den Text durch. Sehen Sie dabei zuerst nach den Schlüsselversen, d.h. nach den Versen, die den gesamten Abschnitt zusammenfassen. Denken Sie, dass sie fertig sind? Testen sie es, indem sie verschiedene Stellen heraussuchen und dann überlegen ob diese zum Gedanken des Schlüsselverses passen. Wenn Sie ihn gefunden haben, schreiben Sie ihn als Römische Zahl 1 ihrer Übersicht:</para>
-<screen>
-I. HÜTE DICH DAVOR, DEINE RECHTSCHAFFENHEIT VOR ANDEREN AUSZUÜBEN UM BEMERKT ZU WERDEN
-</screen>
-<para
->Was bedeutet "Rechtschaffenheit ausüben"? Gibt der Text irgendwelche Beispiele? Welcher Lebensbereich wird behandelt? Unsere Motive! Welche Untertitel entwickeln diesen Gedanken?</para>
-<screen>
-  A. Wenn du spendest
-  B. Wenn du fastest
-  C. Wenn du betest
-</screen>
-<para
->Füllen Sie jetzt die Übersicht mit spezifischen Anweisungen, wie man falsche Wege seine Rechtsschaffenheit auszuüben vermeiden kann:</para>
-<screen>
-  A. Wenn du gibst
-     1. BLASE KEINE TROMPETE. (WIE KÖNNTE JEMAND HEUTE "EINE TROMPETE BLASEN"?)
-     2. GIB IM VERBORGENEN. USW.
-</screen>
-</section>
-<section id="h2-basics-worksheet"
-><title
->Arbeitsblatt: Wie man eine Konkordanz benutzt</title>
-
-<section id="h2-basics-worksheet-select"
-><title
->Um einen speziellen Vers zu finden</title>
-<orderedlist numeration="arabic"
-> <listitem
-><para
->Suchen Sie sich das Schlüsselwort oder das ungewöhnlichste Wort des Verses heraus.</para
-></listitem
-> <listitem
-><para
->Schlagen Sie dieses Wort alphabetisch nach.</para
-></listitem
-> <listitem
-><para
->Gehen Sie die Spalte der Auflistung durch, bis Sie ihren Vers finden.</para
-></listitem
-> </orderedlist>
-<screen>
-	Finde diese Verse:
-		"Die Schläge des Freundes meinen es gut."
-		"Wir sind die Botschafter Christi."
-		Die Geschichte über den Reichen Mann und Lazarus.
-</screen>
-</section>
-
-<section id="h2-basics-worksheet-study"
-><title
->Eine thematische Studie durchführen </title>
-<para
->Lassen Sie uns von der Annahme ausgehen, dass sie eine Studie des Wortes "Erlösung" machen möchten. Als erstes würden Sie das Wort in der Konkordanz nachschlagen und die aufgelisteten Stellen nachschlagen. Dann könnten Sie verwandte Worte und die für sie angegebenen Stellen nachschlagen , z.B. "erlösen, erlöst, Lösegeld", sogar "kaufen" oder "erkauft". </para>
-</section>
-
-
-<section id="h2-basics-worksheet-clarify"
-><title
->Wortbedeutungen im Griechischen oder Hebräischen klarstellen</title>
-<para
->Was wäre, wenn Sie einen Widerspruch zwischen Matthäus 7,1 "Richtet nicht, damit ihr nicht gerichtet werdet" und 1. Korinther 2,15 (Lutherbibel von 1545) "Der Geistliche aber richtet alles und wird von niemand gerichtet." entdecken würden? Vielleicht wurden hier zwei verschiedene griechische Wörter benutzt, die beide mit "richten" im Deutschen übersetzt wurden? (Wir benutzen ab jetzt Strongs Nummern). </para>
-<orderedlist numeration="arabic"
-> <listitem
-><para
->Schlagen Sie nun "richten" nach.</para
-></listitem
-> <listitem
-><para
->Gehen Sie die Spalte der Einträge bis Matthäus 7,1 durch. Rechts steht eine Nummer: 2919. Diese bezieht sich auf das verwendete griechische Wort. Schreiben Sie es auf.</para
-></listitem
-> <listitem
-><para
->Schlagen Sie nun "richten" nach.</para
-></listitem
-> <listitem
-><para
->Gehen Sie die Spalte bis 1. Korinther 2,15 durch . . . . . 350.</para
-></listitem
-> <listitem
-><para
->Benutzen Sie nun ein Griechisch Lexikon (Erinnern Sie sich: Sie sind im NT, also ist die Sprache Griechisch, während das AT in Hebräisch ist). Vergleichen Sie die Bedeutung von 2219 mit der Bedeutung von 350 und Sie haben ihre Antwort! </para
-></listitem
-> </orderedlist>
-</section>
-
-<section id="h2-basics-worksheet-names"
-><title
->Die Bedeutung von Namen finden</title>
-<para
->Mit den selben Schritten können wir die Bedeutung von griechischen oder Hebräischen Namen finden.</para>
-<para
->Schlagen Sie die folgenden Namen nach und schreiben Sie deren Bedeutung auf:</para>
-<itemizedlist
-> <listitem
-><para
->Nabal </para
-></listitem
-> <listitem
-><para
->Abigail </para
-></listitem
-> <listitem
-><para
->Joshua </para
-></listitem
-> <listitem
-><para
->Barnabas</para
-></listitem
-> </itemizedlist>
-
-</section
-> </section>
-</chapter>
-
diff --git a/bibletime-doc/docs/de/howto/unicode/how2-importance.docbook b/bibletime-doc/docs/de/howto/unicode/how2-importance.docbook
deleted file mode 100644
index 5edaea3..0000000
--- a/bibletime-doc/docs/de/howto/unicode/how2-importance.docbook
+++ /dev/null
@@ -1,421 +0,0 @@
-<chapter id="h2-importance"
-><title
->Wert des Wortes des Gottes</title>
-<para
->Gottes Wort zu verstehen ist von großer Wichtigkeit für alle, die Gottes Namen anrufen. Das Studium der Bibel ist einer der ersten Wege um zu lernen mit Gott zu kommunizieren.</para>
-
-<section id="h2-importance-unique"
-><title
->Ein Buch, das einzigartig ist</title>
-<para
-> Die Bibel ist in vielen Dingen überragend. Sie ist einzigartig in: </para>
-<itemizedlist
-> <listitem
-> <para
-> Verbreitung. Verkaufserlöse aus Bibel in Nordamerika: Mehr als 500 Millionen Dollar pro Jahr. Die Bibel ist sowohl insgesamt als auch jährlich der Bestseller. </para
-> </listitem
-> <listitem
-> <para
-> Urheberschaft. Sie wurde in einem Zeitraum von 1600 Jahren von 40 verschiedenen Autoren verschiedener Milieus geschrieben. Sie liest sich jedoch, als ob sie von einem einzigen geschrieben wurde. </para
-> </listitem
-> <listitem
-> <para
-> Erhaltung. F. F. Bruce vergleicht im Buch <emphasis
->Are New Testament Documents Reliable?</emphasis
-> die Manuskripte des neuen Testamentes mit anderen alten Texten: </para
-> </listitem
-> </itemizedlist>
-<table>
-<title
->Vergleich der Schriften des Neuen Testamentes mit anderen alten Texten</title>
-<tgroup cols="5">
-<thead
-> <row
-> <entry
->Werk</entry
-> <entry
->Erstellungszeit</entry
-> <entry
->Erstausgabe</entry
-> <entry
->Zeitspanne</entry
-><entry
->Anzahl von Kopien</entry
-> </row
-></thead>
-<tbody
-> <row
-> <entry
->Herodot</entry
-> <entry
->448-428 v.Chr..</entry
-><entry
->900 n.Chr.</entry
-> <entry
->1300 Jahre</entry
-><entry
->8</entry
-></row
-> <row
-> <entry
->Tacitus</entry
-> <entry
->100 n.Chr.</entry
-><entry
->1100 n.Chr.</entry
-> <entry
->1000 Jahre</entry
-><entry
->20</entry
-></row
-> <row
-> <entry
->Cäsars <emphasis
->Gallischer Krieg</emphasis
-></entry
-> <entry
->50-58 v.Chr.</entry
-><entry
->900 n.Chr.</entry
-> <entry
->950 Jahre</entry
-><entry
->10</entry
-></row
-> <row
-> <entry
->Livius' <emphasis
->Römische Geschichte</emphasis
-></entry
-> <entry
->59 v.Chr. - 17 n.Chr.</entry
-><entry
->900 n.Chr.</entry
-> <entry
->900 Jahre</entry
-><entry
->20</entry
-></row
-> <row
-> <entry
->Neues Testament</entry
-> <entry
->40 n.Chr. - 100 n.Chr.</entry
-><entry
->130 n.Chr. Teile der Manuskripte. 350 n.Chr. alle Manuskripte</entry
-> <entry
->30 - 310 Jahre</entry
-><entry
->5000 Grieschische &amp; 10,000 Lateinische </entry
-></row
-> </tbody
-></tgroup
-></table>
-<para
->Es existieren zehn Kopien von Cäsars <emphasis
->Gallischem Krieg</emphasis
->, die erste wurde 900 Jahre nachdem Cäsars das Original schrieb, kopiert usw. Für das neue Testament haben wir vollständige Manuskripte, die auf 350 n.Chr. datiert werden; Schriftstücke aus den 200er Jahren, die den größten Teil des Neuen Testamentes enthalten und und Fragment des Johannesevangeliums von 130 n.Chr. Wie viele Ausgaben haben wir, um sie miteinander zu vergleichen? 500 in Griechisch und 10000 in Lateinisch! </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 der Wahrheit und Fülle der Beweise, auf der er aufbaut steht der Text des Neuen Testamentes absolut und unerreichbar alleine über den anderen alten Prosaschriften." </para
-></blockquote>
-
-</section>
-<section id="h2-importance-breathed"
-><title
->Ein Buch, das Gott eingegeben hat</title>
-<para
-><emphasis
->Heb.4,12 <quote
-> Denn das Wort Gottes ist lebendig und kräftig...</quote
-></emphasis
->, Jesus sagte <emphasis
->(Mt. 4,4), <quote
->Er aber antwortete und sprach: Es steht geschrieben: "Der Mensch lebt nicht vom Brot allein, sondern von einem jeden Wort, das aus den Mund Gottes geht." </quote
-></emphasis
-> Wenn wir die Bibel lesen ist Gottes Geist da, um es in unsere Herzen hinein zu legen in einer immerwieder frischen Art. </para>
-<para
->2. Timotheus 3:16 erklärt <emphasis
-><quote
->Denn alle Schrift, von Gott eingegeben [wörtlich Gott-gehaucht].</quote
-></emphasis
-> Glauben Sie das? Bevor Sie antworten, ziehen Sie Jesu' Einstellung bezüglich der Schrift in Betracht. </para>
-<blockquote
-><attribution
->John R.W. Stott, <emphasis
->Christ the Controversialist</emphasis
->,
-InterVarsity Press 1978, pp.93-95 </attribution
-><para
->Er bezog sich auf die menschlichen Autoren, aber aktzeptierte es als Tatsache, dass hinter ihnen allen ein göttlicher Autor stand. Er konnte sowohl 'Mose sagt' als auch 'Gott sagte' sagen (Markus 7,10). Er konnte einen Kommentar des Erzählers in 1. Mose 2,24 als einen Ausspruch des Schöpfers selbst zitieren (Matthäus 19,4-5). Ähnlich sagt Er 'Wie fein hat von euch Heuchlern Jesaja geweissagt, wie geschrieben steht', und das, was er weiter zitierte, war die direkte Rede Gottes, des Herrn (Markus 7,6 &amp; Jesaja 29,13). Durch Jesus selbst Jesus haben die Autoren des neuen Testamentes ihre Überzeugung der doppelten Urheberschaft der Schrift. Für sie wahr es genauso richtig zu sagen 'Nachdem Gott vorzeiten vielfach und auf vielerlei Weise geredet hat zu den Vätern durch die Propheten' (Hebräer 1,1) wie 'getrieben von dem heiligen Geist haben Menschen im Namen Gottes geredet' (2. Petrus 1,21) zu sagen. Gott hat weder in dieser Art und Weise gesprochen um die Persönlichkeit des menschlichen Autoren zu tilgen, noch haben Männer in dieser Art und Weise gesprochen um das Wort des göttlichen Autoren zu zerstören. God sprach. Männer sprachen. Keiner der beiden Wahrheiten ist es erlaubt von der anderen abzulenken. ... </para>
-<para
-> Dies war Christi Auffassung der Schriften. Ihr Zeuge war Gottes Zeuge. Das Zeugnis der Bibel ist das Zeugnis Gottes. Und der Hauptgrund, warum Christen an den göttlichen Ursprung der Bibel glauben ist, dass Jesus Christus selbst sie gelehrt hat. </para
-></blockquote>
-
-<para
->2. Timotheus 3,16 geht noch weiter: <emphasis
-><quote
->ist nütze zur Lehre, zur Zurechtweisung, zur Besserung, zur Erziehung in der Gerechtigkeit, dass der Mensch Gottes vollkommen sei, zu allem guten Werk geschickt. </quote
-></emphasis
-> Wenn wir aktzeptieren, dass die Bibel wirklich Gottes Reden zu uns ist, wird die Folge daraus sein, dass sie unsere Autorität in allen Dingen des Glaubens und Wandels ist. </para>
-</section>
-<section id="h2-importance-works"
-><title
->Ein Buch, das arbeitet</title>
-<para
-> Was wird das Studium der Bibel für sie tun? 1. Thessalonicher 2,14 sagt, dass die Bibel <emphasis
-><quote
-> auch wirkt in euch, die ihr glaubet.</quote
-> </emphasis
-> Schreiben Sie neben jede Schrift die Arbeit nieder, die das Wort durchführt. </para>
-<table>
-<title
->Was bringt das Bibelstudium für Christen?</title>
-<tgroup cols="2">
-<thead
-> <row
-> <entry
->Referenz</entry
-> <entry
->Aktion</entry
-> </row
-> </thead>
-<tbody
-> <row
-> <entry
->Epheser 5,26 </entry
-> <entry
->es reinigt -- <quote
->[...] Er hat sie gereinigt durch das Wasserbad im Wort...</quote
-> </entry
-> </row
-> <row
-> <entry
-> Apostelgeschichte 20,32 </entry
-> <entry
-> es erbaut -- <quote
-> Und nun befehle ich euch Gott und dem Wort seiner Gnade, der da mächtig ist, euch zu erbauen und euch das Erbe zu geben mit allen, die geheiligt sind. </quote
-> </entry
-> </row
-> <row
-> <entry
-> Römer 15,4 </entry
-> <entry
-> es ermutigt -- <quote
->Denn was zuvor geschrieben ist, dass ist uns zur Lehre geschrieben, damit wir durch Geduld und den Trost der Schrift Hoffnung haben. </quote
-> </entry
-> </row
-> <row
-> <entry
-> Römer 10,17 </entry
-> <entry
-> es gibt Glauben -- <quote
->So kommt der Glaube aus der Predigt, das Predigen aber durch das Wort Christi.</quote
-> </entry
-> </row
-> <row
-> <entry
-> 1. Korinther 10,11 </entry
-> <entry
-> es warnt -- <quote
-> Die wiederfuhr ihnen als ein Vorbild. Es ist aber geschrieben uns zur Warnung [...]</quote
-> </entry
-> </row
-> <row
-> <entry
-> Matthäus 4,4 </entry
-> <entry
-> Nahrung -- <quote
->Er aber antwortete und sprach: Es steht geschrieben: "Der Mensch lebt nicht vom Brot allein, sondern von einem jeden Wort, das aus dem Wort Gottes geht."</quote
-> </entry
-> </row
-> </tbody>
-</tgroup>
-</table>
-
-</section>
-<section id="h2-importance-liberates"
-><title
->Ein Buch, das befreit</title>
-<para
-> Johanner 8,32 <emphasis
-><quote
->und werdet die Wahrheit erkennen, und die Wahrheit wird euch frei machen. </quote
-></emphasis
-> Dies wird normalerweise durch sich selbst zitiert. Ist die ein bedingtes oder ein unbedingtes Versprechen? Findet es Anwendung auf alle Arten von Weisheit? Finden Sie die Antwort heraus, indem Sie die erste Hälfte des Satzes in Vers 31 untersuchen <emphasis
-><quote
->Wenn ihr bleiben werdet in meinem Wort, so seid ihr Warhaftig meine Jünger...</quote
-></emphasis
-></para>
-<para
->Wir sehen, dass es ein bedingtes Versprechen ist, dass speziell von der Wahrheit Gottes Wortes spricht.</para>
-
-<para
->Das griechische Wort für "Wind", welches in Eph. 4:14 benutzt wird, meint einen <emphasis
->gewaltsamen Wind</emphasis
->. <emphasis
->Als Folge sind wir nicht länger Kinder, hin- und hergeworfen von den Wellen und bewegt von jedem Wind der Lehre [...]</emphasis
->. Eine Sache, die das Studieren der Bibel in uns bewirkt ist ,dass sie uns in der Wahrheit verwurzelt, mit der Folge, dass wir nicht leicht <quote
->weggeblasen werden</quote
->.</para>
-
-<para
-><emphasis
->Jesus aber antwortete und sprach zu ihnen, <quote
->Ihr irrt, weil ihr weder die Schrift kennt noch die Kraft Gottes.</quote
-></emphasis
-> Matthäus 22,29</para>
-<para
->Welche beiden Dinge müssen wir kennen, um von Fehlern abgehalten zu werden?</para>
-<itemizedlist
-> <listitem
-><para
->Gottes Wort</para
-></listitem
-> <listitem
-><para
->Gottes Kraft </para
-></listitem
-> </itemizedlist>
-</section>
-<section id="h2-importance-wars"
-><title
->Ein Buch, das Krieg führt</title>
-<para
-> Epheser 6,10-18 ist ein Bild für unsere geistliche Bewaffnung.</para>
-<table>
-<title
->Geistliche Rüstung</title>
-<tgroup cols="2">
-<thead
-> <row
-> <entry
->Frage</entry
-> <entry
->Antwort</entry
-> </row
-></thead>
-<tbody
-> <row
-><entry
->Wie viele der aufgelisteten Waffen sind Verteidigungswaffen?</entry
-><entry
->5</entry
-></row
-> <row
-><entry
->Wie viele sind Angriffswaffen?</entry
-><entry
->Eine</entry
-></row
-> <row
-><entry
->Welche? </entry
-><entry
->das Wort - <foreignphrase
->rhema</foreignphrase
-></entry
-></row
-> </tbody
-></tgroup
-></table>
-</section>
-<section id="h2-importance-exhortations"
-><title
->Ermahnungen</title>
-<para
-> 2. Thimotheus 2,15<emphasis
-><quote
->Bemühe dich darum, dich vor Gott zu erweisen als einen rechtschaffenen und untadeligen Arbeiter, der das Wort der Wahrheit recht austeilt.</quote
-></emphasis
-> </para>
-<para
-> Kollosser 3,16<emphasis
-><quote
-> Laßt das Wort Christi reichlich unter euch wohnen: lehrt und ermahnt einander in aller Weisheit; mit Psalmen, Lobgesängen und geistlichen Liedern singt Gott dankbar in euren Herzen. </quote
-></emphasis
-> </para>
-
-<para
->Wen Sie in etwas reich sind, wie viel haben Sie dann davon? </para>
-<para
-> Nicht wenig!</para>
-
-<para
-> Prediger 12,11+12 <emphasis
-><quote
->Die Worte der Weisen sind wie Stacheln, und wie eingeschlagene Nägel sind die einzelnen Sprüche; sie sind von einem Hirten gegeben. Und über dem allen, mein Sohn, laß dich warnen; denn des vielen Büchermachens ist kein Ende, und viel Studieren macht den Leib müde. </quote
-></emphasis
-> </para
-> </section>
-
-<section id="h2-importance-once"
-><title
->Anhang: <quote
->Einer für Alle</quote
-></title>
-<blockquote>
-<attribution
->John R. W. Stott, <emphasis
->Christ the Controversialist,</emphasis>
-InterVarsity Press 1978, pp.106-107</attribution
-> <para
->Die Wahrheit betreffend der Endgültigkeit Gottes Initiative in Christus wird durch ein Wort des Griechischen Testamentes ausgedrückt, nämlich durch das Adverb <foreignphrase
->hapax</foreignphrase
-> und <foreignphrase
->ephapax</foreignphrase
->. Es wird normalerweise in der "Authorized Version" mit "einmal" übersetzt, in der Bedeutung von "einmal für immer" [<emphasis
->Anm. d. Übers.: eng. "once for all" kann auch als "entgültig" übersetzt werden</emphasis
->]. Es wird für das benutzt, was ewige Gültigkeit hat und niemals Wiederholung benötigt und es wird im Neuen Testament auf Offenbarung und Erlösung angewandt. Folglich bezieht sich Judas auf den Glauben, der einmal für immer den Heiligen übergeben wurde (Judas 3), und Römer sagt <emphasis
-><quote
->Denn was er gestorben ist, das ist er der Sünde ein für allemal [...]</quote
-></emphasis
-> (Römer 6,10, siehe auch 1. Petrus 3,18; Hebräer 9,26-28). </para
-> <para
-> Folglich können wir sagen, dass Gott einmal für immer gesprochen hat und das Christus einmal für immer gelitten hat. Dies bedeutet, dass die christliche Offenbarung und die christliche Erlösung gleicherweise in Christus erfüllt sind. Nichts kann zu beiden hinzugefügt werden ohne schadend für Christus zu sein... Die beiden Fundamente [<emphasis
->Anm. d. Übers. eigentlich rock = Felsen</emphasis
->] auf die die protestantische Reformation aufgebaut wurde sind -- Gottes offenbartes Wort ohne den Ergänzungen menschlicher Traditionen und Christi vollendetes Werk ohne den Ergänzungen menschlicher Verdienste. Die großen Losungen der Reformer waren <foreignphrase
->sola scriptura</foreignphrase
-> für die Autorität und <foreignphrase
->sola gratia</foreignphrase
-> für unsere Erlösung.</para>
-</blockquote>
-
-</section>
-<section id="h2-importance-supplement"
-><title
->Anhang: Bibellesepläne</title
-> <para
-> Hier sind einige einfache Programme für Sie, um systematisch ihre Bibel zu lesen. Sie können mehrere gleichzeitig durchführen, so zum Beispiel #1 mit #4 oder #2 mit #5. Verändern Sie das Programm von Jahr zu Jahr um es frisch zu halten. </para>
-<orderedlist numeration="arabic"
-> <listitem
-><para
->Das neue Testament in einem Jahr: Lesen Sie jeden Tag ein Kapitel, fünf Tage die Woche.</para
-></listitem
-> <listitem
-><para
-> Die Sprüche in einem Monat: Lesen Sie jeden Tag ein Kapitel der Sprüche, dem aktuellen Tag des Monats entsprechend.</para
-></listitem
-> <listitem
-><para
->Die Psalmen in einem Monat: Lesen Sie täglich 5 Psalmen in einem Intervall von 30, am 20. müssten Sie zum Beispiel die Psalmen 20,50,80,110 &amp; 140 lesen.</para
-></listitem
-> <listitem
-><para
->Psalme &amp; Sprüche in 6 Monaten: Lesen Sie sich durch die Psalmen und Sprüche mit einem Kapitel täglich.</para
-></listitem
-> <listitem
-><para
->Das alte Testament ohne Psalmen und Sprüchen in 2 Jahren: Wenn Sie täglich ein Kapitel lesen und wenn sie die Psalmen und Sprüche auslassen, werden Sie das alte Testament in 2 Jahren und 2 Wochen durchlesen. </para
-></listitem
-> </orderedlist>
-</section>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/howto/unicode/how2-interpretation.docbook b/bibletime-doc/docs/de/howto/unicode/how2-interpretation.docbook
deleted file mode 100644
index 3ed8abf..0000000
--- a/bibletime-doc/docs/de/howto/unicode/how2-interpretation.docbook
+++ /dev/null
@@ -1,289 +0,0 @@
-<chapter id="h2-rules"
-><title
->Regeln der Bibelauslegung (Hermeneutik)</title>
-<para
->Wir haben bereits von den <quote
->3 C</quote
-> gelernt: Inhalt (="content"), Kontext (="context") Querverweise (="cross-reference"). Wir möchten dies nun durch kurzes Erforschen der biblischen Hermeneutik erweitern. Das Ziel der biblischen Hermeneutik ist es, die Bedeutung zu entdecken, wie sie von dem ursprünglichen Autoren gemeint war. Während viele Anwendungen eines Abschnittes möglich sind, ist jedoch nur eine Auslegung möglich. Die Schriften selbst sagen, dass kein Manuskript eine eigene Auslegung hat (2. Petrus 1,20 <emphasis
-><quote
->Und das sollt ihr vor allem wissen, dass keine Weissagung in der Schrift eine Sache eigener Auslegung ist</quote
-></emphasis
->))- Verschiedene Regeln sind Hilfen zum Entdecken der richtigen Bedeutung; durch das Ignorieren dieser Regeln haben Menschen viele Schwierigkeiten für sich selbst und ihre Nachfolger gebracht. 2. Petrus 3,16 <emphasis
-><quote
->...in denen einige Dinge schwer zu verstehen sind, welche die Unwissenden und Leichfertigen verdrehen, wie auch die anderen Schriften zu ihrer eigenen Verdammnis.</quote
-></emphasis
-></para>
-<para
->Wie gehen wir nun vor, um die [ursprünglich] gewollte Bedeutung eines Abschnittes zu entdecken? Lassen Sie uns annehmen, dass ihre Aufmerksamkeit auf einen bestimmten Vers gezogen wurde, dessen Bedeutung ihnen nicht klar ist. Wie studieren Sie ihn? Behalten Sie sich diese Regeln:</para>
-
-<section id="h2-rules-exact"
-><title
->Regel 1: Legen Sie der genauen Bedeutung der Wörter aus.</title>
-<para
->Je präziser wir mit der exakten, ursprünglichen Bedeutung der Wörter sein können, desto besser ist unsere Auslegung. Versuchen Sie die exakte Bedeutung zu finden, indem sie die folgenden Schritte befolgen:</para>
-
-<section id="h2-rules-exact-definition"
-><title
->Schritt 1) Bestimmung</title>
-<para
->Schlagen Sie die Bestimmung in einem Griechisch oder Hebräisch Lexikon nach. Für Verben ist die Verbform ebenfalls entscheidend.</para
-></section>
-
-<section id="h2-rules-exact-crossref"
-><title
->Schritt 2) Querverweise</title>
-<para
->Vergleichen Sie Schrift mit Schrift. Zu sehen, wie das selbe griechische oder hebräische Wort (nicht das deutsche Wort) in der Schrift benutzt wird, kann die Bestimmung klären oder neu beleuchten. Wie benutzt der selbe Autor das Wort anderswo? Und andere Autoren? Ihre Referenzwerkzeuge könnten ihnen auch die Benutzung des Wortes in nicht-biblisches Dokumenten geben. How does the same author Warum müssen wir in die ursprüngliche Sprache gehen; warum ist das Deutsche Wort nicht gut genug? WEIL MEHR ALS EIN GRIECHISCHES WORT IN DAS SELBE DEUTSCHE ÜBERSETZT WERDEN KANN, UND WEIL DIE GRIECHISCHEN WÖRTER VERSCHIEDENE ABSTUFUNGEN HABEN KANN.</para>
-
-<section id="h2-rules-exact-crossref-ex1a"
-><title
->Beispiel 1A</title>
-<para
->Johannes 20,17 <emphasis
-><quote
->Rühre mich nicht an</quote
-></emphasis
-> klingt hart, nicht? Es klingt, dass Jesus nicht berührt werden wollte, jetzt wo er auferstanden ist, dass er zu heilig or etwas ähnliches ist. Aber das scheint nicht richtig zu sein, darum lasst es uns in Spiros Zodhiates' <emphasis
->The Complete Word Study New Testament</emphasis
-> (AMG Publishers, 1991). nachschlagen.</para>
-<para
->Bestimmung: Nach dem Aufschlagen von Johannes 20,17 sehen wir über dem Wort <quote
->Rühre</quote
-> <quote
->pim680</quote
->. Die Buchstaben geben uns einen Code für den Teil der Sprache, und die Nummer bezieht sich auf das Stronglexikon. Lasst uns die Bedeutung nachschlagen (S. 879). <quote
->680. Haptomai; von hapto (681), berühren. Bezieht sich auf solche Behandlung auf ein Objekt, die darauf einen verändernden Einfluß ausübt. Unterscheidet sich von pselaphao (5584), was nur bedeutet, die Oberfläche von etwas zu berühren.</quote
-> Schlagen wir nun <quote
->pim</quote
-> nach. Die Grammatikcodes in Zodhiates kommen direkt nach der Offenbarung; auf Seite 849 sehen wir, dass pim für <quote
->Präsens Imperativ Aktiv (80)</quote
-> steht. Auf Seite 857 steht <quote
->Präsens Imperativ. In der gesprochenen Rede kann es ein Gebot bezeichnen, etwas in der Zukunft zu tun, was eine andauernde oder wiederholte Handlung einschließt oder, wenn es verneint ist, ein Gebot aufzuhören etwas zu tun.</quote
-> Dies hier ist ein verneinter Befehl, so dass es dafür da ist etwas zu stoppen was schon geschieht. Was haben wir nun?</para>
-<para
-><emphasis
->MARIA KLAMMERT SICH BEREITS AN JESUS, UND ER SAGT DAMIT AUFZUHÖHREN IHN ZU HALTEN!</emphasis
-></para>
-</section>
-
-<section id="h2-rules-exact-crossref-ex1b"
-><title
->Beispiel 1B</title>
-<para
->In Jakobus 5,14 lesen wir, dass <emphasis
->Die Ältesten sollen für jemanden, der krank ist, beten und ihn mit Öl salben</emphasis
->. Was ist dieses salben?</para>
-<para
->Bedeutung von aleipho (218) - <quote
->ölen</quote
-> (Stroong); wir haben jedoch auch ein anderes griechisches Wort, das mit <quote
->einölen</quote
-> übersetzt wird, chrio (5548) - <quote
->einschmieren oder einreiben mit Öl, d.h. segnen für einen amtlichen oder religiösen Dienst</quote
-> (Strong). Da es ein Verb ist, ziehen Sie die Form auch in Betracht, <quote
->apta</quote
-> Aorist Partizip Aktiv. <quote
->Das Aorist Partizip drückt einfache Handlung aus, im Gegensatz zur andauernden Handlung... Wenn die Beziehung zum Hauptverb temporal ist, kennzeichnet es normalerweise eine Handlung, die früher als die des Hauptverbes stattfindet. </quote
-> (Zodhiates S. 851)</para>
-
-<screen>
-Querverweise für aleipho:
-  Matthäus.6,17 Wenn du aber fastest, so salbe dein Haupt...
-  Markus 16,1 Und als der Sabbat vergangen war, kauften Maria von Magdalena  und Maria, die Mutter des Jakobus, und Salome wohlriechende Öle, um  hinzugehen und ihn zu salben.
-  Markus 6,13 [...] und salbten viele Kranke mit Öl und machten sie gesund.
-  Lukas 7,38 ...und küßte seine Füße und salbt sie mit Salböl
-  Johannes 12,3 Maria ... salbte die Füße Jesu und trocknete mit ihrem Haar  seine Füße ...
-
-Querverweise für chrio:
-  Lukas 4,18 "Der Geist des Herrn ist auf mir, weil er mich gesalbt hat zu  verkündigen..."
-  Apostelgeschichte 4,27 ...Jesus, den du gesalbt hast... 
-  Apostelgeschichte 10,378 wie Gott Jesus von Nazareth gesalbt hat mit  heiligem Geist und Kraft
-  2. Korinther 1,21 Gott ist's aber, der ... uns gesalbt
-</screen>
-
-<para
->Was ist nun der Unterschied zwischen aleipho und chrio? Schauen Sie erneut die Querverweise und die Definitionen an und sammeln Sie die Unterschiede: ALEIPHO IST PRAKTISCHE BENUTZUNG VON ÖL UND CHRIO IST DIE GEISTLICHE. </para>
-
-<para
->Zur Illustration (obwohl hier das Wort nicht benutzt wird) der praktischen Benutzung von Öl zu dieser Zeit ist der barmherzige Samariter, der für den von Räubern geschlagenen Mann sorgte und mit Öl und Wein die Wunden säuberte. Öl hatte also eine medizinische Bedeutung zur Zeit Jesu. </para>
-<para
->Jetzt lasst uns das durch diese Wortstudie Gelernte auf Jakobus 5,14 anwenden <emphasis
-><quote
->Ist jemand unter euch krank, der rufe zu sich die Ältesten der Gemeinde, dass sie über ihm beten und ihn salben mit Öl im Namen des Herrn.</quote
-></emphasis
-> Ist hier <quote
->salben</quote
-> geistlich oder praktisch? Praktisch!</para>
-<para
-> Und die Form im griechischen, das Partizip Aorist, könnte besser mit <quote
->gesalbt haben</quote
-> übersetzt werden, so dass in der Reihenfolge erst dass Salben und dann das Gebet kommt (<quote
->Im Namen des Herrn</quote
-> bezieht sich aus Gebet, nicht auf das Salben). Jakobus 5 sagt, dass die Ältesten der kranken Person Medizin geben und für ihn im Namen des Herrn beten sollen. Drückt dass nicht das wunderbare Gleichgewicht zwischen Praktischem und Geistlichem in unseren Gott aus? </para>
-</section>
-</section>
-</section>
-
-<section id="h2-rules-context"
-><title
->Regel 2 - Auslegung im biblischen Zusammenhang</title>
-<para
->Schriftauslegung in Harmonie mit anderen Schriften. Was sagen die Verse jeder Seite aus? Was ist das Thema des Kapitels? Des Buches? Stimmt ihre Auslegung mit diesen überein? Wenn nicht, so ist sie fehlerhaft. Normalerweise vesorgt uns der Zusammenhang mit dem, was wir zu richtigen Auslegung des Abschnitts benötigen. Kontext ist König. Wenn immer noch Verwirrung über die Bedeutung nach der Auslegung des Textes ín seinem Zusammenhang besteht, müssen wir weiter nachforschen.</para>
-
-<section id="h2-rules-context-ex2a"
-><title
->Beispiel 2A</title>
-<para
->In einer vorherigen Unterrichtsstunde haben wir Johannes 3,5 <emphasis
-><quote
->geboren ... aus Wasser und Geist</quote
-></emphasis
-> In Bezug auf den Kontext, was ist das Wasser in dieser Diskussion?</para>
-<para
->Wassertaufe steht hier nicht in der Diskussion, was eine große Verschiebung des von Jesus und Nikodemus diskutierten Themas wäre. Halten Sie Ausschau nach einem plötzlichen Wechsel des Themas, es könnte ein Hinweis sein, dass ihre Auslegung entgleist ist! Das Wasser ist die lebensspendende Flüssigkeit, <quote
->geboren aus Wasser</quote
-> = natürliche Geburt.</para>
-</section>
-<section id="h2-rules-context-ex2b"
-><title
->Beispiel 2B</title>
-<para
->1 Korinther 14,34 <emphasis
-><quote
->[...] die Frauen [sollen] schweigen in der Gemeindeversammlung</quote
-></emphasis
-> muss mit in den bibilischen Zusammenheng von 1. Korinther 11,5 <quote
->Ein Frau aber, die betet oder prophetisch redet...</quote
-> genommen werden.</para>
-</section>
-<section id="h2-rules-context-ex2c"
-><title
->Beispiel 2C</title>
-<para
->Apostelgeschichte 2,38 <emphasis
->Petrus sprach zu ihnen: <quote
->Tut Buße, und jeder lasse sich taufen auf den Namen Jesu Christi zur Vergebung eurer Sünden...</quote
-></emphasis
-> Ist dies Wiedergeburt durch Taufe? Wenn es der einzige Vers der Schrift wäre, den wir hätten, müssten wir das folgern. Aber in dem Licht der klaren Lehre an anderen Stelle, dass Wiedergeburt durch den Glauben an Christus geschieht, müssen wir es anderes auslegen. Petrus drängt die Taufe als einen Weg für seine Hörer auf das Evangelium zu antworten. Wenn die Taufe der Weg wäre, wiedergeboren zu werden, wie könnte Paulus dann in 1. Kor. 1,17 schreiben <emphasis
-><quote
->Denn Christus hat mich nicht gesandt zu taufen, sondern das Evangelium zu verkünden</quote
-></emphasis
->? </para>
-</section>
-</section>
-
-<section id="h2-rules-hcontest">
-<title
->Regel 3 - Auslegung im geschichtlichen und kulturellen Zusammenhang</title>
-<para
-> Zuallererst fragen wir nicht "Was bedeutet dies für mich?" sondern "Was hat es für den ursprünglichen Autoren bedeutet?"; später können wir fragen "Was bedeutet es für mich?" Wir müssen den geschichtlichen und kulturellen Hintergrund des Autoren und der Empfänger in Betracht ziehen.</para>
-
-<section id="h2-rules-hcontest-ex3a"
-><title
->Beispiel 3A</title
-><para
-> "3 Tage &amp; 3 Nächte" (Mt.12,40) haben zur "MittwochsKreuzigungstheorie" geführt, besonders der Kult der Armstrongism. <emphasis
-> Anm. des Übers.: Leider weiss ich nicht, was Armstronism für ein Kult ist</emphasis
->. Wie  konnte Jesus am Freitag sterben und am Sonntag Morgen auferstehen ("...am dritten Tage auferstehen" (Mt. 16,21))? Genaue Bedeutungen von "drei" oder "Tagen" helfen nicht, den scheinbaren Widerspruch zu erklären.</para>
-<para
->Wir benötigen einen geschichtlichen Leckerbissen: Die Juden zählten jeden Teil eines Tages als vollen Tag, so wie wir Eimer Wasser zählen würden (wenn wir sechs und einen halben Eimer Wasser hätten, würden wir sagen dass es sieben Eimer Wasser sind sogar wenn der letzte nur teilweise voll ist). Dies istdie jüdische Art. Jeder Teil eines Tages wurde als voller Tag gezählt, Tage begannen um 18h und endeten um 6h. Freitag von 15h bis 18h = 1. Tag. Freitag von 18h bis Samstag 18h = 2. Tag. Samstag 18.00h bis Sonntag vielleicht 5h = 3. Tag. Die Auslegung im kulturellen Kontext bringt uns aus den Schwierigkeiten heraus.</para>
-</section>
-
-<section id="h2-rules-hcontest-ex3b"
-><title
->Beispiel 3B</title
-><para
->1. Mose 15,7-21. Der historische Zusammenhang ist, dass das teilen von Tieren in zwei Teile und dass nachfolgende Gehen zwischen ihnen der normale Weg zu Abrahams Zeit war, einen Vetrag zu schließen. Beide Vetragspartner gingen dazwischen hindurch, den Pfand nehmend, dass Zerstückelung auf sie kommen solle, wenn sie nicht ihren Teil des Vertrages halten. Aber in diesem Falle geht nur Gott hindurch, was dies zu einem einseitigen Vetrag macht.</para>
-</section>
-</section>
-
-<section id="h2-rules-normal"
-><title
->Regel 4 - Auslegung in Bezug auf der normalen Benutzung der Worte in der Sprache</title>
-<para
->Lassen Sie wörtliche Sprache wörtlich sein und bildliche Sprache bildlich sein. Und achten Sie auf Idiome, die eine besondere Bedeutung haben.</para>
-
-<section id="h2-rules-normal-ex4a"
-><title
->Beispiel 4A</title
-><para
-><quote
->böses Auge</quote
-> in Mt.6,23. </para>
-<para
->Regel 1 - Definition von <quote
->böse</quote
-> und <quote
->Auge</quote
-> - hilft hier nicht. Regel 2, Zusammenhang: Dies scheint uns nur noch mehr zu verwirren. Es scheint nicht mit dem zu passen, was davor und danach steht! Dies sollte uns zeigen, dass wir es nicht richtig verstehen.</para>
-<para
->Was wir hier haben ist ein hebräisches Idiom, <quote
->böses Auge</quote
->. Lasst uns andere Benutzungen dieses Idioms nachschlagen: Mt. 20,15 <quote
-><emphasis
->Oder habe ich nicht die Macht zu tun, was ich will, mit dem was mein ist? Siehst du scheel [wörtl. <quote
->böse</quote
->] drein, weil ich so gütig [wörtl. <quote
->gut</quote
->] bin?</emphasis
-></quote
->. Wir sehen, dass ein <quote
->Böses Auge</quote
-> zu haben ein Idiom für geizig oder neidisch sein ist.Jetzt  gehen Sie zurück zu Mt. 6 und sehen Sie, wie dieses Verständnis so perfekt in den Zusammenhang passt.</para>
-
-<section id="h2-rules-normal-ex4b"
-><title
->Beispiel 4B</title>
-<para
->Jesaja 59,1 <quote
-><emphasis
->[...] des Herrn Arm ist nicht zu kurz</emphasis
-></quote
-> Deut.33:27 <quote
-><emphasis
-> unter den ewigen Armen.</emphasis
-></quote
-> Verweise auf Körperteile von Gott werden von den <quote
->Mormonen</quote
-> [Anm. des Übers.: im eng. "Latter-Day Saints"] um nachzuweisen, dass Gott einst ein Mann wie wir war. Nachdem sie die Menschen davon überzeugt haben, beginnen sie weiter zu lehren, dass wir Gott werden können wie er es tat. Auf einem Vortrag den Walter  Martin (Autor von <emphasis
->Kingdom of the Cults</emphasis
->) gab, forderte eine Gruppe von Mormonenältesten  ihn mit einer Versaufzählung wie diesen heraus. Dr. Martin forderte die Mormonen dann heraus, eine weitere Stelle zu lesen: Psalm 91,4 <quote
-><emphasis
->Er wird dich mit seinen Fittichen decken, und Zuflucht wirst du haben unter seinen Flügeln...</emphasis
-></quote
->. W.M. folgerte "Mit den selben Regeln der Auslegung, mit denen sie gerade festgestellt haben, dass Gott ein Mann ist, haben sie gerade festgestellt, dass Gott ein Vogel ist." Die Mormonen mussten lachen, als sie die Lächerlichkeit ihrer Position realisierten. </para>
-</section>
-</section>
-</section>
-<section id="h2-rules-parables"
-><title
->Regel 5 - Verstehen des Zwecks einer Parabeln und des Unterschiedes zwischen einer Parabel und einer Allegorie</title>
-<para
->Eine Allegorie ist: EINE GESCHICHTE; IN DER JEDES ELEMENT EINE BEDEUTUNG HAT </para>
-<para
->Jede Parabel ist eine Allegorie, whar oder falsch?</para>
-
-<para
->Einige Gleichnisse sind Allegorien, zum Beispiel ist das Gleichnis des Sähmanns eine Allegorie. Der Samen ist das Wort Gottes, die Dornen sind Sorgen und Gier, usw. Die meisten Gleichnisse sind keine Allegorien, sondern einfache Geschichten, um einen bestimmten Punkt zu verdeutlichen. Es ist gefährlich unsere Lehren von Gleichnissen zu gewinnen; sie können so gedreht werden, alle Dinge auszusagen. Wir müssen unsere Lehre von klaren Schriftstellen bekommen, die es auslegen; wenn ein Gleichnis dies zusätzlich verdeutlicht ist es hilfreich.</para>
-
-<section id="h2-rules-parables-ex5a"
-><title
->Beispiel 5A</title>
-<para
->Das Gleichnis der Witwe mit dem ungerechten Richter in Lukas 18,1-8. Diese Geschichte verdeutlicht eine Lektion: Mut im Gebet. [Anm. d. Üb.: im Engl. "boldnessin prayer"]. Wenn wir das Ganze in eine Allegorie verwandeln, was haben wir dann?</para>
-<para
->Alle Arten von Gewalt geschehen in der Bedeutung: Gott ist widerwillig die Rechte der Witwen zu schützen, Gebete "ärgern" Ihn, usw.</para
-></section>
-
-<section id="h2-rules-parables-ex5b"
-><title
->Beispiel 5B</title>
-<para
->Das Gleichniss der unehrlichen Verwalters in Lukas 16,1-9. Was ist der Knackpunkt des Gleichnisses? Ist es eine Allegorie? </para>
-<para
->Der Verwalter wird nur für eine Sache gelobt, seine Schlauheit in der Benutzung von Dingen, die er vorbereiten muss für eine Zeit, in der er sie nicht haben würde. Aber er wird nicht für sein unethisches Verhalten gelobt, nämlich seinen Herren zu hintergehen. </para>
-</section>
-
-</section>
-</chapter>
-
diff --git a/bibletime-doc/docs/de/howto/unicode/index.docbook b/bibletime-doc/docs/de/howto/unicode/index.docbook
deleted file mode 100644
index b60c87d..0000000
--- a/bibletime-doc/docs/de/howto/unicode/index.docbook
+++ /dev/null
@@ -1,126 +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
->Das Biblestudy HowTo</title>
-
-<authorgroup>
-<author
-> <firstname
->Bob</firstname
-> <surname
->Harman</surname
-> </author>
-</authorgroup>
-
-ROLES_OF_TRANSLATORS
-
-<copyright>
-<year
->2001</year
-><year
->2002</year>
-<holder
->BibleTimeinfo@bibletime.de</holder>
-</copyright
-><copyright>
-<year
->2001</year
-><year
->2002</year>
-<holder
->Bob Harman</holder>
-</copyright>
-
-<legalnotice
-><para
-> This 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
->N_Cov_Church@compuserve.com</email
-></para>
-
-<para
-><emphasis
->Anm. des Übersetzers:</emphasis
-> Der deutsche Text der Bibelstellen ist der deutschen revidierten Lutherbibel von 1984 entnommen. Ich übernehme keinerlei Garantie für die Übersetzung, weder für falsche Wiedergabe noch für unwörtliche und sinnverfälschende Übersetzung. Ich habe mit bestem Wissen und Können übersetzt. Da ich jedoch kein Übersetzer bin, können sich Fehler eingeschlichen sein. Die Originalfassung wird in Englisch mit BibleTime mitgeliefert.</para>
-</legalnotice>
-
-
-<date
->10/23/2001</date>
-<releaseinfo
->1.01.00</releaseinfo>
-
-
-<abstract>
-<title
->Zusammenfassung</title>
-<para
-> Die <application
->Anleitung zum Bibelstudium</application
-> ist ein Handbuch zum Studieren der Bibel. </para>
-<para
->Bibletime Anleitung.</para>
-</abstract>
-
-<keywordset>
-<keyword
->Bibel</keyword>
-<keyword
->Studieren</keyword>
-<keyword
->Anleitung</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:
--->
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bibletime-doc/docs/de/install/Makefile.am b/bibletime-doc/docs/de/install/Makefile.am
deleted file mode 100644
index 98eb499..0000000
--- a/bibletime-doc/docs/de/install/Makefile.am
+++ /dev/null
@@ -1,39 +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 = html unicode 
-
-po-files:
-	for f in `ls ../../en/install/pot/*.pot`; do \
-		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/install\/pot\/"//`; \
-		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \
-		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \
-		msgmerge -o po/$$pofile.new po/$$pofile $$f; \
-		if diff po/$$pofile po/$$pofile.new > /dev/null; then \
-		rm po/$$pofile.new; \
-		else \
-		mv po/$$pofile.new po/$$pofile; \
-		fi; \
-	done;
-
-
-unicode-files:
-	for f in `ls ../../en/install/unicode/*.docbook`; do \
-		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/install\/unicode\/"//`; \
-		newfile=`echo $$f | sed s/"..\/..\/en\/install\/unicode\/"//`; \
-		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \
-		po2xml $$f po/$$pofile > unicode/$$newfile; \
-	done;
-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/bibletime-doc/docs/de/install/Makefile.in b/bibletime-doc/docs/de/install/Makefile.in
deleted file mode 100644
index 818b547..0000000
--- a/bibletime-doc/docs/de/install/Makefile.in
+++ /dev/null
@@ -1,495 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = html unicode 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/install/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/install
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/install/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-po-files:
-	for f in `ls ../../en/install/pot/*.pot`; do \
-		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/install\/pot\/"//`; \
-		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \
-		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \
-		msgmerge -o po/$$pofile.new po/$$pofile $$f; \
-		if diff po/$$pofile po/$$pofile.new > /dev/null; then \
-		rm po/$$pofile.new; \
-		else \
-		mv po/$$pofile.new po/$$pofile; \
-		fi; \
-	done;
-
-unicode-files:
-	for f in `ls ../../en/install/unicode/*.docbook`; do \
-		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \
-		pofile=`echo $$pofile | sed s/"..\/..\/en\/install\/unicode\/"//`; \
-		newfile=`echo $$f | sed s/"..\/..\/en\/install\/unicode\/"//`; \
-		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \
-		po2xml $$f po/$$pofile > unicode/$$newfile; \
-	done;
-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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/install/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/install/html/Makefile.am b/bibletime-doc/docs/de/install/html/Makefile.am
deleted file mode 100644
index 1df3c79..0000000
--- a/bibletime-doc/docs/de/install/html/Makefile.am
+++ /dev/null
@@ -1,31 +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 = instmgr.png 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/install/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  instmgr.png; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/install; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/install/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/install/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  instmgr.png; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;
diff --git a/bibletime-doc/docs/de/install/html/Makefile.in b/bibletime-doc/docs/de/install/html/Makefile.in
deleted file mode 100644
index e11fce0..0000000
--- a/bibletime-doc/docs/de/install/html/Makefile.in
+++ /dev/null
@@ -1,390 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = instmgr.png 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=inst-user-source.html inst-preq.html instmgr-load.html installmgr.html inst-user.html inst-bin.html inst-user-troubleshooting.html installmgr-install.html instmgr-rep.html index.html inst-sources.html instmgr-cfg.html 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/html/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/install/html/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/install/html
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/install/html/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/install/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  instmgr.png; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/install; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/install/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/install/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  instmgr.png; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/install/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/install/html/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/install/html/index.html b/bibletime-doc/docs/de/install/html/index.html
deleted file mode 100644
index 7a46b7b..0000000
--- a/bibletime-doc/docs/de/install/html/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>BibleTime Installationsanleitung</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="next" href="inst-bin.html" title="Chapter 1. BibleTime Programmdateien "></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>BibleTime Installationsanleitung</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-bin.html">Next</a></td></tr></tbody></table></div></div><div class="book" id="id2799270"><div class="titlepage"><div><h1 class="title"><a name="id2799270"></a>BibleTime Installationsanleitung</h1></div><div><h3 class="author">Joachim Ansorg</h3><h3 class="author">Fred  Saalbach</h3><h3 class="author">Jeffrey Hoyt</h3></div><div>Revision <span class="releaseinfo">1.01.00<br></span></div><div><p class="copyright">Copyright � 1999, 2000, 2001 Das BibleTime Team, info@bibletime.de</p></div><div><div class="legalnotice"><p>Die BibleTime Installationanleitung ist ein Teil von BibleTime. </p><p> BibleTime ist freie Software; sie k�nnen es vertreiben und/oder ver�ndern, entsprechend den Bestimmungen der GNU General Public License, die von der Free Software Foundation publiziert wird; entweder Version 2 der Lizenz, oder (je nach Wunsch) jede sp�tere Version. </p><p> Dieses Programm wird vertrieben in der Hoffnung, dass es hilfreich ist; jedoch OHNE JEDE GARATIE. Lesen Sie die GNU General Public License f�r weitere Details. </p><p> Sie sollten eine Kopie der GNU General Public License mit diesem Programm erhalten haben. Wenn nicht, dann schreiben sie an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. </p></div></div><div><div><div class="abstract" id="id2798347"><a name="id2798347"></a><p> BibleTime ist ein Programm f�r das Bibelstudium. </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="inst-bin.html">BibleTime Programmdateien </a></dt><dt>2 <a href="inst-preq.html">BibleTime Systemanforderungen </a></dt><dd><dl><dt> <a href="inst-preq.html#devl-10"> Anforderungen f�r BibleTime 1.1</a></dt></dl></dd><dt>3 <a href="inst-sources.html">Installation der BibleTime Quellen</a></dt><dd><dl><dt> <a href="inst-sources.html#inst-sources-sword">Installation von Sword und der Sword Module </a></dt><dd><dl><dt> <a href="inst-sources.html#inst-sources-sword-install">Installation von SWORD </a></dt><dt> <a href="inst-sources.html#inst-sources-sword-modules">Installation der Module</a></dt></dl></dd></dl></dd><dt>4 <a href="inst-user.html">Installation von BibleTime</a></dt><dd><dl><dt> <a href="inst-user.html#inst-user-RPM">RPM Installation</a></dt><dt> <a href="inst-user-source.html">Quellcode</a></dt><dt> <a href="inst-user-troubleshooting.html">Problembehebung</a></dt></dl></dd><dt>5 <a href="installmgr.html">Installations- und Bedienungsanweisung f�r den Sword Installmgr</a></dt><dd><dl><dt> <a href="installmgr.html#installmgr-req"> Voraussetzungen des Sword Installmgr</a></dt><dt> <a href="installmgr-install.html">Sword Installmgr</a></dt><dt> <a href="instmgr-rep.html">Vorbereitung Ihres Archives</a></dt><dt> <a href="instmgr-cfg.html">Die Sword Konfigurationsdatei einrichten.</a></dt><dt> <a href="instmgr-load.html">Sword Installmgr benutzen, um Sword-Module zu installieren.</a></dt></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="inst-bin.html">Next</a></td></tr><tr><td width="33%" align="left">�</td><td width="34%" align="center">�</td><td width="33%" align="right">�BibleTime Programmdateien </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/inst-bin.html b/bibletime-doc/docs/de/install/html/inst-bin.html
deleted file mode 100644
index d15e533..0000000
--- a/bibletime-doc/docs/de/install/html/inst-bin.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 1. BibleTime Programmdateien </title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="index.html" title="BibleTime Installationsanleitung"><link rel="previous" href="index.html" title="BibleTime Installationsanleitung"><link rel="next" href="inst-preq.html" title="Chapter 2. BibleTime Systemanforderungen "></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>BibleTime Programmdateien </h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-preq.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="inst-bin"></a>Chapter 1. BibleTime Programmdateien </h2></div></div><p>Programmdateien werden in den folgenden Formaten zur Verf�gung gestellt.</p><div class="table"><p><a name="id2737752"></a><b>Table 1.1. BibleTime Distributionsformate</b></p><table summary="BibleTime Distributionsformate" border="1"><colgroup><col><col></colgroup><thead><tr><th>Formatname</th><th>Beschreibung</th></tr></thead><tbody><tr><td> RPM-Pakete. </td><td> Besuchen Sie die <a href="http://sourceforge.net/projects/bibletime" target="_top"> Sourceforge BibleTime</a> Homepage f�r die unterst�tzte Distributionen. RPM-Pakete werden mit dem entsprechenden Paketmanager installiert. RPM-Installationsanweisungen befinden sich <a href="inst-user.html#inst-user-RPM" title="RPM Installation">hier</a>. </td></tr><tr><td> Quellcode </td><td> Der Quellcode kann auf jeder Distribution installiert werden, die die Installationsvoraussetzungen erf�llt. Der Quellcode sollte auch auf Nicht-Intel&#8482;-Plattformen und den meisten UNIX�-Plattformen kompilierbar sein, die die Installationsvoraussetzungen erf�llen. Anweisungen f�r die Installation vom Quellcode aus befinden sich <a href="inst-user-source.html" title="Quellcode">hier</a>. </td></tr></tbody></table></div><p> Sprachmodule, die das BibleTime Handbuch, Bible Study HowTo, Installationsanweisungen und den Hilfedialog enthalten, werden in separaten RPM-Paketen bereitgestellt, ebenso als Tarball-Quellen. Die Sprachmodule enthalten die Dokumente in HTML und XML&#8482; Docbook-Format, sodass die ohne das normale BibleTime-Paket angesehen werden k�nnen.</p><p>Sprachmodule werden in der selben Art und Weise wie das Programmmodul installiert. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="inst-preq.html">Next</a></td></tr><tr><td width="33%" align="left">BibleTime Installationsanleitung�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�BibleTime Systemanforderungen </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/inst-preq.html b/bibletime-doc/docs/de/install/html/inst-preq.html
deleted file mode 100644
index e81a52d..0000000
--- a/bibletime-doc/docs/de/install/html/inst-preq.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 2. BibleTime Systemanforderungen </title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="index.html" title="BibleTime Installationsanleitung"><link rel="previous" href="inst-bin.html" title="Chapter 1. BibleTime Programmdateien "><link rel="next" href="inst-sources.html" title="Chapter 3. Installation der BibleTime Quellen"></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>BibleTime Systemanforderungen </h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-bin.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="inst-sources.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="inst-preq"></a>Chapter 2. BibleTime Systemanforderungen </h2></div></div><div class="section"><a name="devl-10"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="devl-10"></a> Anforderungen f�r BibleTime 1.1</h2></div></div><p> Alle ben�tigten Pakete, um BibleTime zu �bersetzen, sind in den meisten Linux� Distributionen enthalten. Es ist ebenfalls m�glich, BibleTime auf den meisten anderen UNIX� Distributionen zu �bersetzen.Wenn Sie �bersetzungsfehler erhalten lesen sie die Meldungen, diese sollten sie zu den ben�tigten Paketen f�hren, die sie wahrscheinlich auf den Installations CDs finden werden. </p><p> Die folgende Tabelle enth�lt die Mindestanforderungen, damit das BibleTime Bin�rprogramm l�uft  oder damit die Quellcode Version �bersetzt werden kann.</p><div class="table"><p><a name="id2798478"></a><b>Table 2.1.  Pakete, die zur Installation von BibleTime 1.1 ben�tigt werden </b></p><table summary=" Pakete, die zur Installation von BibleTime 1.1 ben�tigt werden " border="1"><colgroup><col><col></colgroup><thead><tr><th>Paket</th><th>Ort</th></tr></thead><tbody><tr><td>Qt&#8482; 2.2.x </td><td><a href="http://www.trolltech.com" target="_top"> http://www.trolltech.com</a></td></tr><tr><td>KDE 2.x (auf jeden Fall die Bibliotheken) </td><td><a href="http://www.kde.org" target="_top"> http://www.kde.org</a></td></tr><tr><td>Sword 1.5.3 </td><td><a href="ftp://ftp.crosswire/pub/sword/source" target="_top"> ftp://ftp.crosswire/pub/sword/source</a></td></tr></tbody></table></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="inst-bin.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="inst-sources.html">Next</a></td></tr><tr><td width="33%" align="left">BibleTime Programmdateien �</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Installation der BibleTime Quellen</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/inst-sources.html b/bibletime-doc/docs/de/install/html/inst-sources.html
deleted file mode 100644
index d13eb1d..0000000
--- a/bibletime-doc/docs/de/install/html/inst-sources.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html><head><title>Chapter 3. Installation der BibleTime Quellen</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="index.html" title="BibleTime Installationsanleitung"><link rel="previous" href="inst-preq.html" title="Chapter 2. BibleTime Systemanforderungen "><link rel="next" href="inst-user.html" title="Chapter 4. Installation von 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>Installation der BibleTime Quellen</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-preq.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="inst-user.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="inst-sources"></a>Chapter 3. Installation der BibleTime Quellen</h2></div></div><p> uDieses Kapitel beschreibt, wie der Quellcode �bersetzt wird. Diese Schritte k�nnen sowohl auf die Entwicklungsversion als auch auf die herausgegebenen Version von BibleTime und Sword angewandt werden. </p><div class="section"><a name="inst-sources-sword"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="inst-sources-sword"></a>Installation von Sword und der Sword Module </h2></div></div><p> Sword und die Sword Module sind die <i>Textbibliothek</i> f�r BibleTime. Bitte lesen sie die Download Seite f�r weitere Informationen �ber das Herunterladen von BibleTime. </p><p> Lesen sie die Anforderungen Seite um Sword zu bekommen. Beachten sie die Seitenlinks um die Sword Module zu bekommen.</p><div class="section"><a name="inst-sources-sword-install"></a><div class="titlepage"><div><h3 class="title"><a name="inst-sources-sword-install"></a>Installation von SWORD </h3></div></div><p> Diese Seite benutzt Sword 1.5.1a. F�r andere Versionen von Sword k�nnen die Namen abweichen.</p><p> Zuerst m�ssen sie die heruntergeladene .tar.gz Datei in ein vor�bergehendes Verzeichnis entpacken (falls sie die CVS version benutzen, ist der Quellcode bereits entpackt, als lassen Sie diesen Schritt aus). Machen sie in etwa folgendes: </p><pre class="screen">
-mkdir /tmp
-cd /tmp
-tar -xzf sword-1.5.1a.tar.gz
-cd /tmp/sword-1.5.1a
-</pre><p> (die Tar-Datei ist in ein Verzeichnis entpackt worden, dass sword-1.5.1a oder �hnlich heisst) </p><p> Bevor Sie versuchen, Sword zu �bersetzen, m�ssen Sie unter Umst�nden <tt>Makefile.cfg</tt> anpassen (sie liegt in der obersten Ebene des entpackten Quellcodes). Der anpassbare Abschnitt von <tt>Makefile.cfg</tt> ist gekennzeichnet. Versuchen Sie nicht, Dinge in der Datei zu �ndern, die au�erhalb des mit <i>##### Customizable stuff. Set it how you like it #####</i> Bereiches liegen, au�er wenn Sie wirklich wissen, was Sie tun. </p><p> F�r viele Installation werden die Voreinstellungen funktionieren. Wenn diese nicht funktionieren, k�nnen Einstellungen gesetzt werden.</p><div class="table"><p><a name="id2799466"></a><b>Table 3.1. Sword Makefile.cfg Einstellungen</b></p><table summary="Sword Makefile.cfg Einstellungen" border="1"><colgroup><col><col></colgroup><thead><tr><th>Einstellung</th><th>Beschreibung</th></tr></thead><tbody><tr><td># compiler</td><td>Wenn sie gcc haben, �ndern Sie dies nicht. Ansonsten geben sie den von ihnen benutzen Compiler ein.</td></tr><tr><td># shared library-</td><td>Setzen Sie dies auf 'yes'. Dies bewirkt, dass die dynamische Bibliothek <tt>libsword.so</tt> erzeugt wird. Es muss noch ein Eintrag zur Datei <tt>/etc/ld.so.conf</tt> hinzugef�gt werdem der auf libsword.so zeigt. <tt>/usr/local/sword/lib</tt> ist typisch. Die dynamische Bibliothek ist notwendig, damit BibleTime funktioniert, aber Sword wird auch ohne Fehler �bersetzt werden, wenn sie dies nicht setzen. Seien sie hier vorsichtig. </td></tr><tr><td># VCL library-</td><td>Benutzen sie die Voreinstellung 'no', au�er wenn Sie den Sword Installationsmanager benutzen. In diesem Falle setzen sie dies auf 'yes'.</td></tr><tr><td># Debugging options etc...</td><td>Die Voreinstellungen sollten funktionieren.</td></tr><tr><td># endian, etc. support for other hardware</td><td>Benutzen Sie die Voreinstellung, wenn Sie auf einem Intel �bersetzen. Wenn Sie andere Hardware benutzen, w�hlen Sie den richtigen Eintrag.</td></tr><tr><td># zLib support</td><td>Verwenden Sie die Voreinstellung 'yes'</td></tr><tr><td># paths</td><td>Die Voreinstellungen sollten f�r die meisten Distributionen funktionieren, �ndern Sie dies nicht, au�er wenn Sie wissen, was Sie machen. </td></tr></tbody></table></div><p>Nun beginnen  Sie die �bersetzung.</p><pre class="screen">
-make
-su
-make install
-make configure
-</pre><p> Im Falle da� Befehl Reports einen Fehler auf Beendigung machen Sie, zeigt sie vermutlich an, da� Sie ein Paket vermissen. Z.B.:</p><pre class="screen">
-bash-2.03# make
-make just-pre nodeps=yes
-make[1]: Entering directory `/bible/sword-1.5.1a'
-make -C src just-pre
-.
-.
-.
-make[1]: Entering directory `/bible/sword-1.5.1a/include'
-make[1]: Nothing to be done for `just-targets'.
-make[1]: Leaving directory `/bible/sword-1.5.1a/include'
-make -C apps/X11/VCL just-targets
-make[1]: Entering directory `/bible/sword-1.5.1a/apps/X11/VCL'
-gcc -I../../../include/ -D_GNU_SOURCE -I. `gtk-config --cflags` -static -pipe -Wall -Wno-format
--fomit-frame-pointer -ggdb -O0 -m486 -c -o TWinControl.o TWinControl.cpp
-<i>/bin/sh: gtk-config: command not found </i>
-In file included from TWinControl.cpp:1:
-<i>TWinControl.h:6: gtk/gtkwidget.h: No such file or directory</i>
-<i>TWinControl.cpp:3: gtk/gtkwidget.h: No such file or directory </i>
-In file included from TWinControl.cpp:1:
-TWinControl.h:281: syntax error before `*'
-TWinControl.h:284: parse error before `*'
-TWinControl.cpp:10: parse error before `*'
-make[1]: *** [TWinControl.o] Error 1
-make[1]: Leaving directory `/bible/sword-1.5.1a/apps/X11/VCL'
-make: *** [apps/X11/VCL/targets] Error 2
-bash-2.03#
-</pre><p>Die kursiven Zeilen oben zeigen, dass eine GTK-Anwendung fehlte. Eine Untersuchung der vorhandenen Pakete zeigt, dass eines der mit SuSE gelieferten Pakete gtkdev ist. Es stellt sich heraus, dass dies die Anwendung ist, die erforderlich ist, damit make ohne Fehler durchl�uft. Oft fehlende Pakete k�nnen auf den Installations CDs oder auf der Internet Seite ihres Distributors gefunden werden. Sobald <span class="command"><b>make</b></span> ohne Fehler durchl�uft, starten Sie <span class="command"><b>make install</b></span>. Wenn es immer noch nicht klappt, �ffnen Sie die Datei <tt>Makefile.cfg</tt> im obersten Verzeichnis des Sword Quellcodes und �ndern Sie die Zeile <span class="command"><b>buildvcl := yes</b></span> zu <span class="command"><b>buildvcl : = no</b></span> und probieren Sie es erneut. </p></div><div class="section"><a name="inst-sources-sword-modules"></a><div class="titlepage"><div><h3 class="title"><a name="inst-sources-sword-modules"></a>Installation der Module</h3></div></div><p>Sword unterst�tzt zur Zeit 3 Arten von Modulen: Bibeln, Lexika und Kommentare. Damit Sword und BibleTime n�tzlich sind, sollten diese Module installiert sein. </p><p> Sword Module k�nnen entweder <a href="inst-sources.html#inst-sources-sword-modules" title="Installation der Module">per Hand</a>  oder mit dem Sword Installmgr installiert werden.Sword Installmgr wird mit dem Sword Paket zur Verf�gung gestellt.Sword Installmgr  kann im Abschnitt <a href="installmgr.html" title="Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr"> Wie man Sword Installmgr benutzt und installiert</a> oder im Sword Quellcode in <tt>/sword/apps/X11/InstallMgr/INSTALL</tt> gefunden werden.</p><div class="section"><a name="inst-sources-sword-modules-dir"></a><div class="titlepage"><div><h4 class="title"><a name="inst-sources-sword-modules-dir"></a>W�hlen Sie ein Sword Verzeichnis</h4></div></div><p> Sword unterst�tzt zur Zeit 3 Arten von Modulen: Bibeln, Lexika und Kommentare. Sie m�ssen die Dateien eines Modules in ein eigenes Verzeichnis installieren. Sie m�ssen entscheiden, welches Verzeichnis ihr Sword Verzeichnis sein soll.Wenn Sie die Bibliothek und die Include Dateien in ein gesondertes Verzeichnis installiert haben, benutzen Sie dieses als ihr Sword Verzeichnis (z.B. <tt>/usr/local/sword/</tt>). Wenn sie die Bibliothek und die Include Dateien an einen bekannten Ort wie<tt>/usr/local/</tt> installiert haben, w�hlen Sie bitte einen anderen Ort f�r ihr Sword Verzeichnis aus. </p></div><div class="section"><a name="inst-sources-sword-modules-upack"></a><div class="titlepage"><div><h4 class="title"><a name="inst-sources-sword-modules-upack"></a> Entpacken Sie das heruntergeladene Paket</h4></div></div><p> Als erstes m�ssen die das heruntergeladene Paket entpacken. Auf der Download-Seite von Sword k�nnen Sie w�hlen, ob Sie ein Windows� oder ein RAW Paket haben m�chten. Wenn Sie einen &quot;Linux� only&quot; PC haben, w�hlen sie die RAW Variante. Aber falls Sie aus Versehen das selbstentpackende Windows� Programm heruntergeladen haben, versuchen Sie WINE zu benutzen, um die Dateien zu extrahieren.Unter Umst�nden m�ssen die die Datei<tt>_INSTALL.1</tt> nach <tt>_install.1</tt> umbenennen, um das Setup zum Laufen zu bekommen. </p></div><div class="section"><a name="inst-sources-sword-modules-config"></a><div class="titlepage"><div><h4 class="title"><a name="inst-sources-sword-modules-config"></a> Module einbinden</h4></div></div><p> Legen Sie das Verzeichnis <tt>mods.d</tt> innerhalb ihres Sword Verzeichnisses an. Bitte kopieren SIe die Datei <tt>[Modulname].conf</tt> in das <tt>mods.d</tt> Verzeichnis. Die <tt>.conf</tt> Datei ist normalerweise in den entpackten Moduldateien enthalten. Jetzt verschieben Sie das komplette Verzeichnis <tt>/modules</tt>, welches die entpackten Moduldateien enth�lt, in das Sword Verzeichnis. Im Beispiel ist <tt>/usr/local/sword/share</tt> das Sword Verzeichnis.</p><p> Die Verzeichnisstruktur sieht folgenderma�en aus: </p><pre class="screen">
-/usr/local/sword/share/ -|- mods.d/ -|- module_1_name.conf
-                         |           |- module_2_name.conf
-                         |
-                         |- texts/rawtext/ -|-module_1_name/files
-                                            |-module_2_name/files
-</pre></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="inst-preq.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="inst-user.html">Next</a></td></tr><tr><td width="33%" align="left">BibleTime Systemanforderungen �</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Installation von BibleTime</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/inst-user-source.html b/bibletime-doc/docs/de/install/html/inst-user-source.html
deleted file mode 100644
index 49f5772..0000000
--- a/bibletime-doc/docs/de/install/html/inst-user-source.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head><title>Quellcode</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="inst-user.html" title="Chapter 4. Installation von BibleTime"><link rel="previous" href="inst-user.html" title="Chapter 4. Installation von BibleTime"><link rel="next" href="inst-user-troubleshooting.html" title="Problembehebung"></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>Quellcode</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-user.html">Prev</a></td><td align="center" class="center">Installation von BibleTime</td><td align="right" class="right"><a accesskey="n" href="inst-user-troubleshooting.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="inst-user-source"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="inst-user-source"></a>Quellcode</h2></div></div><p> Quellcodepakete m�ssen entpackt werden (Archiver or similar). Versuchen Sie dann: <pre class="screen">
-export QTDIR=/usr/lib
-export KDEDIR=/usr
-export PATH=$KDEDIR/bin:$PATH
-./configure				# Makefiles erzeugen
-make					# BibleTime kompilieren
-make install				# BibleTime installieren
-</pre> QTDIR ist das Verzeichnis, welches Qt&#8482; 2 enth�lt. KDEDIR ist der Ordner, der KDE enth�lt. Die angegebenen Orte treffen auf Mandrake&#8482; zu. Ihre Distribution ben�tigt vielleicht andere Werte. </p><p> Zus�tzlicher Informationen k�nnen im Quellcode in der Datei <tt>bibletime/INSTALL</tt> gefunden werden. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="inst-user.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="inst-user-troubleshooting.html">Next</a></td></tr><tr><td width="33%" align="left">Installation von BibleTime�</td><td width="34%" align="center"><a href="inst-user.html">Up</a></td><td width="33%" align="right">�Problembehebung</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/inst-user-troubleshooting.html b/bibletime-doc/docs/de/install/html/inst-user-troubleshooting.html
deleted file mode 100644
index 0eed100..0000000
--- a/bibletime-doc/docs/de/install/html/inst-user-troubleshooting.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Problembehebung</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="inst-user.html" title="Chapter 4. Installation von BibleTime"><link rel="previous" href="inst-user-source.html" title="Quellcode"><link rel="next" href="installmgr.html" title="Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr"></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>Problembehebung</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-user-source.html">Prev</a></td><td align="center" class="center">Installation von BibleTime</td><td align="right" class="right"><a accesskey="n" href="installmgr.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="inst-user-troubleshooting"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="inst-user-troubleshooting"></a>Problembehebung</h2></div></div><p> <a href="http://www.bibletime.de/" target="_top">www.bibletime.de</a> hat alle Antworten. Bitte schauen Sie dort nach... :) </p><p> Vergessen Sie nicht , das FAQ und die Installationsanweisungen auf www.bibletime.de zu lesen. Falls Sie den Quellcode heruntergeladen haben, lesen Sie bitte auch die im Quellcode enthaltenen Dateien README und INSTALL. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="inst-user-source.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="installmgr.html">Next</a></td></tr><tr><td width="33%" align="left">Quellcode�</td><td width="34%" align="center"><a href="inst-user.html">Up</a></td><td width="33%" align="right">�Installations- und Bedienungsanweisung f�r den Sword Installmgr</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/inst-user.html b/bibletime-doc/docs/de/install/html/inst-user.html
deleted file mode 100644
index 5362839..0000000
--- a/bibletime-doc/docs/de/install/html/inst-user.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 4. Installation von BibleTime</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="index.html" title="BibleTime Installationsanleitung"><link rel="previous" href="inst-sources.html" title="Chapter 3. Installation der BibleTime Quellen"><link rel="next" href="inst-user-source.html" title="Quellcode"></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>Installation von BibleTime</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-sources.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="inst-user-source.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="inst-user"></a>Chapter 4. Installation von BibleTime</h2></div></div><div class="section"><a name="inst-user-RPM"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="inst-user-RPM"></a>RPM Installation</h2></div></div><p> Wenn sie einen BibleTime RPM installieren, �ffnen Sie einfach ihren Paketmanager (rpm, KPackage und andere) und installieren Sie in der gewohnten Art und Weise. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="inst-sources.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="inst-user-source.html">Next</a></td></tr><tr><td width="33%" align="left">Installation der BibleTime Quellen�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Quellcode</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/installmgr-install.html b/bibletime-doc/docs/de/install/html/installmgr-install.html
deleted file mode 100644
index 165a183..0000000
--- a/bibletime-doc/docs/de/install/html/installmgr-install.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><head><title>Sword Installmgr</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="installmgr.html" title="Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr"><link rel="previous" href="installmgr.html" title="Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr"><link rel="next" href="instmgr-rep.html" title="Vorbereitung Ihres Archives"></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 Installmgr</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="installmgr.html">Prev</a></td><td align="center" class="center">Installations- und Bedienungsanweisung f�r den Sword Installmgr</td><td align="right" class="right"><a accesskey="n" href="instmgr-rep.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="installmgr-install"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="installmgr-install"></a>Sword Installmgr</h2></div></div><p>Um den Sword Installmgr zu kompilieren, muss Sword bereits kompiliert sein. <a href="inst-sources.html#inst-sources-sword-install" title="Installation von SWORD ">Siehe auch die Installationsanweisungen f�r Sword</a>. </p><p>Finden Sie die Datei <tt> libsword.so</tt>, Sword hat sie wahrscheinlich in <tt>/usr/local/sword/lib</tt>  installiert, au�er Sie haben die Installation angepa�t. </p><p> Damit Sword Installmgr (und ebenso BibleTime) diese shared library finden kann, �ffnen Sie einen Texteditor und f�gen Sie <tt>/usr/local/sword/lib</tt> am Ende von <tt>/etc/ld.so.conf</tt> an. </p><p> Nun sind Sie bereit, den Sword Installmgr zu kompilieren. </p><p> Wechseln Sie in ihren Sword-Quelltextordner, und �ffnen Sie das Verzeichnis <tt>.../sword/apps/X11/InstallMgr</tt>. F�hren Sie folgendes in einer Shell aus: </p><pre class="screen">
-	ldconfig
-	./configure
-	make
-	su
-	make install
-	</pre><p> Jetzt k�nnen sie in einer Root-Shell (su) den Installmgr ausf�hren, indem Sie <tt>/usr/local/bin/installmgr</tt> aufrufen. </p><p> Wenn das funktioniert hat, dann gibt es zwei M�glichkeiten, Textmodulemodule in Sword zu installieren. </p><div class="itemizedlist"><ul><li><p><a name="id2738651"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Options</span> -&gt; <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Manage remote sources</span> -- �ber Internet mit Crosswire verbinden, und Sword Dokumente und Module vom Hauptarchiv herunterladen. Dieses Feature wurde noch nicht nach Linux� und UNIX�  portiert. </p></li><li><p><a name="id2738687"></a> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Options</span> -&gt; <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Local Path</span> -- Wenn Sie entpackte Quellen haben, dann stellen Sie diesen Wert auf ihr lokales Verzeichnis ein. Es kann sich um eine lokale Festplatte oder ein Netzlaufwerk handeln, oder auch die Sword CD, die auf einem lokalen oder entfernten CD ROM Laufwerk vorhanden ist. Alle verf�gbaren Module werden angezeigt, und k�nnen nun installiert werden. </p></li></ul></div><p> Sword CD's k�nnen vom <a href="http://www.bibletime.de" target="_top">BibleTime Team</a> bezogen werden </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="installmgr.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="instmgr-rep.html">Next</a></td></tr><tr><td width="33%" align="left">Installations- und Bedienungsanweisung f�r den Sword Installmgr�</td><td width="34%" align="center"><a href="installmgr.html">Up</a></td><td width="33%" align="right">�Vorbereitung Ihres Archives</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/installmgr.html b/bibletime-doc/docs/de/install/html/installmgr.html
deleted file mode 100644
index 749293e..0000000
--- a/bibletime-doc/docs/de/install/html/installmgr.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="index.html" title="BibleTime Installationsanleitung"><link rel="previous" href="inst-user-troubleshooting.html" title="Problembehebung"><link rel="next" href="installmgr-install.html" title="Sword Installmgr"></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>Installations- und Bedienungsanweisung f�r den Sword Installmgr</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-user-troubleshooting.html">Prev</a></td><td align="center" class="center">�</td><td align="right" class="right"><a accesskey="n" href="installmgr-install.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="installmgr"></a>Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr</h2></div></div><p>Sword Installmgr wird nicht mit dem BibleTime-RPM vertrieben. Sie m�ssen den Quellcode von <a href="http://www.crosswire.org" target="_top"> Crosswire Bible Society</a> herunterladen. Eine vorkompilierte Version des Sword Installmgr ist auf der Sword CD enthalten, die vom <a href="http://www.bibletime.de" target="_top">BibleTime team</a> bezogen werden kann. </p><div class="section"><a name="installmgr-req"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="installmgr-req"></a> Voraussetzungen des Sword Installmgr</h2></div></div><p> Alle Pakete, die vom Sword Installmgr ben�tigt werden, sind in den Haupt-Linux� Distributionen enthalten. Es ist auch m�glich, den Sword Installmgr auf den meisten UNIX�-Distributionen zu kompilieren. Wenn Sie auf Kompiler-Fehlermeldungen sto�en, lesen Sie bitte die Meldungen; diese sollten sie auf die fehlenden Pakete hinweisen. </p><p> Die folgende Tabelle enth�lt die Minimalvoraussetzungen zum Lauf der Sword Installmgr Binaries, oder zum Kompilieren der Quelltexte.</p><div class="table"><p><a name="id2736721"></a><b>Table 5.1.  Pakete, die f�r den Sword Installmgr ben�tigt werden </b></p><table summary=" Pakete, die f�r den Sword Installmgr ben�tigt werden " border="1"><colgroup><col><col></colgroup><thead><tr><th>Paket</th><th>Ort</th></tr></thead><tbody><tr><td>Sword</td><td> Benutzen Sie die Version, die in Ihrer Kopie von Sword enthalten ist. Muss (in der Datei ~/sword/Makefile.cfg) mit den VCL libraries = yes konfiguriert werden. </td></tr><tr><td> GTK </td><td> Wenn Sie den Sword Installmgr kompilieren, sollte jede Version von GTK gen�gen. </td></tr></tbody></table></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="inst-user-troubleshooting.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="installmgr-install.html">Next</a></td></tr><tr><td width="33%" align="left">Problembehebung�</td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right">�Sword Installmgr</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/instmgr-cfg.html b/bibletime-doc/docs/de/install/html/instmgr-cfg.html
deleted file mode 100644
index b83a2d9..0000000
--- a/bibletime-doc/docs/de/install/html/instmgr-cfg.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Die Sword Konfigurationsdatei einrichten.</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="installmgr.html" title="Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr"><link rel="previous" href="instmgr-rep.html" title="Vorbereitung Ihres Archives"><link rel="next" href="instmgr-load.html" title="Sword Installmgr benutzen, um Sword-Module zu installieren."></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>Die Sword Konfigurationsdatei einrichten.</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="instmgr-rep.html">Prev</a></td><td align="center" class="center">Installations- und Bedienungsanweisung f�r den Sword Installmgr</td><td align="right" class="right"><a accesskey="n" href="instmgr-load.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="instmgr-cfg"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="instmgr-cfg"></a>Die Sword Konfigurationsdatei einrichten.</h2></div></div><p> Anweisungen f�r die Sword Konfiguration befinden sich im Abschnitt <a href="inst-sources.html#inst-sources-sword-modules-config" title=" Module einbinden">&quot;Die Sword Konfigurationsdatei&quot; </a>, die die manuelle Modulinstallation behandelt. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="instmgr-rep.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="instmgr-load.html">Next</a></td></tr><tr><td width="33%" align="left">Vorbereitung Ihres Archives�</td><td width="34%" align="center"><a href="installmgr.html">Up</a></td><td width="33%" align="right">�Sword Installmgr benutzen, um Sword-Module zu installieren.</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/instmgr-load.html b/bibletime-doc/docs/de/install/html/instmgr-load.html
deleted file mode 100644
index 948090b..0000000
--- a/bibletime-doc/docs/de/install/html/instmgr-load.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><head><title>Sword Installmgr benutzen, um Sword-Module zu installieren.</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="installmgr.html" title="Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr"><link rel="previous" href="instmgr-cfg.html" title="Die Sword Konfigurationsdatei einrichten."></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 Installmgr benutzen, um Sword-Module zu installieren.</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="instmgr-cfg.html">Prev</a></td><td align="center" class="center">Installations- und Bedienungsanweisung f�r den Sword Installmgr</td><td align="right" class="right"></td></tr></tbody></table></div></div><div class="section"><a name="instmgr-load"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="instmgr-load"></a>Sword Installmgr benutzen, um Sword-Module zu installieren.</h2></div></div><p> Sie m�ssen Sword Installmgr als Root starten, um Module installieren zu k�nnen. Beginnen Sie mit folgenden Kommandos: </p><pre class="screen">
-	[me@localhost user]$ su
-	Password:
-	[root@localhost user]# /usr/local/bin/installmgr
-	</pre><p> Sie sehen nun das Installmgr-Fenster. Sie m�ssen nun <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">options
-&gt;local path</span> auf Ihr lokales Verzeichnis einstellen. </p><p> Jetzt werden die verf�gbaren Module auf der linken Seite angezeigt, und die installierten auf der rechten Seite. Sie m�ssen nur Module auf der linken Seite ausw�hlen, und Installieren anklicken, um sie f�r Sword und BibleTime verf�gbar zu machen. <div class="mediaobject"><img src="instmgr.png" alt="Sword Installmgr Screenshot"></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="instmgr-cfg.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">Die Sword Konfigurationsdatei einrichten.�</td><td width="34%" align="center"><a href="installmgr.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/bibletime-doc/docs/de/install/html/instmgr-rep.html b/bibletime-doc/docs/de/install/html/instmgr-rep.html
deleted file mode 100644
index d94b780..0000000
--- a/bibletime-doc/docs/de/install/html/instmgr-rep.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>Vorbereitung Ihres Archives</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.40"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, Hilfedialog "><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt"><link rel="home" href="index.html" title="BibleTime Installationsanleitung"><link rel="up" href="installmgr.html" title="Chapter 5. Installations- und Bedienungsanweisung f�r den Sword Installmgr"><link rel="previous" href="installmgr-install.html" title="Sword Installmgr"><link rel="next" href="instmgr-cfg.html" title="Die Sword Konfigurationsdatei einrichten."></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>Vorbereitung Ihres Archives</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="installmgr-install.html">Prev</a></td><td align="center" class="center">Installations- und Bedienungsanweisung f�r den Sword Installmgr</td><td align="right" class="right"><a accesskey="n" href="instmgr-cfg.html">Next</a></td></tr></tbody></table></div></div><div class="section"><a name="instmgr-rep"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="instmgr-rep"></a>Vorbereitung Ihres Archives</h2></div></div><p>Wenn Sie die Sword CD haben, k�nnen Sie diesen Schritt �berspringen. Die Texte sind auf der CD unkomprimiert gespeichert, und k�nnen vom Installmgr direkt verwendet werden. </p><p> Laden Sie Module von <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a> herunter (w�hlen Sie die normal komprimierten Module (modulename.zip), nicht die ausf�hrbaren Modularchive f�r Windows (modulename.exe). </p><p> Erstellen Sie ein Verzeichnis f�r Ihr Modularchiv, z.B. <tt>$HOME/sword_modules</tt>. </p><p> �ffnen Sie ein Programm, das .zip Dateien entpacken kann. Z.B. gnozup oder archiver. Auch Kommandozeilenprogramme k�nnen verwendet werden; um herauszufinden, welche auf Ihrem System installiert sind, k�nnen Sie<span class="command"><b>man -k zip</b></span> ausf�hren </p><p> Entpacken Sie die MOdule in Ihr <tt>$HOME/sword_modules</tt> Verzeichnis. Alle Module werden in die korrekten Unterverzeichnisse entpackt. Wenn Sie sp�ter Module hinzuf�gen m�chten, dann entpacken Sie diese ebenfalls in <tt>$HOME/sword_modules</tt>. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="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="installmgr-install.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="instmgr-cfg.html">Next</a></td></tr><tr><td width="33%" align="left">Sword Installmgr�</td><td width="34%" align="center"><a href="installmgr.html">Up</a></td><td width="33%" align="right">�Die Sword Konfigurationsdatei einrichten.</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/de/install/html/instmgr.png b/bibletime-doc/docs/de/install/html/instmgr.png
deleted file mode 100644
index 11c577a..0000000
--- a/bibletime-doc/docs/de/install/html/instmgr.png
+++ /dev/null
diff --git a/bibletime-doc/docs/de/install/unicode/Makefile.am b/bibletime-doc/docs/de/install/unicode/Makefile.am
deleted file mode 100644
index 5afbaf4..0000000
--- a/bibletime-doc/docs/de/install/unicode/Makefile.am
+++ /dev/null
@@ -1,31 +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 = index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/install/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/install; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/install/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/install/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;
diff --git a/bibletime-doc/docs/de/install/unicode/Makefile.in b/bibletime-doc/docs/de/install/unicode/Makefile.in
deleted file mode 100644
index 6ee312f..0000000
--- a/bibletime-doc/docs/de/install/unicode/Makefile.in
+++ /dev/null
@@ -1,390 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=index_cache.gz 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/unicode/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/install/unicode/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/de/install/unicode
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/de/install/unicode/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/de/bibletime/install/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/de/bibletime;
-	for file in  index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/de/bibletime/install; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/install/$$file $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/de/bibletime/install/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/de/bibletime
-
-uninstall-local:
-	for file in  index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/install/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/de/bibletime/install/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/de/bibletime/install/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/de/install/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/de/install/unicode/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/de/install/unicode/index.docbook b/bibletime-doc/docs/de/install/unicode/index.docbook
deleted file mode 100644
index bce6cc0..0000000
--- a/bibletime-doc/docs/de/install/unicode/index.docbook
+++ /dev/null
@@ -1,156 +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;"
-><!-- replace bibletimehandbook here -->
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE"
-><!-- change language only here -->
-
-  <!-- user entities -->
-  <!-- application name entities -->
-  <!ENTITY bibletime '<application
->BibleTime</application
->'>
-  <!ENTITY sword '<application
->Sword</application
->'>
-  <!ENTITY swordInstmgr '<application
->Sword Installmgr</application
->'>
-  <!ENTITY crosswire '<application
->Crosswire Bible Society</application
->'>
-
-  <!-- called file entities -->
-  <!ENTITY instchap1 SYSTEM "inst-bin.docbook">
-  <!ENTITY instchap2 SYSTEM "inst-preq.docbook">
-  <!ENTITY instchap3 SYSTEM "inst-sources.docbook">
-  <!ENTITY instchap4 SYSTEM "inst-user.docbook">
-  <!ENTITY appa SYSTEM "inst-installmgr.docbook">
-  <!-- Do not define any other entities; instead, use the entities
-       from kde-genent.entities and $LANG/user.entities. -->
-]>
-
-
-<!-- ................................................................ -->
-
-<!-- The language must NOT be changed here. -->
-
-<book lang="&language;">
-
-<bookinfo>
-<title
->BibleTime Installationsanleitung</title>
-
-<authorgroup>
-<author
-> <firstname
->Joachim</firstname
-> <surname
->Ansorg</surname
-> </author>
-<author
-> <firstname
->Fred</firstname
-> <othername
-></othername
-> <surname
->Saalbach</surname
-> </author>
-<author
-> <firstname
->Jeffrey</firstname
-> <surname
->Hoyt</surname
-> </author>
-</authorgroup>
-
-   
-
-<copyright>
-<year
->1999</year>
-<year
->2000</year>
-<year
->2001</year>
-<holder
->Das BibleTime Team, info@bibletime.de</holder>
-</copyright>
-
-<legalnotice>
-
-<para
->Die BibleTime Installationanleitung ist ein Teil von BibleTime. </para>
-
-<para
-> BibleTime ist freie Software; sie können es vertreiben und/oder verändern, entsprechend den Bestimmungen der GNU General Public License, die von der Free Software Foundation publiziert wird; entweder Version 2 der Lizenz, oder (je nach Wunsch) jede spätere Version. </para>
-
-<para
-> Dieses Programm wird vertrieben in der Hoffnung, dass es hilfreich ist; jedoch OHNE JEDE GARATIE. Lesen Sie die GNU General Public License für weitere Details. </para>
-
-<para
-> Sie sollten eine Kopie der GNU General Public License mit diesem Programm erhalten haben. Wenn nicht, dann schreiben sie an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. </para
-></legalnotice>
-
-
-<date
->10/23/2001</date>
-<releaseinfo
->1.01.00</releaseinfo>
-
-<abstract>
-<para
-> &bibletime; ist ein Programm für das Bibelstudium. </para>
-</abstract>
-
-<keywordset>
-<keyword
->KDE</keyword>
-<keyword
->bibletime</keyword>
-<keyword
->BibleTime</keyword>
-<keyword
->sword</keyword>
-<keyword
->crosswire</keyword>
-<keyword
->Hilfedialog </keyword>
-</keywordset>
-
-</bookinfo>
-
-&instchap1;
-&instchap2;
-&instchap3;
-&instchap4;
-&appa;
-
-</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/bibletime-doc/docs/de/install/unicode/index_cache.gz b/bibletime-doc/docs/de/install/unicode/index_cache.gz
deleted file mode 100644
index 582a7cf..0000000
--- a/bibletime-doc/docs/de/install/unicode/index_cache.gz
+++ /dev/null
diff --git a/bibletime-doc/docs/de/install/unicode/inst-bin.docbook b/bibletime-doc/docs/de/install/unicode/inst-bin.docbook
deleted file mode 100644
index 584b8c2..0000000
--- a/bibletime-doc/docs/de/install/unicode/inst-bin.docbook
+++ /dev/null
@@ -1,50 +0,0 @@
-<chapter id="inst-bin">
-<title
->&bibletime; Programmdateien </title>
-<para
->Programmdateien werden in den folgenden Formaten zur Verfügung gestellt.</para>
-
-<table>
-   <title
->&bibletime; Distributionsformate</title>
-   <tgroup cols="2">
-   <thead
-> <row
-> <entry
->Formatname</entry
-> <entry
->Beschreibung</entry
-> </row
-> </thead>
-<tbody
-> <row
-> <entry
-> RPM-Pakete. </entry
-> <entry
-> Besuchen Sie die <ulink url="http://sourceforge.net/projects/bibletime"
-> Sourceforge &bibletime;</ulink
-> Homepage für die unterstützte Distributionen. RPM-Pakete werden mit dem entsprechenden Paketmanager installiert. RPM-Installationsanweisungen befinden sich <link linkend="inst-user-RPM"
->hier</link
->. </entry
-> </row
-> <row
-> <entry
-> Quellcode </entry
-> <entry
-> Der Quellcode kann auf jeder Distribution installiert werden, die die Installationsvoraussetzungen erfüllt. Der Quellcode sollte auch auf Nicht-<trademark
->Intel</trademark
->-Plattformen und den meisten &UNIX;-Plattformen kompilierbar sein, die die Installationsvoraussetzungen erfüllen. Anweisungen für die Installation vom Quellcode aus befinden sich <link linkend="inst-user-source"
->hier</link
->. </entry
-> </row
-> </tbody>
-   </tgroup>
-   </table>
-<para
-> Sprachmodule, die das &bibletime; Handbuch, Bible Study HowTo, Installationsanweisungen und den Hilfedialog enthalten, werden in separaten RPM-Paketen bereitgestellt, ebenso als Tarball-Quellen. Die Sprachmodule enthalten die Dokumente in HTML und &XML; Docbook-Format, sodass die ohne das normale &bibletime;-Paket angesehen werden können.</para>
-<para
->Sprachmodule werden in der selben Art und Weise wie das Programmmodul installiert. </para>
-
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/install/unicode/inst-installmgr.docbook b/bibletime-doc/docs/de/install/unicode/inst-installmgr.docbook
deleted file mode 100644
index ddd1dd1..0000000
--- a/bibletime-doc/docs/de/install/unicode/inst-installmgr.docbook
+++ /dev/null
@@ -1,182 +0,0 @@
-<chapter id="installmgr">
-<title
->Installations- und Bedienungsanweisung für den Sword Installmgr</title>
-<para
->&swordInstmgr; wird nicht mit dem &bibletime;-RPM vertrieben. Sie müssen den Quellcode von <ulink url="http://www.crosswire.org"
-> &crosswire;</ulink
-> herunterladen. Eine vorkompilierte Version des &swordInstmgr; ist auf der &sword; CD enthalten, die vom <ulink url="http://www.bibletime.de"
->BibleTime team</ulink
-> bezogen werden kann. </para>
-<section id="installmgr-req">
-<title
-> Voraussetzungen des &swordInstmgr;</title>
-
-	<para
-> Alle Pakete, die vom &swordInstmgr; benötigt werden, sind in den Haupt-&Linux; Distributionen enthalten. Es ist auch möglich, den &swordInstmgr; auf den meisten &UNIX;-Distributionen zu kompilieren. Wenn Sie auf Kompiler-Fehlermeldungen stoßen, lesen Sie bitte die Meldungen; diese sollten sie auf die fehlenden Pakete hinweisen. </para>
-	<para
-> Die folgende Tabelle enthält die Minimalvoraussetzungen zum Lauf der &swordInstmgr; Binaries, oder zum Kompilieren der Quelltexte.</para>
-	<table>
-	<title
-> Pakete, die für den &swordInstmgr; benötigt werden </title>
-	<tgroup cols="2">
-	<thead
-> <row
-> <entry
->Paket</entry
-> <entry
->Ort</entry
-> </row
-> </thead>
-	<tbody
-> <row
-> <entry
-> &sword; </entry
-> <entry
-> Benutzen Sie die Version, die in Ihrer Kopie von &sword; enthalten ist. Muss (in der Datei ~/sword/Makefile.cfg) mit den VCL libraries = yes konfiguriert werden. </entry
-> </row
-> <row
-> <entry
-> GTK </entry
-> <entry
-> Wenn Sie den &swordInstmgr; kompilieren, sollte jede Version von GTK genügen. </entry
-> </row
-> </tbody>
-	</tgroup>
-	</table>
-	</section>
-
-	
-	<section id="installmgr-install">
-	<title
->&swordInstmgr;</title>
-	<para
->Um den &swordInstmgr; zu kompilieren, muss &sword; bereits kompiliert sein. <link linkend="inst-sources-sword-install"
->Siehe auch die Installationsanweisungen für &sword;</link
->. </para>
-	<para
->Finden Sie die Datei <filename
-> libsword.so</filename
->, &sword; hat sie wahrscheinlich in <filename
->/usr/local/sword/lib</filename
->  installiert, außer Sie haben die Installation angepaßt. </para>
-	<para
-> Damit &swordInstmgr; (und ebenso &bibletime;) diese shared library finden kann, öffnen Sie einen Texteditor und fügen Sie <filename
->/usr/local/sword/lib</filename
-> am Ende von <filename
->/etc/ld.so.conf</filename
-> an. </para>
-	<para
-> Nun sind Sie bereit, den &swordInstmgr; zu kompilieren. </para>
-	<para
-> Wechseln Sie in ihren &sword;-Quelltextordner, und öffnen Sie das Verzeichnis <filename
->.../sword/apps/X11/InstallMgr</filename
->. Führen Sie folgendes in einer Shell aus: </para>
-	<screen>
-	ldconfig
-	./configure
-	make
-	su
-	make install
-	</screen>
-	<para
-> Jetzt können sie in einer Root-Shell (su) den Installmgr ausführen, indem Sie <filename
->/usr/local/bin/installmgr</filename
-> aufrufen. </para>
-	<para
-> Wenn das funktioniert hat, dann gibt es zwei Möglichkeiten, Textmodulemodule in &sword; zu installieren. </para>
-	<itemizedlist
-> <listitem
-> <para
-> <guimenu
->Options</guimenu
-> -> <guimenuitem
->Manage remote sources</guimenuitem
-> -- Über Internet mit Crosswire verbinden, und Sword Dokumente und Module vom Hauptarchiv herunterladen. Dieses Feature wurde noch nicht nach &Linux; und &UNIX;  portiert. </para
-> </listitem
-> <listitem
-> <para
-> <guimenu
->Options</guimenu
-> -> <guimenuitem
->Local Path</guimenuitem
-> -- Wenn Sie entpackte Quellen haben, dann stellen Sie diesen Wert auf ihr lokales Verzeichnis ein. Es kann sich um eine lokale Festplatte oder ein Netzlaufwerk handeln, oder auch die &sword; CD, die auf einem lokalen oder entfernten CD ROM Laufwerk vorhanden ist. Alle verfügbaren Module werden angezeigt, und können nun installiert werden. </para
-> </listitem
-> </itemizedlist>
-	<para
-> &sword; CD's können vom <ulink url="http://www.bibletime.de"
->BibleTime Team</ulink
-> bezogen werden </para>
-	</section>
-
-	<section id="instmgr-rep">
-	<title
->Vorbereitung Ihres Archives</title>
-	<para
->Wenn Sie die &sword; CD haben, können Sie diesen Schritt überspringen. Die Texte sind auf der CD unkomprimiert gespeichert, und können vom Installmgr direkt verwendet werden. </para>
-	<para
-> Laden Sie Module von <ulink url="http://www.crosswire.org"
->&crosswire;</ulink
-> herunter (wählen Sie die normal komprimierten Module (modulename.zip), nicht die ausführbaren Modularchive für Windows (modulename.exe). </para>
-	<para
-> Erstellen Sie ein Verzeichnis für Ihr Modularchiv, z.B. <filename
->$HOME/sword_modules</filename
->. </para>
-	<para
-> Öffnen Sie ein Programm, das .zip Dateien entpacken kann. Z.B. gnozup oder archiver. Auch Kommandozeilenprogramme können verwendet werden; um herauszufinden, welche auf Ihrem System installiert sind, können Sie<command
->man -k zip</command
-> ausführen </para>
-	<para
-> Entpacken Sie die MOdule in Ihr <filename
->$HOME/sword_modules</filename
-> Verzeichnis. Alle Module werden in die korrekten Unterverzeichnisse entpackt. Wenn Sie später Module hinzufügen möchten, dann entpacken Sie diese ebenfalls in <filename
->$HOME/sword_modules</filename
->. </para>
-	</section>
-
-
-	<section id="instmgr-cfg">
-	<title
->Die &sword; Konfigurationsdatei einrichten.</title>
-	<para
-> Anweisungen für die &sword; Konfiguration befinden sich im Abschnitt <link linkend="inst-sources-sword-modules-config"
->"Die &sword; Konfigurationsdatei" </link
->, die die manuelle Modulinstallation behandelt. </para>
-	</section>
-
-
-	<section id="instmgr-load">
-	<title
->&swordInstmgr; benutzen, um Sword-Module zu installieren.</title>
-	<para
-> Sie müssen &swordInstmgr; als Root starten, um Module installieren zu können. Beginnen Sie mit folgenden Kommandos: </para>
-	<screen>
-	[me@localhost user]$ su
-	Password:
-	[root@localhost user]# /usr/local/bin/installmgr
-	</screen>
-	<para
-> Sie sehen nun das Installmgr-Fenster. Sie müssen nun <guimenu
->options
->local path</guimenu
-> auf Ihr lokales Verzeichnis einstellen. </para>
-	<para
-> Jetzt werden die verfügbaren Module auf der linken Seite angezeigt, und die installierten auf der rechten Seite. Sie müssen nur Module auf der linken Seite auswählen, und Installieren anklicken, um sie für &sword; und &bibletime; verfügbar zu machen. <mediaobject
-> <imageobject
-> <imagedata fileref="instmgr.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->&swordInstmgr; Screenshot</phrase
-> </textobject
-> </mediaobject
-> </para>
-	</section>
-</chapter>
-
-
-
-
-
-
-
-
-
diff --git a/bibletime-doc/docs/de/install/unicode/inst-preq.docbook b/bibletime-doc/docs/de/install/unicode/inst-preq.docbook
deleted file mode 100644
index 1479185..0000000
--- a/bibletime-doc/docs/de/install/unicode/inst-preq.docbook
+++ /dev/null
@@ -1,58 +0,0 @@
-<chapter id="inst-preq">
-<title
->&bibletime; Systemanforderungen </title>
-
-<section id="devl-10">
-<title
-> Anforderungen für &bibletime; 1.1</title>
-
-<para
-> Alle benötigten Pakete, um &bibletime; zu übersetzen, sind in den meisten &Linux; Distributionen enthalten. Es ist ebenfalls möglich, &bibletime; auf den meisten anderen &UNIX; Distributionen zu übersetzen.Wenn Sie Übersetzungsfehler erhalten lesen sie die Meldungen, diese sollten sie zu den benötigten Paketen führen, die sie wahrscheinlich auf den Installations CDs finden werden. </para>
-<para
-> Die folgende Tabelle enthält die Mindestanforderungen, damit das &bibletime; Binärprogramm läuft  oder damit die Quellcode Version übersetzt werden kann.</para>
-
-
-<table>
-<title
-> Pakete, die zur Installation von &bibletime; 1.1 benötigt werden </title>
-<tgroup cols="2">
-<thead
-> <row
-> <entry
->Paket</entry
-> <entry
->Ort</entry
-> </row
-> </thead>
-<tbody
-> <row
-> <entry
-> &Qt; 2.2.x </entry
-> <entry
-> <ulink url="http://www.trolltech.com"
-> http://www.trolltech.com</ulink
-> </entry
-> </row
-> <row
-> <entry
-> &kde; 2.x (auf jeden Fall die Bibliotheken) </entry
-> <entry
-> <ulink url="http://www.kde.org"
-> http://www.kde.org</ulink
-> </entry
-> </row
-> <row
-> <entry
-> &sword; 1.5.3 </entry
-> <entry
-> <ulink url="ftp://ftp.crosswire/pub/sword/source"
-> ftp://ftp.crosswire/pub/sword/source</ulink
-> </entry
-></row
-> </tbody>
-</tgroup>
-</table>
-</section>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/de/install/unicode/inst-sources.docbook b/bibletime-doc/docs/de/install/unicode/inst-sources.docbook
deleted file mode 100644
index b78bf4b..0000000
--- a/bibletime-doc/docs/de/install/unicode/inst-sources.docbook
+++ /dev/null
@@ -1,246 +0,0 @@
-<chapter id="inst-sources"
-><title
->Installation der BibleTime Quellen</title>
-<para
-> uDieses Kapitel beschreibt, wie der Quellcode übersetzt wird. Diese Schritte können sowohl auf die Entwicklungsversion als auch auf die herausgegebenen Version von &bibletime; und &sword; angewandt werden. </para>
-<section id="inst-sources-sword"
-><title
->Installation von &sword; und der &sword; Module </title>
-<para
-> &sword; und die &sword; Module sind die <emphasis
->Textbibliothek</emphasis
-> für BibleTime. Bitte lesen sie die Download Seite für weitere Informationen über das Herunterladen von BibleTime. </para>
-<para
-> Lesen sie die Anforderungen Seite um &sword; zu bekommen. Beachten sie die Seitenlinks um die &sword; Module zu bekommen.</para>
-
-<section id="inst-sources-sword-install"
-><title
->Installation von SWORD </title>
-<para
-> Diese Seite benutzt &sword; 1.5.1a. Für andere Versionen von &sword; können die Namen abweichen.</para>
-
- <para
-> Zuerst müssen sie die heruntergeladene .tar.gz Datei in ein vorübergehendes Verzeichnis entpacken (falls sie die CVS version benutzen, ist der Quellcode bereits entpackt, als lassen Sie diesen Schritt aus). Machen sie in etwa folgendes: </para
-> <screen>
-mkdir /tmp
-cd /tmp
-tar -xzf sword-1.5.1a.tar.gz
-cd /tmp/sword-1.5.1a
-</screen>
-
-
-<para
-> (die Tar-Datei ist in ein Verzeichnis entpackt worden, dass sword-1.5.1a oder ähnlich heisst) </para>
-
-<para
-> Bevor Sie versuchen, &sword; zu übersetzen, müssen Sie unter Umständen <filename
->Makefile.cfg</filename
-> anpassen (sie liegt in der obersten Ebene des entpackten Quellcodes). Der anpassbare Abschnitt von <filename
->Makefile.cfg</filename
-> ist gekennzeichnet. Versuchen Sie nicht, Dinge in der Datei zu ändern, die außerhalb des mit <emphasis
->##### Customizable stuff. Set it how you like it #####</emphasis
-> Bereiches liegen, außer wenn Sie wirklich wissen, was Sie tun. </para>
-<para
-> Für viele Installation werden die Voreinstellungen funktionieren. Wenn diese nicht funktionieren, können Einstellungen gesetzt werden.</para>
-<table>
-<title
->Sword Makefile.cfg Einstellungen</title>
-<tgroup cols="2">
-<thead
-> <row
-> <entry
->Einstellung</entry
-> <entry
->Beschreibung</entry
-> </row
-> </thead>
-<tbody
-> <row
-> <entry
-># compiler</entry
-> <entry
->Wenn sie gcc haben, ändern Sie dies nicht. Ansonsten geben sie den von ihnen benutzen Compiler ein.</entry
-> </row
-> <row
-> <entry
-># shared library-</entry
-> <entry
->Setzen Sie dies auf 'yes'. Dies bewirkt, dass die dynamische Bibliothek <filename
->libsword.so</filename
-> erzeugt wird. Es muss noch ein Eintrag zur Datei <filename
->/etc/ld.so.conf</filename
-> hinzugefügt werdem der auf libsword.so zeigt. <filename
->/usr/local/sword/lib</filename
-> ist typisch. Die dynamische Bibliothek ist notwendig, damit BibleTime funktioniert, aber Sword wird auch ohne Fehler übersetzt werden, wenn sie dies nicht setzen. Seien sie hier vorsichtig. </entry
-> </row
-> <row
-> <entry
-># VCL library-</entry
-> <entry
->Benutzen sie die Voreinstellung 'no', außer wenn Sie den Sword Installationsmanager benutzen. In diesem Falle setzen sie dies auf 'yes'.</entry
-> </row
-> <row
-> <entry
-># Debugging options etc...</entry
-> <entry
->Die Voreinstellungen sollten funktionieren.</entry
-> </row
-> <row
-> <entry
-># endian, etc. support for other hardware</entry
-> <entry
->Benutzen Sie die Voreinstellung, wenn Sie auf einem Intel übersetzen. Wenn Sie andere Hardware benutzen, wählen Sie den richtigen Eintrag.</entry
-> </row
-> <row
-> <entry
-># zLib support</entry
-> <entry
->Verwenden Sie die Voreinstellung 'yes'</entry
-> </row
-> <row
-> <entry
-># paths</entry
-> <entry
->Die Voreinstellungen sollten für die meisten Distributionen funktionieren, ändern Sie dies nicht, außer wenn Sie wissen, was Sie machen. </entry
-> </row
-> </tbody>
-</tgroup>
-</table>
-
-
-<para
->Nun beginnen  Sie die Übersetzung.</para>
-<screen>
-make
-su
-make install
-make configure
-</screen>
-<para
-> Im Falle daß Befehl Reports einen Fehler auf Beendigung machen Sie, zeigt sie vermutlich an, daß Sie ein Paket vermissen. Z.B.:</para>
-
-<screen>
-bash-2.03# make
-make just-pre nodeps=yes
-make[1]: Entering directory `/bible/sword-1.5.1a'
-make -C src just-pre
-.
-.
-.
-make[1]: Entering directory `/bible/sword-1.5.1a/include'
-make[1]: Nothing to be done for `just-targets'.
-make[1]: Leaving directory `/bible/sword-1.5.1a/include'
-make -C apps/X11/VCL just-targets
-make[1]: Entering directory `/bible/sword-1.5.1a/apps/X11/VCL'
-gcc -I../../../include/ -D_GNU_SOURCE -I. `gtk-config --cflags` -static -pipe -Wall -Wno-format
--fomit-frame-pointer -ggdb -O0 -m486 -c -o TWinControl.o TWinControl.cpp
-<emphasis
->/bin/sh: gtk-config: command not found </emphasis>
-In file included from TWinControl.cpp:1:
-<emphasis
->TWinControl.h:6: gtk/gtkwidget.h: No such file or directory</emphasis>
-<emphasis
->TWinControl.cpp:3: gtk/gtkwidget.h: No such file or directory </emphasis>
-In file included from TWinControl.cpp:1:
-TWinControl.h:281: syntax error before `*'
-TWinControl.h:284: parse error before `*'
-TWinControl.cpp:10: parse error before `*'
-make[1]: *** [TWinControl.o] Error 1
-make[1]: Leaving directory `/bible/sword-1.5.1a/apps/X11/VCL'
-make: *** [apps/X11/VCL/targets] Error 2
-bash-2.03#
-</screen>
-
-<para
->Die kursiven Zeilen oben zeigen, dass eine GTK-Anwendung fehlte. Eine Untersuchung der vorhandenen Pakete zeigt, dass eines der mit SuSE gelieferten Pakete gtkdev ist. Es stellt sich heraus, dass dies die Anwendung ist, die erforderlich ist, damit make ohne Fehler durchläuft. Oft fehlende Pakete können auf den Installations CDs oder auf der Internet Seite ihres Distributors gefunden werden. Sobald <command
->make</command
-> ohne Fehler durchläuft, starten Sie <command
->make install</command
->. Wenn es immer noch nicht klappt, öffnen Sie die Datei <filename
->Makefile.cfg</filename
-> im obersten Verzeichnis des Sword Quellcodes und ändern Sie die Zeile <command
->buildvcl := yes</command
-> zu <command
->buildvcl : = no</command
-> und probieren Sie es erneut. </para>
-</section>
-
-<section id="inst-sources-sword-modules">
-<title
->Installation der Module</title>
-<para
->&sword; unterstützt zur Zeit 3 Arten von Modulen: Bibeln, Lexika und Kommentare. Damit &sword; und &bibletime; nützlich sind, sollten diese Module installiert sein. </para
-><para
-> &sword; Module können entweder <link linkend="inst-sources-sword-modules"
->per Hand</link
->  oder mit dem &swordInstmgr; installiert werden.&swordInstmgr; wird mit dem &sword; Paket zur Verfügung gestellt.&swordInstmgr;  kann im Abschnitt <link linkend="installmgr"
-> Wie man &swordInstmgr; benutzt und installiert</link
-> oder im &sword; Quellcode in <filename
->/sword/apps/X11/InstallMgr/INSTALL</filename
-> gefunden werden.</para>
-
-<section id="inst-sources-sword-modules-dir"
-><title
->Wählen Sie ein &sword; Verzeichnis</title
-> <para
-> &sword; unterstützt zur Zeit 3 Arten von Modulen: Bibeln, Lexika und Kommentare. Sie müssen die Dateien eines Modules in ein eigenes Verzeichnis installieren. Sie müssen entscheiden, welches Verzeichnis ihr &sword; Verzeichnis sein soll.Wenn Sie die Bibliothek und die Include Dateien in ein gesondertes Verzeichnis installiert haben, benutzen Sie dieses als ihr &sword; Verzeichnis (z.B. <filename
->/usr/local/sword/</filename
->). Wenn sie die Bibliothek und die Include Dateien an einen bekannten Ort wie<filename
->/usr/local/</filename
-> installiert haben, wählen Sie bitte einen anderen Ort für ihr &sword; Verzeichnis aus. </para>
-</section>
-
-
-
-<section id="inst-sources-sword-modules-upack"
-><title
-> Entpacken Sie das heruntergeladene Paket</title>
-<para
-> Als erstes müssen die das heruntergeladene Paket entpacken. Auf der Download-Seite von &sword; können Sie wählen, ob Sie ein &Windows; oder ein RAW Paket haben möchten. Wenn Sie einen "&Linux; only" PC haben, wählen sie die RAW Variante. Aber falls Sie aus Versehen das selbstentpackende &Windows; Programm heruntergeladen haben, versuchen Sie WINE zu benutzen, um die Dateien zu extrahieren.Unter Umständen müssen die die Datei<filename
->_INSTALL.1</filename
-> nach <filename
->_install.1</filename
-> umbenennen, um das Setup zum Laufen zu bekommen. </para>
-</section>
-<section id="inst-sources-sword-modules-config"
-><title
-> Module einbinden</title>
-<para
-> Legen Sie das Verzeichnis <filename
->mods.d</filename
-> innerhalb ihres &sword; Verzeichnisses an. Bitte kopieren SIe die Datei <filename
->[Modulname].conf</filename
-> in das <filename
->mods.d</filename
-> Verzeichnis. Die <filename
->.conf</filename
-> Datei ist normalerweise in den entpackten Moduldateien enthalten. Jetzt verschieben Sie das komplette Verzeichnis <filename
->/modules</filename
->, welches die entpackten Moduldateien enthält, in das Sword Verzeichnis. Im Beispiel ist <filename
->/usr/local/sword/share</filename
-> das Sword Verzeichnis.</para>
-<para
-> Die Verzeichnisstruktur sieht folgendermaßen aus: </para>
-<screen>
-/usr/local/sword/share/ -|- mods.d/ -|- module_1_name.conf
-                         |           |- module_2_name.conf
-                         |
-                         |- texts/rawtext/ -|-module_1_name/files
-                                            |-module_2_name/files
-</screen>
-</section>
-
-</section>
-</section>
-
-
-
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/bibletime-doc/docs/de/install/unicode/inst-user.docbook b/bibletime-doc/docs/de/install/unicode/inst-user.docbook
deleted file mode 100644
index 474dcfe..0000000
--- a/bibletime-doc/docs/de/install/unicode/inst-user.docbook
+++ /dev/null
@@ -1,41 +0,0 @@
-<chapter id="inst-user"
-><title
->Installation von &bibletime;</title>
-<section id="inst-user-RPM"
-><title
->RPM Installation</title>
-<para
-> Wenn sie einen &bibletime; RPM installieren, öffnen Sie einfach ihren Paketmanager (rpm, &kpackage; und andere) und installieren Sie in der gewohnten Art und Weise. </para>
-</section>
-<section id="inst-user-source"
-><title
->Quellcode</title>
-<para
-> Quellcodepakete müssen entpackt werden (Archiver or similar). Versuchen Sie dann: <screen>
-export QTDIR=/usr/lib
-export KDEDIR=/usr
-export PATH=$KDEDIR/bin:$PATH
-./configure				# Makefiles erzeugen
-make					# BibleTime kompilieren
-make install				# BibleTime installieren
-</screen
-> QTDIR ist das Verzeichnis, welches &Qt; 2 enthält. KDEDIR ist der Ordner, der &kde; enthält. Die angegebenen Orte treffen auf &Mandrake; zu. Ihre Distribution benötigt vielleicht andere Werte. </para>
-<para
-> Zusätzlicher Informationen können im Quellcode in der Datei <filename
->bibletime/INSTALL</filename
-> gefunden werden. </para>
-</section>
-<section id="inst-user-troubleshooting"
-><title
->Problembehebung</title>
-<para
-> <ulink url="http://www.bibletime.de/"
->www.bibletime.de</ulink
-> hat alle Antworten. Bitte schauen Sie dort nach... :) </para>
-<para
-> Vergessen Sie nicht , das &FAQ; und die Installationsanweisungen auf www.bibletime.de zu lesen. Falls Sie den Quellcode heruntergeladen haben, lesen Sie bitte auch die im Quellcode enthaltenen Dateien README und INSTALL. </para>
-</section>
-</chapter>
-
-
-
diff --git a/bibletime-doc/docs/documentation-links.html b/bibletime-doc/docs/documentation-links.html
deleted file mode 100644
index c5f7b80..0000000
--- a/bibletime-doc/docs/documentation-links.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<html>
-<head>
-<title>The BibleTime documentation index</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<body>
-<center><h1>The BibleTime documentation index</h1></center>
-
-<p><b>The english files are up-to-date. Translations may be outdated or even unavailable.</b></p>
-
-<p>English (en) documentation.  (editing in progress)
-<ul>
-<li><a href="./en/handbook/html/index.html" target="_top">The BibleTime handbook</a>.
-<li><a href="./en/helpdialog/html/index.html" target="_top">The BibleTime helpdialog</a>.
-<li><a href="./en/howto/html/index.html" target="_top">The Bible study howto</a>.
-<li><a href="./en/install/html/index.html" target="_top">The BibleTime installation instructions</a>.
-</ul></p>
-
-<p>Czechoslovakian (cs) documentation.  (not available yet)
-<ul>
-<li><a href="./cs/handbook/html/index.html" target="_top">The BibleTime handbook</a>.
-<li><a href="./cs/helpdialog/html/index.html" target="_top">The BibleTime helpdialog</a>.
-<li><a href="./cs/howto/html/index.html" target="_top">The Bible study howto</a>.
-<li><a href="./cs/install/html/index.html" target="_top">The BibleTime installation instructions</a>.
-</ul></p>
-
-<p>German (de) documentation.  (not up to date)
-<ul>
-<li><a href="./de/handbook/html/index.html" target="_top">The BibleTime handbook</a>.
-<li><a href="./de/helpdialog/html/index.html" target="_top">The BibleTime helpdialog</a>.
-<li><a href="./de/howto/html/index.html" target="_top">The Bible study howto</a>.
-<li><a href="./de/install/html/index.html" target="_top">The BibleTime installation instructions</a>.
-</ul></p>
-
-<p>Spanish (es) documentation.  (not available yet)
-<ul>
-<li><a href="./es/handbook/html/index.html" target="_top">The BibleTime handbook</a>.
-<li><a href="./es/helpdialog/html/index.html" target="_top">The BibleTime helpdialog</a>.
-<li><a href="./es/howto/html/index.html" target="_top">The Bible study howto</a>.
-<li><a href="./es/install/html/index.html" target="_top">The BibleTime installation instructions</a>.
-</ul></p>
-
-<p>Italian (it) documentation.  (not available yet)
-<ul>
-<li><a href="./it/handbook/html/index.html" target="_top">The BibleTime handbook</a>.
-<li><a href="./it/helpdialog/html/index.html" target="_top">The BibleTime helpdialog</a>.
-<li><a href="./it/howto/html/index.html" target="_top">The Bible study howto</a>.
-<li><a href="./it/install/html/index.html" target="_top">The BibleTime installation instructions</a>.
-</ul></p>
-
-<p>Dutch (nl) documentation.  (not available yet)
-<ul>
-<li><a href="./nl/handbook/html/index.html" target="_top">The BibleTime handbook</a>.
-<li><a href="./nl/helpdialog/html/index.html" target="_top">The BibleTime helpdialog</a>.
-<li><a href="./nl/howto/html/index.html" target="_top">The Bible study howto</a>.
-<li><a href="./nl/install/html/index.html" target="_top">The BibleTime installation instructions</a>.
-</ul></p>
-
-<p>Norwegian (no) documentation.  (not available yet)
-<ul>
-<li><a href="./no/handbook/html/index.html" target="_top">The BibleTime handbook</a>.
-<li><a href="./no/helpdialog/html/index.html" target="_top">The BibleTime helpdialog</a>.
-<li><a href="./no/howto/html/index.html" target="_top">The Bible study howto</a>.
-<li><a href="./no/install/html/index.html" target="_top">The BibleTime installation instructions</a>.
-</ul></p>
-
-<p>Slovak (sk) documentation. (not available yet)
-<ul>
-<li><a href="./sk/handbook/html/index.html" target="_top">The BibleTime handbook</a>.
-<li><a href="./sk/helpdialog/html/index.html" target="_top">The BibleTime helpdialog</a>.
-<li><a href="./sk/howto/html/index.html" target="_top">The Bible study howto</a>.
-<li><a href="./sk/install/html/index.html" target="_top">The BibleTime installation instructions</a>.
-</ul></p>
-
-
-</body>
-</html>
diff --git a/bibletime-doc/docs/en/Makefile.am b/bibletime-doc/docs/en/Makefile.am
deleted file mode 100644
index a3240f1..0000000
--- a/bibletime-doc/docs/en/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 helpdialog howto install 
-
-EXTRA_DIST =  tips
-
-rcdir = $(kde_datadir)/bibletime
-rc_DATA = tips
diff --git a/bibletime-doc/docs/en/Makefile.in b/bibletime-doc/docs/en/Makefile.in
deleted file mode 100644
index 344ac00..0000000
--- a/bibletime-doc/docs/en/Makefile.in
+++ /dev/null
@@ -1,490 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = handbook helpdialog howto install 
-
-EXTRA_DIST = tips
-
-rcdir = $(kde_datadir)/bibletime
-rc_DATA = tips
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DATA =  $(rc_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-rcDATA: $(rc_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
-	@list='$(rc_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rcdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rcdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rcdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(rcdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-rcDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(rc_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(rcdir)/$$p; \
-	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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am: install-rcDATA
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-rcDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(DATA)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(rcdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: uninstall-rcDATA install-rcDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/handbook/Makefile.am b/bibletime-doc/docs/en/handbook/Makefile.am
deleted file mode 100644
index 17d7a2a..0000000
--- a/bibletime-doc/docs/en/handbook/Makefile.am
+++ /dev/null
@@ -1,23 +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 = html unicode 
-
-pot-files:
-	for f in `ls unicode/*.docbook`; do \
-		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \
-		potfile=`echo $$potfile | sed s/unicode//`; \
-		echo "Calling xml2pot $$f > pot/$$potfile"; \
-		xml2pot $$f > pot/$$potfile; \
-		done;
-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/bibletime-doc/docs/en/handbook/Makefile.in b/bibletime-doc/docs/en/handbook/Makefile.in
deleted file mode 100644
index e291018..0000000
--- a/bibletime-doc/docs/en/handbook/Makefile.in
+++ /dev/null
@@ -1,480 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = html unicode 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/handbook/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/handbook
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/handbook/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-pot-files:
-	for f in `ls unicode/*.docbook`; do \
-		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \
-		potfile=`echo $$potfile | sed s/unicode//`; \
-		echo "Calling xml2pot $$f > pot/$$potfile"; \
-		xml2pot $$f > pot/$$potfile; \
-		done;
-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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/handbook/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/handbook/html/Makefile.am b/bibletime-doc/docs/en/handbook/html/Makefile.am
deleted file mode 100644
index 88ca8e6..0000000
--- a/bibletime-doc/docs/en/handbook/html/Makefile.am
+++ /dev/null
@@ -1,31 +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-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.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  hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.png; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/handbook/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.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/bibletime-doc/docs/en/handbook/html/Makefile.in b/bibletime-doc/docs/en/handbook/html/Makefile.in
deleted file mode 100644
index 82aa287..0000000
--- a/bibletime-doc/docs/en/handbook/html/Makefile.in
+++ /dev/null
@@ -1,390 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.png 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=hdbk-op-module-tree-select.html hdbk-bars.html hdbk-op-search.html hdbk-bars-menubar-file.html hdbk-bars-menubar-settings.html hdbk-bars-menubar-Window.html hdbk-bars-menubar.html hdbk-config.html hdbk-config-bt-Colors.html hdbk-op-output.html hdbk-bars-menubar-mainindex.html hdbk-intro-ToDo.html hdbk-bars-toolbar-action.html hdbk-bars-menubar-view.html hdbk-config-bt-sword.html hdbk-config-bt-profiles.html hdbk-bars-menubar-Help.html hdbk-start-screen.html index.html hdbk-config-bt.html hdbk-op-MDI-Window.html hdbk-op.html hdbk-intro.html hdbk-config-bt-Accelerators.html hdbk-term.html hdbk-intro-motivation.html 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/html/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/handbook/html/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/handbook/html
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/handbook/html/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-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-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.png; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/handbook/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  hdbk-bars-toolbar-Configtoolbar.png hdbk-bars-toolbar-action-cascade-auto.png hdbk-bars-toolbar-action-cascade.png hdbk-bars-toolbar-action-contents.png hdbk-bars-toolbar-action-exit.png hdbk-bars-toolbar-action-print.png hdbk-bars-toolbar-action-reset.png hdbk-bars-toolbar-action-search.png hdbk-bars-toolbar-action-tile-auto.png hdbk-bars-toolbar-action-tile.png hdbk-bars-toolbar-close.png hdbk-conf-font-about.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-config-toolbar.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-pencil.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-bticon.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hdbk_op_module-tree-bookmark-bookmarkandfolder.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
-docs-am:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/handbook/html/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-Help.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-Help.html
deleted file mode 100644
index d9d0697..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-Help.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<html>
-<head>
-<title>Help</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="hdbk-bars-menubar-Help"></a><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>
-<a name="id2787922"></a><span class="term">Handbook</span>
-</dt>
-<dd><p>
-<a name="id2787930"></a>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>
-<a name="id2787945"></a><span class="term">Installation</span>
-</dt>
-<dd><p>
-<a name="id2787953"></a>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>
-<a name="id2787973"></a><span class="term">Biblestudy HowTo</span>
-</dt>
-<dd><p>
-<a name="id2787981"></a>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>
-<a name="id2787993"></a><span class="term">What's This</span>
-</dt>
-<dd><p>
-<a name="id2788000"></a>
-Allows you to click on certain items for contextual help.
-</p></dd>
-<dt>
-<a name="id2788011"></a><span class="term">Bug Report</span>
-</dt>
-<dd><p>
-<a name="id2788018"></a>
-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>
-<a name="id2788039"></a><span class="term">Daily Tip</span>
-</dt>
-<dd><p>
-<a name="id2788047"></a>Launches the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">tip of the day</span> dialog.</p></dd>
-<dt>
-<a name="id2788061"></a><span class="term">About BibleTime</span>
-</dt>
-<dd><p>
-<a name="id2788071"></a>
-Opens a window with general BibleTime information.
-</p></dd>
-<dt>
-<a name="id2788085"></a><span class="term">About KDE</span>
-</dt>
-<dd><p>
-<a name="id2788096"></a>
-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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-Window.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-Window.html
deleted file mode 100644
index bd11dbb..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-Window.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<html>
-<head>
-<title>Window</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="hdbk-bars-menubar-Window"></a><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>
-<a name="id2787643"></a><span class="term">Save Profile</span>
-</dt>
-<dd><p>
-<a name="id2787650"></a>Saves the current configuration to
-a selected profile</p></dd>
-<dt>
-<a name="id2787658"></a><span class="term">Load Profile</span>
-</dt>
-<dd><p>
-<a name="id2787666"></a>Loads the contents of the named profile to
-the current session of BibleTime.</p></dd>
-<dt>
-<a name="id2787678"></a><span class="term">Configure Profile</span>
-</dt>
-<dd><p>
-<a name="id2787685"></a>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>
-<a name="id2787702"></a><span class="term">Fullscreen Mode</span>
-</dt>
-<dd><p>
-<a name="id2787709"></a>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>
-<a name="id2787730"></a><span class="term">Cascade</span>
-</dt>
-<dd><p>
-<a name="id2787738"></a>Cascades open display windows</p></dd>
-<dt>
-<a name="id2787745"></a><span class="term">Tile</span>
-</dt>
-<dd><p>
-<a name="id2787752"></a>Tiles open display windows</p></dd>
-<dt>
-<a name="id2787762"></a><span class="term">Auto Cascade</span>
-</dt>
-<dd><p>
-<a name="id2787770"></a>
-Automatically cascades newly opened display windows
-</p></dd>
-<dt>
-<a name="id2787780"></a><span class="term">Auto Tile</span>
-</dt>
-<dd><p>
-<a name="id2787788"></a>ditto for tiling newly opened display windows</p></dd>
-<dt>
-<a name="id2787798"></a><span class="term">Close all</span>
-</dt>
-<dd><p>
-<a name="id2787805"></a>Closes all open display windows</p></dd>
-<dt>
-<a name="id2787815"></a><span class="term">List of open modules</span>
-</dt>
-<dd><p>
-<a name="id2787823"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-file.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-file.html
deleted file mode 100644
index a61c4e8..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-file.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-<head>
-<title>File</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="hdbk-bars-menubar-file"></a><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>
-<a name="id2787379"></a><span class="term">Clear printing queue</span>
-</dt>
-<dd><p>
-<a name="id2787386"></a>Clears all items from the BibleTime print queue.
-The BibleTime printing queue does not clear automatically.</p></dd>
-<dt>
-<a name="id2787406"></a><span class="term">
-Print</span>
-</dt>
-<dd><p>
-<a name="id2787413"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-mainindex.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-mainindex.html
deleted file mode 100644
index 570ef7a..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-mainindex.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<title>Main Index</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="hdbk-bars-menubar-mainindex"></a><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>
-<a name="id2787533"></a><span class="term">Search in module(s)</span>
-</dt>
-<dd><p>
-<a name="id2787539"></a>
-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>
-<a name="id2787560"></a><span class="term">Reset Main Index</span>
-</dt>
-<dd><p>
-<a name="id2787566"></a>
-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>
-<a name="id2787590"></a><span class="term">Remove selected item</span>
-</dt>
-<dd><p>
-<a name="id2787598"></a>
-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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-settings.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-settings.html
deleted file mode 100644
index 1d6b0fc..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-settings.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-<head>
-<title>Settings</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="hdbk-bars-menubar-settings"></a><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>
-<a name="id2787854"></a><span class="term">Configure Toolbar</span>
-</dt>
-<dd><p>
-<a name="id2787862"></a>show the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Configure Toolbar</span> dialog.</p></dd>
-<dt>
-<a name="id2787875"></a><span class="term">Configure BibleTime</span>
-</dt>
-<dd><p>
-<a name="id2787886"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-view.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-view.html
deleted file mode 100644
index 3b8a6d7..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar-view.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-<head>
-<title>View</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="hdbk-bars-menubar-view"></a><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>
-<a name="id2787453"></a><span class="term">Show Toolbar</span>
-</dt>
-<dd><p>
-<a name="id2787461"></a>&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>
-<a name="id2787481"></a><span class="term">
-Show Main Index</span>
-</dt>
-<dd><p>
-<a name="id2787488"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar.html
deleted file mode 100644
index 59e8536..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-menubar.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Menubar</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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">
-<link rel="next" href="hdbk-bars-menubar-file.html" title="File">
-</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('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('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('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('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"><a accesskey="n" href="hdbk-bars-menubar-file.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="hdbk-bars-menubar"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="hdbk-bars-menubar"></a>Menubar</h2></div></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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"><a href="hdbk-bars-menubar-file.html">Next</a></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">�File</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-cascade-auto.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-cascade-auto.png
deleted file mode 100644
index d0a8461..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-cascade-auto.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-cascade.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-cascade.png
deleted file mode 100644
index 263ad5f..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-cascade.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-contents.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-contents.png
deleted file mode 100644
index 293b736..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-contents.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-exit.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-exit.png
deleted file mode 100644
index 49ccbef..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-exit.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-print.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-print.png
deleted file mode 100644
index 669b738..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-print.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-reset.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-reset.png
deleted file mode 100644
index d1c2653..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-reset.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-search.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-search.png
deleted file mode 100644
index 028b97b..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-search.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-tile-auto.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-tile-auto.png
deleted file mode 100644
index 842d9ee..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-tile-auto.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-tile.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-tile.png
deleted file mode 100644
index 5dfd05f..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action-tile.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action.html
deleted file mode 100644
index e16c57b..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-action.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-<title>Button Action</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="hdbk-bars-toolbar-action"></a><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"><img src="hdbk-bars-toolbar-action-exit.png" alt="Icon"></div>
-	Closes BibleTime.
-	</p>
-<p>
-	<div class="mediaobject"><img src="hdbk-bars-toolbar-action-print.png" alt="Icon"></div>
-	Prints items in the print queue.
-	</p>
-<p>
-	<div class="mediaobject"><img src="hdbk-bars-toolbar-action-search.png" alt="Icon"></div>
-	Search in Selected Module(s).
-	</p>
-<p>
-	<div class="mediaobject"><img src="hdbk-bars-toolbar-action-cascade.png" alt="Icon"></div>
-	Cascade Document Windows.
-	</p>
-<p>
-	<div class="mediaobject"><img src="hdbk-bars-toolbar-action-cascade-auto.png" alt="Icon"></div>
-	Autocascade Document Windows.
-	</p>
-<p>
-	<div class="mediaobject"><img src="hdbk-bars-toolbar-action-tile.png" alt="Icon"></div>
-	Tile Document Windows.
-	</p>
-<p>
-	<div class="mediaobject"><img src="hdbk-bars-toolbar-action-tile-auto.png" alt="Icon"></div>
-	Auto tile Document Windows.
-	</p>
-<p>
-	<div class="mediaobject"><img src="hdbk-bars-toolbar-close.png" alt="Icon"></div>
-	Close All Document Windows.
-	</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-close.png b/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-close.png
deleted file mode 100644
index bb4b445..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-close.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-bars.html b/bibletime-doc/docs/en/handbook/html/hdbk-bars.html
deleted file mode 100644
index 32b4e48..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<title>Chapter 5. Main toolbar and menubar</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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.html" title="Options Dialog">
-<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('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('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('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('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">�</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>
-<div class="section">
-<a name="hdbk-bars-toolbar"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-toolbar-action.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Options Dialog�</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/bibletime-doc/docs/en/handbook/html/hdbk-conf-font-about.png b/bibletime-doc/docs/en/handbook/html/hdbk-conf-font-about.png
deleted file mode 100644
index 24afaa1..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-conf-font-about.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-color.png b/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-color.png
deleted file mode 100644
index c66917f..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-color.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-fonts.png b/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-fonts.png
deleted file mode 100644
index ac32416..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-fonts.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-start.png b/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-start.png
deleted file mode 100644
index 0f8a5ec..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-start.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-sword.png b/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-sword.png
deleted file mode 100644
index e0bcfad..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-conf-optdialog-sword.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-Accelerators.html b/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-Accelerators.html
deleted file mode 100644
index fbce0cb..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-Accelerators.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
-<title>Accelerators</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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-sword.html" title="Sword">
-<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('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('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('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('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-sword.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">
-<a name="hdbk-config-bt-Accelerators"></a><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>
-<a name="id2787283"></a><b>Table 4.3. 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-sword.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">Sword�</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/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-Colors.html b/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-Colors.html
deleted file mode 100644
index 1863443..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-Colors.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<html>
-<head>
-<title>Colors</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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="Options Dialog">
-<link rel="next" href="hdbk-config-bt-profiles.html" title="Profiles">
-</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('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('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('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('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">
-<a name="hdbk-config-bt-Colors"></a><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">
-<img src="hdbk-conf-optdialog-color.png" alt="Options Dialog - Color"><div class="caption"><p>The Options dialog - Color.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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">Options Dialog�</td>
-<td width="34%" align="center"><a href="hdbk-config.html">Up</a></td>
-<td width="33%" align="right">�Profiles</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-profiles.html b/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-profiles.html
deleted file mode 100644
index fb9a729..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-profiles.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<head>
-<title>Profiles</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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>Profiles</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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">
-<a name="hdbk-config-bt-profiles"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="hdbk-config-bt-profiles"></a>Profiles</h2></div></div>
-<p>Profiles define the appearance of the work area, for example which
-	windows are open and which texts should be displayed in these windows.
-	Once a profile 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 profile</span> to save a current session into a
-	profile. 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 profile</span> to
-	load a previously saved profile 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-sword.html b/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-sword.html
deleted file mode 100644
index 3073a52..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-config-bt-sword.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<html>
-<head>
-<title>Sword</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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="Profiles">
-<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('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('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('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('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">
-<a name="hdbk-config-bt-sword"></a><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">
-<img src="hdbk-conf-optdialog-sword.png" alt="Options Dialog - Sword"><div class="caption"><p>The Options dialog - Sword.</p></div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-sword-gen"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-config-bt-sword-gen"></a>Sword General</h3></div></div>
-<p>Key Catch for Lexicons</p>
-<p>Bibletime can create a key catch for lexicons.  This speeds up
-		opening large lexicon modules.  The catch 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">
-<a name="hdbk-config-bt-sword-mod"></a><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">
-<a name="hdbk-config-bt-sword-filter"></a><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>
-<li><p>
-<a name="id2787195"></a>Show line brake after each verse</p></li>
-<li><p>
-<a name="id2787201"></a>Show verse numbers</p></li>
-<li><p>
-<a name="id2787207"></a>Show footnotes</p></li>
-<li><p>
-<a name="id2787213"></a>Show Strong's numbers</p></li>
-<li><p>
-<a name="id2787218"></a>Show headings</p></li>
-<li><p>
-<a name="id2787224"></a>show morphologic tags</p></li>
-<li><p>
-<a name="id2787230"></a>show lemmas</p></li>
-<li><p>
-<a name="id2787236"></a>Show Hebrew vowel points</p></li>
-<li><p>
-<a name="id2787241"></a>Show Hebrew cantillation marks</p></li>
-<li><p>
-<a name="id2787247"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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">Profiles�</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/bibletime-doc/docs/en/handbook/html/hdbk-config-bt.html b/bibletime-doc/docs/en/handbook/html/hdbk-config-bt.html
deleted file mode 100644
index 86e3ccb..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-config-bt.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<html>
-<head>
-<title>Options Dialog</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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-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>Options Dialog</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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-bars.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="hdbk-config-bt"></a>Options Dialog</h2></div></div>
-<p>The options dialog allows many BibleTime and Sword
-	features to be customized.</p>
-<div class="section">
-<a name="hdbk-config-bt-startup"></a><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 in workspace area.</td></tr>
-</table>
-<div class="mediaobject">
-<img src="hdbk-conf-optdialog-start.png" alt="Options Dialog"><div class="caption"><p>The Options dialog - Startup.</p></div>
-</div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-fonts"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-config-bt-fonts"></a>Fonts</h3></div></div>
-<p>The display font used for text can be changed as desired.  If you have a
-		module that requires a special font, check here to see if the font is available to
-		BibleTime.
-		</p>
-<div class="mediaobject">
-<img src="hdbk-conf-optdialog-fonts.png" alt="Options Dialog - fonts"><div class="caption"><p>The Options dialog - Fonts.</p></div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-Unicode"></a><div class="titlepage"><div><h4 class="title">
-<a name="hdbk-config-bt-Unicode"></a>Unicode Fonts (ISO10646)</h4></div></div>
-<p>Sword modules are provided with either iso-8859-1 (Latin-1) or iso-10646 (Unicode) encoding.
-			You can tell how a module is encoded by right mouse button on the main index and selecting <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">about
-			this module</span>.</p>
-<div class="mediaobject">
-<img src="hdbk-conf-font-about.png" alt="About this module"><div class="caption"><p>The 'About this module' window shows what kind of encoding is used.</p></div>
-</div>
-<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 (???????????????????) the font
-			available to BibleTime does not contain the used in characters in your document.</p>
-<p>In the options dialog, choose <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">fonts select</span> in the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Unicode area of application</span>.  You will need to choose
-			a font that has a iso-10646-1 character set.  Try clearlyu as a first step (it is included with most distributions).
-			If your module still does not display, you will need to use a more appropriate font.</p>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">
-<a name="id2786264"></a>Tip</h3>
-<p>If you use a small Unicode font like clearlyu (about 22kb) BibleTime will run faster than if a large font like
-			Bitstream Cyberbit (about 12Mb) is used.</p>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-addfont"></a><div class="titlepage"><div><h5 class="title">
-<a name="hdbk-config-bt-addfont"></a>Font Installation</h5></div></div>
-<p>Installing fonts consists of three steps</p>
-<div class="orderedlist"><ol type="i">
-<li><p>
-<a name="id2786294"></a><a href="hdbk-config-bt.html#hdbk-config-bt-ob-font" title="Obtaining Fonts">Obtaining Unicode fonts</a>
-</p></li>
-<li><p>
-<a name="id2786315"></a><a href="hdbk-config-bt.html#hdbk-config-bt-ob-font-X" title="Installing your font to XFree86 (your X-Server)">Installing fonts to the XFree86 X-Server</a>
-</p></li>
-<li><p>
-<a name="id2786330"></a><a href="hdbk-config-bt.html#hdbk-config-bt-ob-font-print" title="Installing the font for printing.">Installing the font for printing (does not work yet).</a>
-</p></li>
-</ol></div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-ob-font"></a><div class="titlepage"><div><h5 class="title">
-<a name="hdbk-config-bt-ob-font"></a>Obtaining Fonts</h5></div></div>
-<p>There are a number of fonts that support Unicode encoding, some of these are
-			available at no charge.  Few of the fonts available include all of range of symbols
-			defined in the Unicode standard.</p>
-<p>Here is a listing of some of the fonts available:</p>
-<div class="table">
-<p>
-<a name="id2786380"></a><b>Table 4.0. 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>For A partial list of other Unicode fonts and the ranges covered:
-			<a href="http://www.hclrss.demon.co.uk/unicode/fontsbyrange.html" target="_top">Unicode Font List</a>
-			</p>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-ob-font-X"></a><div class="titlepage"><div><h5 class="title">
-<a name="hdbk-config-bt-ob-font-X"></a>Installing your font to XFree86 (your X-Server)</h5></div></div>
-<p>
-			If your distribution includes a font installer (Linux-Mandrake&#8482; supplies Drake Font) try to use the installer.
-			If the font installer does not work, or your distribution does not include one,
-			you will have to install the font manually.  Instructions for installing fonts can be found in
-			<a href="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Unicode-HOWTO.html#toc4" target="_top">
-			The Unicode HOWTO</a>.  This was tested and works on Linux-Mandrake&#8482; 7.1</p>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-ob-font-print"></a><div class="titlepage"><div><h5 class="title">
-<a name="hdbk-config-bt-ob-font-print"></a>Installing the font for printing.</h5></div></div>
-<p>There is a known issue with Qt that prevents
-			printing characters outside the range of the Latin-1 character set.  This is expected to be
-			fixed with the release of Qt3 and KDE 3.  If you want to try anyway, the
-			<a href="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Font-HOWTO.html" target="_top">
-			Font HowTo</a> explains the process for installing fonts to the printing system.</p>
-</div>
-</div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-Colors"></a><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">
-<img src="hdbk-conf-optdialog-color.png" alt="Options Dialog - Color"><div class="caption"><p>The Options dialog - Color.</p></div>
-</div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-profiles"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-config-bt-profiles"></a>Profiles</h3></div></div>
-<p>Profiles define the appearance of the work area, for example which
-	windows are open and which texts should be displayed in these windows.
-	Once a profile 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 profile</span> to save a current session into a
-	profile. 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 profile</span> to
-	load a previously saved profile into BibleTime.</p>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-sword"></a><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">
-<img src="hdbk-conf-optdialog-sword.png" alt="Options Dialog - Sword"><div class="caption"><p>The Options dialog - Sword.</p></div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-sword-gen"></a><div class="titlepage"><div><h4 class="title">
-<a name="hdbk-config-bt-sword-gen"></a>Sword General</h4></div></div>
-<p>Key Catch for Lexicons</p>
-<p>Bibletime can create a key catch for lexicons.  This speeds up
-		opening large lexicon modules.  The catch 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">
-<a name="hdbk-config-bt-sword-mod"></a><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">
-<a name="hdbk-config-bt-sword-filter"></a><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>
-<li><p>
-<a name="id2786838"></a>Show line brake after each verse</p></li>
-<li><p>
-<a name="id2786844"></a>Show verse numbers</p></li>
-<li><p>
-<a name="id2786849"></a>Show footnotes</p></li>
-<li><p>
-<a name="id2786855"></a>Show Strong's numbers</p></li>
-<li><p>
-<a name="id2786861"></a>Show headings</p></li>
-<li><p>
-<a name="id2786867"></a>Show morphologic tags</p></li>
-<li><p>
-<a name="id2786872"></a>Show lemmas</p></li>
-<li><p>
-<a name="id2786878"></a>Show Hebrew vowel points</p></li>
-<li><p>
-<a name="id2786884"></a>Show Hebrew cantillation marks</p></li>
-<li><p>
-<a name="id2786890"></a>Show Greek accents</p></li>
-</ul></div>
-</div>
-</div>
-<div class="section">
-<a name="hdbk-config-bt-Accelerators"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-config-bt-Accelerators"></a>Accelerators</h3></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>
-<a name="id2786925"></a><b>Table 4.1. 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>
-<div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-bars.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">�Main toolbar and menubar</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-config.html b/bibletime-doc/docs/en/handbook/html/hdbk-config.html
deleted file mode 100644
index 4069897..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-config.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<html>
-<head>
-<title>Chapter 4. Configuring Bibletime</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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="Options 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('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('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('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('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">
-<a name="hdbk-config-toolbar"></a><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 allowes 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">
-<img src="hdbk-config-toolbar.png" alt="Toolbar Configuration Dialog"><div class="caption"><p>The Toolbar Configuration dialog.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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">�Options Dialog</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-intro-ToDo.html b/bibletime-doc/docs/en/handbook/html/hdbk-intro-ToDo.html
deleted file mode 100644
index b18135b..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-intro-ToDo.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<html>
-<head>
-<title>ToDo</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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="sect1">
-<a name="hdbk-intro-ToDo"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="hdbk-intro-ToDo"></a>ToDo</h2></div></div>
-<p>
-Very much!
-</p>
-<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.de" target="_top">the BibleTime
-homepage</a>.</p>
-<p>The BibleTime project needs programmers / developers, 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-intro-motivation.html b/bibletime-doc/docs/en/handbook/html/hdbk-intro-motivation.html
deleted file mode 100644
index d8deba8..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-intro-motivation.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-<head>
-<title>Motivation</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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="sect1">
-<a name="hdbk-intro-motivation"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-intro.html b/bibletime-doc/docs/en/handbook/html/hdbk-intro.html
deleted file mode 100644
index eee082e..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-intro.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<html>
-<head>
-<title>Chapter 1. Introduction</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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 provide 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>
-<a name="id2785150"></a><span class="term">Bibles</span>
-</dt>
-<dd><p>
-<a name="id2785158"></a>
-The full text, with optional Strong's Numbers and footnotes in the text
-</p></dd>
-<dt>
-<a name="id2785167"></a><span class="term">Commentaries</span>
-</dt>
-<dd><p>
-<a name="id2785175"></a>
-With a <i>Personal</i> commentary you can record your own personal
-notes to different parts of the Bible.
-</p></dd>
-<dt>
-<a name="id2785188"></a><span class="term">Lexicons</span>
-</dt>
-<dd><p>
-<a name="id2785196"></a>
-For word definitions and Bible topics. You an choose a key in a list which will
-be displayed. </p></dd>
-</dl></div>
-</p>
-<p>Additional documents are being added to the Sword repository frequently, so visit often.</p>
-<div class="sect1">
-<a name="hdbk-intro-changes"></a><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/bibletime/bibletime/ChangeLog" target="_top">
-CVS log for <tt>bibletime/bibletime/ChangeLog</tt></a>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-op-MDI-Window.html b/bibletime-doc/docs/en/handbook/html/hdbk-op-MDI-Window.html
deleted file mode 100644
index aacde8d..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-MDI-Window.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<html>
-<head>
-<title>Multiple Document Interface (MDI) Window</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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-module-tree-select.html" title="Selecting a document to
-view">
-<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('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('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('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('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-module-tree-select.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">
-<a name="hdbk-op-MDI-Window"></a><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;Document Windows&quot;, that are specific to the three 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">
-<a name="hdbk-op-MDI-Window-control-modules"></a><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">
-<a name="hdbk-op-MDI-Window-module-navigation"></a><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">
-<a name="id2721452"></a>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">
-<a name="id2721458"></a>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">
-<a name="id2721465"></a>Tip</h3>
-<p>For Bible texts the index key is <i>Book - Chapter - Verse</i>
-</p>
-</div>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">
-<a name="id2721474"></a>Tip</h3>
-<p>For commentaries the index key is <i>Book - Chapter - Verse</i>
-</p>
-</div>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">
-<a name="id2721483"></a>Tip</h3>
-<p>For lexicons the index key is <i>Keyword</i>
-</p>
-</div>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">
-<a name="id2721491"></a>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">
-<a name="hdbk-op-MDI-Window-Personal-commentary"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-op-MDI-Window-Personal-commentary"></a>Editing
-your own commentary</h3></div></div>
-<p>
-The tool bar of commentary display windows has another button, with the picture of a
-pencil.
-<span class="inlinemediaobject"><img src="hdbk-op-pencil.png" alt="Enter your notes"></span>
-For the &quot;Personal&quot; commentary module, left mouse button the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">button with the picture
-of a pencil</span> to enter your own notes, or to edit notes you've already
-entered. When you're done, left mouse button on the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">&quot;Save&quot; (disk) button</span>
-to save your notes. To delete notes for a selected verse, left mouse button 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">
-<a name="id2721083"></a>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">
-<a name="id2721523"></a>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">
-<a name="id2721584"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-module-tree-select.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">Selecting a document to
-view�</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/bibletime-doc/docs/en/handbook/html/hdbk-op-change-range.png b/bibletime-doc/docs/en/handbook/html/hdbk-op-change-range.png
deleted file mode 100644
index f85ce40..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-change-range.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-crch-dia-choose.png b/bibletime-doc/docs/en/handbook/html/hdbk-op-crch-dia-choose.png
deleted file mode 100644
index e2a1eae..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-crch-dia-choose.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-module-select-1.png b/bibletime-doc/docs/en/handbook/html/hdbk-op-module-select-1.png
deleted file mode 100644
index e166ff4..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-module-select-1.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-module-select-2.png b/bibletime-doc/docs/en/handbook/html/hdbk-op-module-select-2.png
deleted file mode 100644
index 496c404..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-module-select-2.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-module-tree-1.png b/bibletime-doc/docs/en/handbook/html/hdbk-op-module-tree-1.png
deleted file mode 100644
index 3d86741..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-module-tree-1.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-module-tree-select.html b/bibletime-doc/docs/en/handbook/html/hdbk-op-module-tree-select.html
deleted file mode 100644
index eba5a25..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-module-tree-select.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<html>
-<head>
-<title>Selecting a document to
-view</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="hdbk-op-module-tree-select"></a><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">
-<a name="id2721154"></a>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">
-<a name="hdbk-op-module-tree-search"></a><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">
-<a name="hdbk-op-module-tree-bookmark"></a><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">
-<a name="id2721302"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/html/hdbk-op-output.html b/bibletime-doc/docs/en/handbook/html/hdbk-op-output.html
deleted file mode 100644
index 85fbcbd..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-output.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<html>
-<head>
-<title>Exporting and Printing</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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-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('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('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('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('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-config.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="hdbk-op-output"></a><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</p>
-<p>By right mouse button on the index key number, verse number or text the
-Bible Window, Lexicon Window,or Commentary Window drop down box is
-displayed (depending on which kind of window is current),
-providing options to select all, look up text in lexicon,
-and the export options copy, add to printing queue, and save.</p>
-<div class="section">
-<a name="hdbk-op-select-all"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-op-select-all"></a>Select All</h3></div></div>
-<p>A left mouse button here will select all of the text in the chapter displayed
-in the current window.
-</p>
-</div>
-<div class="section">
-<a name="hdbk-op-lookup"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-op-lookup"></a>Lookup Text in Lexicon</h3></div></div>
-<p>A left mouse button here will bring up a submenu with a list of all of the available
-lexicons.  A left mouse button on a lexicon will open that lexicon to the cross reference of
-the selected text in the current window.
-</p>
-</div>
-<div class="section">
-<a name="hdbk-op-copy"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-op-copy"></a>Copy</h3></div></div>
-<p>A left mouse button 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>
-<li><p>
-<a name="id2784453"></a>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Verse</span> - The number of the current verse (such as Genesis 1:25)
-</p></li>
-<li><p>
-<a name="id2784466"></a>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Text of Verse</span> - The text of the current verse.
-</p></li>
-<li><p>
-<a name="id2784479"></a>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Verse with Text</span> - Both the text of the current verse, and the verse number
-</p></li>
-<li><p>
-<a name="id2784493"></a>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Chapter</span> -the entire chapter
-</p></li>
-<li><p>
-<a name="id2784505"></a>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Selected Text</span> - Only the selected (highlited) 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">
-<a name="hdbk-op-print"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-op-print"></a>Add to Printing Queue</h3></div></div>
-<p>A left mouse button here will bring up a submenu with the printing options:
-</p>
-<div class="itemizedlist"><ul>
-<li><p>
-<a name="id2784555"></a>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">verse with text</span>
-</p></li>
-<li><p>
-<a name="id2784568"></a>
-<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">
-<a name="hdbk-op-save"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-op-save"></a>Save</h3></div></div>
-<p>A left mouse button here will bring up a submenu with save options:
-</p>
-<div class="itemizedlist"><ul>
-<li><p>
-<a name="id2784638"></a>
-<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>
-<a name="id2783956"></a>
-<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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-config.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">�Configuring Bibletime</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-pencil.png b/bibletime-doc/docs/en/handbook/html/hdbk-op-pencil.png
deleted file mode 100644
index 8e2f895..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-pencil.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-search-dialog-searchanal.png b/bibletime-doc/docs/en/handbook/html/hdbk-op-search-dialog-searchanal.png
deleted file mode 100644
index 625e1af..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-search-dialog-searchanal.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-search-dialog-searchresult.png b/bibletime-doc/docs/en/handbook/html/hdbk-op-search-dialog-searchresult.png
deleted file mode 100644
index 4bdc051..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-search-dialog-searchresult.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-search.html b/bibletime-doc/docs/en/handbook/html/hdbk-op-search.html
deleted file mode 100644
index 84db198..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-search.html
+++ /dev/null
@@ -1,496 +0,0 @@
-<html>
-<head>
-<title>Searching in Documents</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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-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>Searching in Documents</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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-output.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="hdbk-op-search"></a><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">
-<a name="hdbk-op-search-functions"></a><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 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 shift- or ctrl-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. </p>
-</div>
-<div class="section">
-<a name="hdbk-op-search-dialog"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-op-search-dialog"></a>Using the Search Dialog</h3></div></div>
-<div class="section">
-<a name="hdbk-op-search-choose-modules"></a><div class="titlepage"><div><h4 class="title">
-<a name="hdbk-op-search-choose-modules"></a>Using the Choose Modules Tab</h4></div></div>
-<p>In the pane on the left side of the choose modules window is a list of all the
-Lexicons, Commentaries, and Bibles installed on your system and available to BibleTime.
-In the right pane is a list of all of the modules that will be searched by the current search.
-To move a Lexicons, Commentaries, or Bible from the left (available) pane
-to the right (to be search) pane, left mouse button on an item to select it, then left mouse button on one of the
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">arrow buttons</span>.</p>
-<div class="screenshot"><div class="mediaobject"><img src="hdbk-op-crch-dia-choose.png"></div></div>
-</div>
-<div class="section">
-<a name="hdbk-op-search-dialog-text"></a><div class="titlepage"><div><h4 class="title">
-<a name="hdbk-op-search-dialog-text"></a>Using the Search Text Tab</h4></div></div>
-<p>
-Search Text - In this pane enter the text string to be searched for, and set
-search properties. &quot;Regular Expression&quot; uses standard regexp syntax to refine
-the search. </p>
-<div class="section">
-<a name="hdbk-op-search-properties"></a><div class="titlepage"><div><h5 class="title">
-<a name="hdbk-op-search-properties"></a>Search Properties</h5></div></div>
-<p>The text box in the Search Properties field 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 (Regular
-Expression).
-
-You can use the radio buttons select to perform the search using
-the search key in multipule 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">
-<a name="id2722271"></a>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">
-<a name="hdbk-op-search-dialog-text-input-case"></a><div class="titlepage"><div><h5 class="title">
-<a name="hdbk-op-search-dialog-text-input-case"></a>Using the Search Text Case Sensitive Button</h5></div></div>
-<p>left mouse button 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">
-<a name="hdbk-op-search-dialog-text-input-multi"></a><div class="titlepage"><div><h5 class="title">
-<a name="hdbk-op-search-dialog-text-input-multi"></a>Using the Search Text Multiple Word Button</h5></div></div>
-<p>If Multiple Word is marked the search will locate all lines (or
-verses) that have all the words, (or partials), listed in the
-Input Field. The position and order of the words, (or partials),
-in the line is not a factor. If all the words, (or partials), are
-in a line, in any order, even separated by other words, the line
-will be included in the list of found line. A search for
-&quot;prove cause&quot; will find Gen. 21:25, &quot;And Abraham
-re<i>prove</i>d Abimelech be
-<i>cause</i> 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">
-<a name="hdbk-op-search-dialog-text-input-phrase"></a><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 Exact Search 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<i>now how thou ought</i>est
-to behave...&quot; </p>
-</div>
-<div class="section">
-<a name="hdbk-op-search-dialog-text-input-search"></a><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>left mouse button<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"><img src="hdbk-op-search-dialog-searchtext.png"></div></div>
-</div>
-<div class="section">
-<a name="hd-op-sch-dia-txt-scope-options"></a><div class="titlepage"><div><h5 class="title">
-<a name="hd-op-sch-dia-txt-scope-options"></a>Search Scope Options</h5></div></div>
-<p>Define the Scope of your search in the Search Scope Pane</p>
-<div class="itemizedlist"><ul>
-<li><p>
-<a name="id2721644"></a><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>
-<a name="id2721654"></a><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>
-<a name="id2721664"></a><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Use Scope</span> The new search will be
-performed within the range specified in the maintain custom ranges portion
-of the search scope tab.</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">
-<a name="hd-op-sch-dia-txt-scope-maintain"></a><div class="titlepage"><div><h5 class="title">
-<a name="hd-op-sch-dia-txt-scope-maintain"></a>Edit
-Ranges</h5></div></div>
-<p>Edit Ranges - You can enter upper and lower boundaries
-for the search by left mouse button <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">edit ranges</span> button.</p>
-<div class="mediaobject"><img src="hdbk-op-change-range.png" alt="Change Range Entry Box"></div>
-<p>The preentered ranges show examples of the required syntax.
-</p>
-<p>
-If the add button is left mouse button a text box is displayed where the name for the range is
-entered, then left mouse button on <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">OK</span>.  Now enter the desired range
-and left mouse button on <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">close</span>.  Your range is now added to the list of custom
-ranges.</p>
-<p>A number of custom ranges have been provided.</p>
-<p>The scope of a search can be set to the <i>Entire
-Module</i>or the <i>Current Results. </i>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="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">
-<a name="id2721822"></a>Tip</h3>
-<p>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.</p>
-</div>
-</div>
-</div>
-<div class="section">
-<a name="hdbk-op-search-dialog-text-result"></a><div class="titlepage"><div><h4 class="title">
-<a name="hdbk-op-search-dialog-text-result"></a>Using the Search Results Tab</h4></div></div>
-<p>
-Search Result - This tells you first, by module, how many instances of the
-search string were found. Double-clicking on that document will open the list of
-references. Clicking on a reference 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 </p>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">
-<a name="id2721858"></a>Tip</h3>
-<p>Drag &amp; Drop Works Here</p>
-</div>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">
-<a name="id2721864"></a>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">
-<a name="id2721870"></a>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">
-<a name="id2721876"></a>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"><img src="hdbk-op-search-dialog-searchresult.png"></div></div>
-</div>
-<div class="section">
-<a name="hdbk-op-search-dialog-text-analysis"></a><div class="titlepage"><div><h4 class="title">
-<a name="hdbk-op-search-dialog-text-analysis"></a>Using the Search Analysis Tab</h4></div></div>
-<p>
-Search Analysis - 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 graph as an image file on
-your hard drive. </p>
-<div class="screenshot"><div class="mediaobject"><img src="hdbk-op-search-dialog-searchanal.png"></div></div>
-</div>
-</div>
-<div class="section">
-<a name="hdbk-op-search-dialog-text-regexp"></a><div class="titlepage"><div><h3 class="title">
-<a name="hdbk-op-search-dialog-text-regexp"></a>Search Syntax using GCC Regular Expresession</h3></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;<i>right</i>eous&quot;,
-&quot;<i>right</i>eousness&quot;, &quot;un<i>right</i>eous&quot;,
-&quot;up<i>right</i>&quot; and even &quot;b<i>right</i>&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<i>hall not</i>&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;<i>i. love\.</i>&quot;
-will find sentences that end with &quot;h<i>i</i>s <i>love</i>&quot;
-or &quot;<i>i</i>n <i>love</i>&quot; or
-&quot;<i>i</i>s <i>love</i>&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">
-<a name="hdbk-op-search-dialog-text-regexp-rules"></a><div class="titlepage"><div><h4 class="title">
-<a name="hdbk-op-search-dialog-text-regexp-rules"></a>Rules for GCC Regular Expresession Search Requests</h4></div></div>
-<div class="itemizedlist"><ul>
-<li><p>
-<a name="id2783371"></a>. The period matches any character. See <a href="hdbk-op-search.html#period" title="The Period .">Details</a>
-</p></li>
-<li><p>
-<a name="id2783488"></a>* The asterisk matches 0 or more characters of the
-        preceding: set, character or indicated character. See <a href="hdbk-op-search.html#asterisk" title="The Asterisk *">Details</a>
-</p></li>
-<li><p>
-<a name="id2783508"></a>+ The plus sign matches 1 or more characters of the
-        preceding: set, character or indicated character. See <a href="hdbk-op-search.html#plus" title="The Plus Sign +">Details</a>
-</p></li>
-<li><p>
-<a name="id2783527"></a>? The question mark matches 0 or 1 character of the
-        preceding: set, character or indicated character. See <a href="hdbk-op-search.html#question" title="The Question Mark ?">Details</a>
-</p></li>
-<li><p>
-<a name="id2783547"></a>[ ] Square brackets match any one of the characters
-        specified inside [ ]. See <a href="hdbk-op-search.html#bracket" title="The Square Brackets [ ]">Details</a>
-</p></li>
-<li><p>
-<a name="id2783566"></a>^ A caret as the first character inside [ ] means NOT. See
-        <a href="hdbk-op-search.html#caret" title="The Caret first in Square Brackets [^xxx">Details</a>
-</p></li>
-<li><p>
-<a name="id2783584"></a>^ A caret beginning a pattern anchors the beginning of a
-        line. See <a href="hdbk-op-search.html#caret" title="The Caret first in Square Brackets [^xxx">Details</a>
-</p></li>
-<li><p>
-<a name="id2783602"></a>$ A dollar at the end of a pattern anchors the end of a
-        line. See <a href="hdbk-op-search.html#dollar" title="The Dollar Sign as End of Line Anchor xxx$">Details</a>
-</p></li>
-<li><p>
-<a name="id2783621"></a>| A vertical bar means logical OR. See <a href="hdbk-op-search.html#bar" title="The Vertical Bar |">Details</a>
-</p></li>
-<li><p>
-<a name="id2783639"></a>( ) Parentheses enclose expressions for grouping.
-    <i>Not supported!</i>
-</p></li>
-<li><p>
-<a name="id2783649"></a>\ A backslash can be used prior to any special character
-        to match that character. See <a href="hdbk-op-search.html#backslash" title="The Backslash Prior to a Special Character \*">Details</a>
-</p></li>
-<li><p>
-<a name="id2783667"></a>\ A backslash can be used prior to an ordinary character
-        to make it a special character. See <a href="hdbk-op-search.html#backslash" title="The Backslash Prior to a Special Character \*">Details</a>
-</p></li>
-</ul></div>
-<div class="section">
-<a name="period"></a><div class="titlepage"><div><h5 class="title">
-<a name="period"></a>The Period .</h5></div></div>
-<p>The Period &quot;.&quot; will match any single character even
-a space or other non-alphabet character.
-<i>s.t</i> matches <i>s</i>i<i>t</i>,
-<i>s</i>e<i>t</i>,<i> s</i>o<i>t</i>,
-etc., which could be located in <i>s</i>i<i>t</i>ting,
-compas<i>s</i>e<i>t</i>h and <i>s</i>o<i>t</i>tish
-<i>b..t</i> matches <i>b</i>oo<i>t</i>,
-<i>b</i>oa<i>t</i> and <i>b</i>ea<i>t
-foot.tool </i>matches <i>foot</i>s<i>tool </i>and
-<i>foot tool</i>
-</p>
-</div>
-<div class="section">
-<a name="asterisk"></a><div class="titlepage"><div><h5 class="title">
-<a name="asterisk"></a>The Asterisk *</h5></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.
-<i>be*n</i> matches<i> beeen, been, ben</i>,
-and <i>bn</i> which could locate Reu<i>ben</i>
-and She<i>bn</i>a.</p>
-</div>
-<div class="section">
-<a name="plus"></a><div class="titlepage"><div><h5 class="title">
-<a name="plus"></a>The Plus Sign +</h5></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.
-<i>be+n</i> matches <i>beeen, been</i> and <i>ben</i>,
-but not <i>bn</i>.</p>
-</div>
-<div class="section">
-<a name="question"></a><div class="titlepage"><div><h5 class="title">
-<a name="question"></a>The Question Mark ?</h5></div></div>
-<p>The Question Mark matches zero or one character of the
-preceding: set, character or indicated character.
-<i>be?n</i> matches <i>ben</i> and <i>bn</i>
-but not <i>been</i>.
-<i>trees?</i> matches <i>trees</i> or <i>tree</i>.</p>
-</div>
-<div class="section">
-<a name="bracket"></a><div class="titlepage"><div><h5 class="title">
-<a name="bracket"></a>The Square Brackets [ ]</h5></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.
-<i>s[eia]t</i> matches <i>set</i>, <i>sit</i>,
-and <i>sat</i>, but not <i>s</i>o<i>t</i>.
-<i>s[eia]+t </i>matches as above but also, <i>seat,
-seet, siet</i>, etc.
-<i>[a-d]</i> matches <i>a, b, c,</i> or <i>d</i>.
-<i>[A-Z]</i> matches any uppercase letter.
-[.;:?!] matches ., ;, :, ?, or ! but not a comma.
-[ ]^-] matches ] or ^ or -</p>
-</div>
-<div class="section">
-<a name="caret"></a><div class="titlepage"><div><h5 class="title">
-<a name="caret"></a>The Caret first in Square Brackets [^xxx</h5></div></div>
-<p>If the Caret is the first character after the left bracket it
-means NOT.
-<i>s[^io]t</i> matches <i>set, sat</i>, etc.,
-but not <i>s</i>i<i>t</i> and <i>s</i>o<i>t</i>.</p>
-</div>
-<div class="section">
-<a name="caret-s"></a><div class="titlepage"><div><h5 class="title">
-<a name="caret-s"></a>The Caret as Start of Line Anchor ^xxx</h5></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.
-<i>^In the beginning</i> matches lines that
-start with &quot;<i>In the beginning</i>&quot;.
-(May need to use: <i>^.....In the beginning</i>)</p>
-</div>
-<div class="section">
-<a name="dollar"></a><div class="titlepage"><div><h5 class="title">
-<a name="dollar"></a>The Dollar Sign as End of Line Anchor xxx$</h5></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.
-<i>Amen\.$</i> matches lines that end with
-&quot;<i>Amen.</i>&quot; (May
-need to use Amen\....$, Amen\..........$, or even
-Amen\....................$)</p>
-</div>
-<div class="section">
-<a name="bar"></a><div class="titlepage"><div><h5 class="title">
-<a name="bar"></a>The Vertical Bar |</h5></div></div>
-<p>The Vertical Bar between patterns means OR.
-<i>John|Peter</i> matches <i>John</i> or <i>Peter.
-John .*Peter|Peter .*John</i> matches <i>John</i>
-... <i>Peter</i> or <i>Peter</i> ... <i>John</i>.
-(.* slows a search)
-<i>pain|suffering|sorrow</i> matches <i>pain</i>,
-or <i>suffering</i>, or <i>sorrow</i>.</p>
-</div>
-<div class="section">
-<a name="parenth"></a><div class="titlepage"><div><h5 class="title">
-<a name="parenth"></a>The Parentheses ( ) </h5></div></div>
-<p><i>The use of Parentheses ( ) is
-not supported!</i></p>
-</div>
-<div class="section">
-<a name="backslash"></a><div class="titlepage"><div><h5 class="title">
-<a name="backslash"></a>The Backslash Prior to a Special Character \*</h5></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.
-<i>amen\.</i> matches <i>amen.</i> but not <i>amen</i>t
-and will not locate firm<i>amen</i>t.</p>
-</div>
-<div class="section">
-<a name="backslash-o"></a><div class="titlepage"><div><h5 class="title">
-<a name="backslash-o"></a>The Backslash Prior to an Ordinary Character \s</h5></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>
-<li><p>
-<a name="id2784229"></a>
-\b if use outside [ ] means word boundary. If used inside [ ] means backspace.
-<i>\brighteous\b</i> matches <i>righteous</i> but
-not un<i>righteous</i> or <i>righteous</i>ness</p></li>
-<li><p>
-<a name="id2784253"></a>\B means non-word boundary.  <i>\Brighteous\B</i>
-matches un<i>righteous</i>ness and un<i>righteous</i>ly
-but not <i>righteous</i>, un<i>righteous</i> or <i>
-righteous</i>ness.</p></li>
-<li><p>
-<a name="id2784284"></a>\d means digit; same as [0-9].</p></li>
-<li><p>
-<a name="id2784291"></a>\D means non-digit, same as [^0-9].</p></li>
-<li><p>
-<a name="id2784298"></a>\s means space. </p></li>
-<li><p>
-<a name="id2784303"></a>\S means not a space. </p></li>
-<li><p>
-<a name="id2784309"></a>\w means alphanumeric; same as [a-zA-Z0-9_].</p></li>
-<li><p>
-<a name="id2784316"></a>\W means not alphanumeric; same as [^a-zA-Z0-9_].</p></li>
-</ul></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-output.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">�Exporting and Printing</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op.html b/bibletime-doc/docs/en/handbook/html/hdbk-op.html
deleted file mode 100644
index 3dcb48e..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<title>Chapter 3. Program Operation</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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-module-tree-select.html" title="Selecting a document to
-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>Program Operation</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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-module-tree-select.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">
-<a name="hdbk-op-module-tree"></a><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"><img src="hdbk-op-module-tree-1.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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-module-tree-select.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">�Selecting a document to
-view</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-start-bticon.png b/bibletime-doc/docs/en/handbook/html/hdbk-start-bticon.png
deleted file mode 100644
index c2a6346..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-start-bticon.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-start-screen-terms.png b/bibletime-doc/docs/en/handbook/html/hdbk-start-screen-terms.png
deleted file mode 100644
index 13568bb..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-start-screen-terms.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-start-screen.html b/bibletime-doc/docs/en/handbook/html/hdbk-start-screen.html
deleted file mode 100644
index 0a86fab..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-start-screen.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
-<title>Parts of the BibleTime Window</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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-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('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('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('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('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-op.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="hdbk-start-screen"></a><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"><img src="hdbk-start-screen-terms.png" alt="The BibleTime Application Window"></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-op.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">�Program Operation</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-start-sequence-tips.png b/bibletime-doc/docs/en/handbook/html/hdbk-start-sequence-tips.png
deleted file mode 100644
index 1911f32..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-start-sequence-tips.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-term.html b/bibletime-doc/docs/en/handbook/html/hdbk-term.html
deleted file mode 100644
index 466f7b4..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk-term.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<html>
-<head>
-<title>Chapter 2. Starting BibleTime</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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-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>Starting BibleTime</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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-screen.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"><img src="hdbk-start-bticon.png" alt="A bunch of rectangles"></div>
-
-</p>
-<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 also be launched from a terminal command prompt.
-To launch BibleTime open a terminal (any Xterminal) and type
-<span class="command"><b>BibleTime</b></span>.
-</p>
-<div class="section">
-<a name="hdbk-start-sequence"></a><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>
-<li><p>
-<a name="id2785800"></a>
-<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>
-<a name="id2772143"></a>
-<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>
-<a name="id2785219"></a>
-<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"><img src="hdbk-start-sequence-tips.png" alt="Daily tips"></div>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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-screen.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">�Parts of the BibleTime Window</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk_op_module-tree-bookmark-bookmarkandfolder.png b/bibletime-doc/docs/en/handbook/html/hdbk_op_module-tree-bookmark-bookmarkandfolder.png
deleted file mode 100644
index 6b685d7..0000000
--- a/bibletime-doc/docs/en/handbook/html/hdbk_op_module-tree-bookmark-bookmarkandfolder.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/handbook/html/index.html b/bibletime-doc/docs/en/handbook/html/index.html
deleted file mode 100644
index b7cc09d..0000000
--- a/bibletime-doc/docs/en/handbook/html/index.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<html>
-<head>
-<title>The BibleTime Handbook</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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" id="id2785619">
-<div class="titlepage">
-<div><h1 class="title">
-<a name="id2785619"></a>The BibleTime Handbook</h1></div>
-<div>
-<h3 class="author">Fred  Saalbach</h3>
-<div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:info@bibletime.de">info@bibletime.de</a>&gt;</tt></div></div>
-<h3 class="author">Jeffrey Hoyt</h3>
-</div>
-<div>Revision <span class="releaseinfo">2.00<br></span>
-</div>
-<div><p class="copyright">Copyright � 1999, 2000, 2001 The team of BibleTime, info@bibletime.de</p></div>
-<div><div class="legalnotice">
-<p>The BibleTime helpdialog 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" id="id2785743">
-<a name="id2785743"></a><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>
-<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-sequence">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>
-<dt> <a href="hdbk-op-module-tree-select.html">Selecting a document to
-view</a>
-</dt>
-<dd><dl>
-<dt> <a href="hdbk-op-module-tree-select.html#hdbk-op-module-tree-search">Accessing the search
-dialog</a>
-</dt>
-<dt> <a href="hdbk-op-module-tree-select.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>
-<dt> <a href="hdbk-op-search.html#hdbk-op-search-dialog-text-regexp">Search Syntax using GCC Regular Expresession</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-lookup">Lookup Text in Lexicon</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">Options 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">Profiles</a>
-</dt>
-<dt> <a href="hdbk-config-bt.html#hdbk-config-bt-sword">Sword</a>
-</dt>
-<dt> <a href="hdbk-config-bt.html#hdbk-config-bt-Accelerators">Accelerators</a>
-</dt>
-</dl></dd>
-</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>
-<dt> <a href="hdbk-bars-menubar-file.html">File</a>
-</dt>
-<dt> <a href="hdbk-bars-menubar-view.html">View</a>
-</dt>
-<dt> <a href="hdbk-bars-menubar-mainindex.html">Main Index</a>
-</dt>
-<dt> <a href="hdbk-bars-menubar-Window.html">Window</a>
-</dt>
-<dt> <a href="hdbk-bars-menubar-settings.html">Settings</a>
-</dt>
-<dt> <a href="hdbk-bars-menubar-Help.html">Help</a>
-</dt>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/handbook/unicode/Makefile.am b/bibletime-doc/docs/en/handbook/unicode/Makefile.am
deleted file mode 100644
index 1790861..0000000
--- a/bibletime-doc/docs/en/handbook/unicode/Makefile.am
+++ /dev/null
@@ -1,31 +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 \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/handbook/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	fi;
-	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/bibletime-doc/docs/en/handbook/unicode/Makefile.in b/bibletime-doc/docs/en/handbook/unicode/Makefile.in
deleted file mode 100644
index 6976d6a..0000000
--- a/bibletime-doc/docs/en/handbook/unicode/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/unicode/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/handbook/unicode/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/handbook/unicode
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/handbook/unicode/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-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 \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/handbook/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	fi;
-	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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/handbook/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/handbook/unicode/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/handbook/unicode/hdbk-config.docbook b/bibletime-doc/docs/en/handbook/unicode/hdbk-config.docbook
deleted file mode 100644
index 286ac5e..0000000
--- a/bibletime-doc/docs/en/handbook/unicode/hdbk-config.docbook
+++ /dev/null
@@ -1,296 +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 allowes 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>Options Dialog</title>
-	<para>The options 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 in workspace area.</member>
-		</simplelist>
-		<mediaobject>
-		<imageobject>
-		<imagedata fileref="hdbk-conf-optdialog-start.png" format="PNG"/>
-		</imageobject>
-		<textobject>
-		<phrase>Options Dialog</phrase>
-		</textobject>
-		<caption>
-		<para>The Options dialog - Startup.</para>
-		</caption>
-		</mediaobject>
-		</section>
-		<section id="hdbk-config-bt-fonts"><title>Fonts</title>
-		<para>The display font used for text can be changed as desired.  If you have a
-		module that requires a special font, check here to see if the font is available to
-		&bibletime;.
-		</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-Unicode"><title>Unicode Fonts (ISO10646)</title>
-			<para>Sword modules are provided with either iso-8859-1 (Latin-1) or iso-10646 (Unicode) encoding.
-			You can tell how a module is encoded by &RMB; on the main index and selecting <guimenuitem>about
-			this module</guimenuitem>.</para>
-			<mediaobject>
-			<imageobject>
-			<imagedata fileref="hdbk-conf-font-about.png" format="PNG"/>
-			</imageobject>
-			<textobject>
-			<phrase>About this module</phrase>
-			</textobject>
-			<caption>
-			<para>The 'About this module' window shows what kind of encoding is used.</para>
-			</caption>
-			</mediaobject>
-			<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 (???????????????????) the font
-			available to &bibletime; does not contain the used in characters in your document.</para>
-
-			<para>In the options dialog, choose <guilabel>fonts select</guilabel> in the <guilabel>Unicode area of application</guilabel>.  You will need to choose
-			a font that has a iso-10646-1 character set.  Try clearlyu as a first step (it is included with most distributions).
-			If your module still does not display, you will need to use a more appropriate font.</para>
-
-			<tip><para>If you use a small Unicode font like clearlyu (about 22kb) &bibletime; will run faster than if a large font like
-			Bitstream Cyberbit (about 12Mb) is used.</para></tip>
-
-			<section id="hdbk-config-bt-addfont"><title>Font Installation</title>
-			<para>Installing fonts consists of three steps</para>
-
-			<orderedlist numeration="lowerroman">
-			<listitem>
-			<para><link linkend="hdbk-config-bt-ob-font">Obtaining Unicode fonts</link></para>
-			</listitem>
-			<listitem>
-			<para><link linkend="hdbk-config-bt-ob-font-X">Installing fonts to the XFree86 &X-Server;</link></para>
-			</listitem>
-			<listitem>
-			<para><link linkend="hdbk-config-bt-ob-font-print">Installing the font for printing (does not work yet).</link></para>
-			</listitem>
-			</orderedlist>
-			</section>
-
-
-			<section id="hdbk-config-bt-ob-font"><title>Obtaining Fonts</title>
-			<para>There are a number of fonts that support Unicode encoding, some of these are
-			available at no charge.  Few of the fonts available include all of range of symbols
-			defined in the Unicode standard.</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>For A partial list of other Unicode fonts and the ranges covered:
-			<ulink url="http://www.hclrss.demon.co.uk/unicode/fontsbyrange.html">Unicode Font List</ulink>
-			</para>
-			</section>
-
-			<section id="hdbk-config-bt-ob-font-X"><title>Installing your font to XFree86 (your &X-Server;)</title>
-			<para>
-			If your distribution includes a font installer (&Linux-Mandrake; supplies Drake Font) try to use the installer.
-			If the font installer does not work, or your distribution does not include one,
-			you will have to install the font manually.  Instructions for installing fonts can be found in
-			<ulink url="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Unicode-HOWTO.html#toc4">
-			The Unicode HOWTO</ulink>.  This was tested and works on &Linux-Mandrake; 7.1</para>
-
-			</section>
-
-			<section id="hdbk-config-bt-ob-font-print"><title>Installing the font for printing.</title>
-			<para>There is a known issue with Qt that prevents
-			printing characters outside the range of the Latin-1 character set.  This is expected to be
-			fixed with the release of Qt3 and KDE 3.  If you want to try anyway, the
-			<ulink url="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Font-HOWTO.html">
-			Font HowTo</ulink> explains the process for installing fonts to the printing system.</para>
-			</section>
-
-		</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>Profiles</title>
-	<para>Profiles define the appearance of the work area, for example which
-	windows are open and which texts should be displayed in these windows.
-	Once a profile is created, use the menu item <guimenu>window</guimenu> ->
-	<guimenuitem>save profile</guimenuitem> to save a current session into a
-	profile. Use <guimenu>window</guimenu> -> <guimenuitem>load profile</guimenuitem> to
-	load a previously saved profile 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 Catch for Lexicons</para>
-		<para>Bibletime can create a key catch for lexicons.  This speeds up
-		opening large lexicon modules.  The catch 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 brake 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 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>
-</section>
-</chapter>
diff --git a/bibletime-doc/docs/en/handbook/unicode/hdbk-intro.docbook b/bibletime-doc/docs/en/handbook/unicode/hdbk-intro.docbook
deleted file mode 100644
index 6b3146e..0000000
--- a/bibletime-doc/docs/en/handbook/unicode/hdbk-intro.docbook
+++ /dev/null
@@ -1,106 +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 provide 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 text, with optional Strong's Numbers and footnotes in the text
-</para>
-</listitem></varlistentry>
-
-<varlistentry>
-<term>Commentaries</term>
-<listitem>
-<para>
-With a <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>
-For word definitions and Bible topics. You an choose a key in a list which will
-be displayed. </para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-<para>Additional documents are being added to the &sword; repository frequently, so visit often.</para>
-
-<sect1 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/bibletime/bibletime/ChangeLog">
-CVS log for <filename>bibletime/bibletime/ChangeLog</filename></ulink></para>
-</sect1>
-
-<sect1 id="hdbk-intro-ToDo"><title>ToDo</title>
-<para>
-Very much!
-</para>
-<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.de">the &bibletime;
-homepage</ulink>.</para>
-
-<para>The &bibletime; project needs programmers / developers, 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>
-</sect1>
-
-<sect1 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>
-</sect1>
-</chapter>
diff --git a/bibletime-doc/docs/en/handbook/unicode/hdbk-operation.docbook b/bibletime-doc/docs/en/handbook/unicode/hdbk-operation.docbook
deleted file mode 100644
index 8bbb113..0000000
--- a/bibletime-doc/docs/en/handbook/unicode/hdbk-operation.docbook
+++ /dev/null
@@ -1,715 +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>
-
-<section id="hdbk-op-module-tree-select"><title>Selecting a document to
-view</title>
-<para>To select a document, &LMB; on the desired document group (Bibles, Commentaries, or
-Lexicons) to display the contents of a document group, &RMB; on the icon for
-the desired group.  To open a document, &LMB; 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 &LMB; 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. </para>
-<para>
-There are two other functions accessible through &RMB; 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 id="hdbk-op-module-tree-search"><title>Accessing the search
-dialog</title> <para>
-You can search in a module by &RMB; on the module name in the module
-list and selecting "Search in module(s)". By shift &RMB; 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.
-</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>
-&RMB; on an empty part of the module tree window and select <guimenuitem>"Create new
-group"</guimenuitem> 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 <guimenu>right-mouse-button menu</guimenu>, select "Export
-bookmarks". 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 &RMB; 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 "Document Windows", that are specific to the three 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>"Window"</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>
-The tool bar of commentary display windows has another button, with the picture of a
-pencil.
-<inlinemediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-pencil.png"/>
-</imageobject>
-<textobject>
-<phrase>Enter your notes</phrase>
-</textobject>
-</inlinemediaobject>
-For the "Personal" commentary module, &LMB; the <guibutton>button with the picture
-of a pencil</guibutton> to enter your own notes, or to edit notes you've already
-entered. When you're done, &LMB; on the <guibutton>"Save" (disk) button</guibutton>
-to save your notes. To delete notes for a selected verse, &LMB; 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 &RMB; on the document name in the <guimenu>Main
-Index</guimenu> and selecting <guimenuitem>Search in module(s)</guimenuitem>.
-By shift- or ctrl-&RMB; 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>
-
-<section id="hdbk-op-search-choose-modules"><title>Using the Choose Modules Tab</title>
-<para>In the pane on the left side of the choose modules window is a list of all the
-Lexicons, Commentaries, and Bibles installed on your system and available to &bibletime;.
-In the right pane is a list of all of the modules that will be searched by the current search.
-To move a Lexicons, Commentaries, or Bible from the left (available) pane
-to the right (to be search) pane, &LMB; on an item to select it, then &LMB; on one of the
-<guibutton>arrow buttons</guibutton>.</para>
-<screenshot>
-<screeninfo>Search Text Dialog Box</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-crch-dia-choose.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-</section>
-<section id="hdbk-op-search-dialog-text"><title>Using the Search Text Tab</title>
-<para>
-Search Text - In this pane enter the text string to be searched for, and set
-search properties. "Regular Expression" uses standard regexp syntax to refine
-the search. </para>
-
-<section id="hdbk-op-search-properties"><title>Search Properties</title>
-<!--Using the Search Text Input Field-->
-<para>The text box in the Search Properties field 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 (Regular
-Expression).
-
-You can use the radio buttons select to perform the search using
-the search key in multipule 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 Button</title>
-<para>&LMB; 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-multi">
-<title>Using the Search Text Multiple Word Button</title>
-<para>If Multiple Word is marked the search will locate all lines (or
-verses) that have all the words, (or partials), listed in the
-Input Field. The position and order of the words, (or partials),
-in the line is not a factor. If all the words, (or partials), are
-in a line, in any order, even separated by other words, the line
-will be included in the list of found line. 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-phrase"><title>Using the
-Exact Search</title> <para>If Exact Search 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="hdbk-op-search-dialog-text-input-search"><title>Using the Search Text Button</title>
-<para>&LMB;<guibutton>Search Button</guibutton> to start
-the search.</para>
-
-<screenshot>
-<screeninfo>Search Text Dialog Box</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-search-dialog-searchtext.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-</section>
-
-<section id="hd-op-sch-dia-txt-scope-options"><title>Search Scope Options</title>
-<para>Define the Scope of your search in the Search Scope Pane</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>Use Scope</guibutton> The new search will be
-performed within the range specified in the maintain custom ranges portion
-of the search scope tab.</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>Edit Ranges - You can enter upper and lower boundaries
-for the search by &LMB; <guibutton>edit ranges</guibutton> button.</para>
-
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-change-range.png" format="PNG"/>
-</imageobject>
-<textobject>
-<phrase>Change Range Entry Box</phrase>
-</textobject>
-</mediaobject>
-
-<para>The preentered ranges show examples of the required syntax.
-</para>
-<para>
-If the add button is &LMB; a text box is displayed where the name for the range is
-entered, then &LMB; on <guibutton>OK</guibutton>.  Now enter the desired range
-and &LMB; on <guibutton>close</guibutton>.  Your range is now added to the list of custom
-ranges.</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>
-
-<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>
-</section>
-</section>
-
-<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. Double-clicking on that document will open the list of
-references. Clicking on a reference 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 </para>
-<tip><para>Drag &amp; Drop Works Here</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 Tab</title>
-<para>
-Search Analysis - 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 graph as an image file 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 id="hdbk-op-search-dialog-text-regexp">
-<title>Search Syntax using GCC Regular Expresession</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 Expresession 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>
-
-<section id="hdbk-op-output"><title>Exporting and Printing</title>
-<para>Bible Window, Lexicon Window, Commentary Window</para>
-<para>By &RMB; on the index key number, verse number or text the
-Bible Window, Lexicon Window,or Commentary Window drop down box is
-displayed (depending on which kind of window is current),
-providing options to select all, look up text in lexicon,
-and the export options copy, add to printing queue, and save.</para>
-<section id="hdbk-op-select-all"><title>Select All</title>
-<para>A &LMB; here will select all of the text in the chapter displayed
-in the current window.
-</para>
-</section>
-<section id="hdbk-op-lookup"><title>Lookup Text in Lexicon</title>
-<para>A &LMB; here will bring up a submenu with a list of all of the available
-lexicons.  A &LMB; on a lexicon will open that lexicon to the cross reference of
-the selected text in the current window.
-</para>
-</section>
-
-<section id="hdbk-op-copy"><title>Copy</title>
-<para>A &LMB; 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>Verse</guimenuitem> - The number of the current verse (such as Genesis 1:25)
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>Text of Verse</guimenuitem> - The text of the current verse.
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>Verse 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 (highlited) 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>
-<para>A &LMB; here will bring up a submenu with the printing options:
-</para>
-<itemizedlist>
-<listitem>
-<para>
-<guimenuitem>verse 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 &LMB; here will bring up a submenu with save options:
-</para>
-<itemizedlist>
-<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/bibletime-doc/docs/en/handbook/unicode/hdbk-start.docbook b/bibletime-doc/docs/en/handbook/unicode/hdbk-start.docbook
deleted file mode 100644
index e94357f..0000000
--- a/bibletime-doc/docs/en/handbook/unicode/hdbk-start.docbook
+++ /dev/null
@@ -1,74 +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="hdbk-start-bticon.png" format="PNG"/>
-</imageobject>
-<textobject>
-<phrase>A bunch of rectangles</phrase> </textobject>
-</mediaobject>
-
-</para>
-<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 also be launched from a terminal command prompt.
-To launch &bibletime; open a terminal (any Xterminal) and type
-<command>&bibletime;</command>.
-</para>
-<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/bibletime-doc/docs/en/handbook/unicode/hdbk-toolbars.docbook b/bibletime-doc/docs/en/handbook/unicode/hdbk-toolbars.docbook
deleted file mode 100644
index 54943a1..0000000
--- a/bibletime-doc/docs/en/handbook/unicode/hdbk-toolbars.docbook
+++ /dev/null
@@ -1,392 +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="hdbk-bars-toolbar-action-exit.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>Icon</phrase>
-	</textobject>
-	</mediaobject>
-	Closes &bibletime;.
-	</para>
-
-	<para>
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="hdbk-bars-toolbar-action-print.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>Icon</phrase>
-	</textobject>
-	</mediaobject>
-	Prints items in the print queue.
-	</para>
-
-	<para>
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="hdbk-bars-toolbar-action-search.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>Icon</phrase>
-	</textobject>
-	</mediaobject>
-	Search in Selected Module(s).
-	</para>
-
-	<para>
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="hdbk-bars-toolbar-action-cascade.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>Icon</phrase>
-	</textobject>
-	</mediaobject>
-	Cascade Document Windows.
-	</para>
-
-	<para>
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="hdbk-bars-toolbar-action-cascade-auto.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>Icon</phrase>
-	</textobject>
-	</mediaobject>
-	Autocascade Document Windows.
-	</para>
-
-	<para>
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="hdbk-bars-toolbar-action-tile.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>Icon</phrase>
-	</textobject>
-	</mediaobject>
-	Tile Document Windows.
-	</para>
-
-	<para>
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="hdbk-bars-toolbar-action-tile-auto.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>Icon</phrase>
-	</textobject>
-	</mediaobject>
-	Auto tile Document Windows.
-	</para>
-
-
-	<para>
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="hdbk-bars-toolbar-close.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>Icon</phrase>
-	</textobject>
-	</mediaobject>
-	Close All Document Windows.
-	</para>
-	</section>
-	
-	<section id="hdbk-bars-menubar"><title>Menubar</title>
-	<para></para>
-	</section>
-
-<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>
-</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>Main Index</title>
-<para>
-
-
-<variablelist>
-<varlistentry><term>Search in module(s)</term>
-<listitem>
-<para>
-If <guimenuitem>Search in module(s)</guimenuitem> is selected,
-<guilabel>search dialog</guilabel> is displayed.  Any selected documents
-from the left pane are preselected on the choose modules tab.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>Reset Main Index</term>
-<listitem>
-<para>
-If <guimenuitem>Reset Main Index</guimenuitem> is selected,
-the <guilabel>Main Index</guilabel> in the left pane will be rebuilt.
-Any customization in the <guilabel>main index</guilabel> and bookmarks
-will be deleted.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>Remove selected item</term>
-<listitem>
-<para>
-If <guimenuitem>Remove selected item</guimenuitem> is selected,
-any selected items in the <guilabel>Main Index</guilabel> in the left pane will be deleted.
-This action can only be partly undone by the <guimenuitem>Reset Main Index</guimenuitem>.
-Use this feature with caution.
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-
-</para>
-</section>
-
-<section id="hdbk-bars-menubar-Window"><title>Window</title>
-<para>
-<variablelist>
-
-<varlistentry>
-<term>Save Profile</term>
-<listitem><para>Saves the current configuration to
-a selected profile</para></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term>Load Profile</term>
-<listitem><para>Loads the contents of the named profile to
-the current session of &bibletime;.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Configure Profile</term>
-<listitem><para>This brings up the <guilabel>profiles</guilabel> tab of the
-<guilabel>Options dialog</guilabel>.
-Here you create and manage profiles</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 selected modules.</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>Options dialog</guilabel>.
-From this dialog the startup mode, fonts, colors, profiles,
-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>Installation</term>
-<listitem><para>Select <guimenuitem>Installation</guimenuitem> to access
-the installation instructions for &bibletime; 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>
-
-
-
-</chapter>
-
diff --git a/bibletime-doc/docs/en/handbook/unicode/index.docbook b/bibletime-doc/docs/en/handbook/unicode/index.docbook
deleted file mode 100644
index 88cbc96..0000000
--- a/bibletime-doc/docs/en/handbook/unicode/index.docbook
+++ /dev/null
@@ -1,107 +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>
-<othername></othername>
-<surname>Saalbach</surname>
-<affiliation>
-<address><email>info@bibletime.de</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>
-<holder>The team of BibleTime, info@bibletime.de</holder>
-</copyright>
-
-<legalnotice>
-
-<para>The BibleTime helpdialog 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>09/February/2002</date>
-<releaseinfo>2.00</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/bibletime-doc/docs/en/helpdialog/Makefile.am b/bibletime-doc/docs/en/helpdialog/Makefile.am
deleted file mode 100644
index 17d7a2a..0000000
--- a/bibletime-doc/docs/en/helpdialog/Makefile.am
+++ /dev/null
@@ -1,23 +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 = html unicode 
-
-pot-files:
-	for f in `ls unicode/*.docbook`; do \
-		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \
-		potfile=`echo $$potfile | sed s/unicode//`; \
-		echo "Calling xml2pot $$f > pot/$$potfile"; \
-		xml2pot $$f > pot/$$potfile; \
-		done;
-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/bibletime-doc/docs/en/helpdialog/Makefile.in b/bibletime-doc/docs/en/helpdialog/Makefile.in
deleted file mode 100644
index e634189..0000000
--- a/bibletime-doc/docs/en/helpdialog/Makefile.in
+++ /dev/null
@@ -1,480 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = html unicode 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/helpdialog/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/helpdialog
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/helpdialog/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-pot-files:
-	for f in `ls unicode/*.docbook`; do \
-		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \
-		potfile=`echo $$potfile | sed s/unicode//`; \
-		echo "Calling xml2pot $$f > pot/$$potfile"; \
-		xml2pot $$f > pot/$$potfile; \
-		done;
-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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/helpdialog/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/helpdialog/html/Makefile.am b/bibletime-doc/docs/en/helpdialog/html/Makefile.am
deleted file mode 100644
index cc7b5b5..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/Makefile.am
+++ /dev/null
@@ -1,31 +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 = help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/helpdialog/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;
diff --git a/bibletime-doc/docs/en/helpdialog/html/Makefile.in b/bibletime-doc/docs/en/helpdialog/html/Makefile.in
deleted file mode 100644
index 599459a..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/html/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/helpdialog/html/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/helpdialog/html
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/helpdialog/html/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/helpdialog/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  help-first-startup.html help-first-time-search.html help-initbackend-failed.html help-module-encrypted.html help-no-mods-d.html help-no-modules.html help-sword-module-trouble.html index.html; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/helpdialog/html/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/helpdialog/html/help-first-startup.html b/bibletime-doc/docs/en/helpdialog/html/help-first-startup.html
deleted file mode 100644
index 1bde6c0..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/help-first-startup.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<html>
-<head>
-<title>Chapter 1. First Startup</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, Bibletime, Sword, Crosswire Bible Society, help dialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="The BibleTime Help Dialog">
-<link rel="up" href="index.html" title="The BibleTime Help Dialog">
-<link rel="previous" href="index.html" title="The BibleTime Help Dialog">
-<link rel="next" href="help-first-time-search.html" title="Chapter 2. First time search 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>First Startup</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-first-time-search.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="help-first-startup"></a>Chapter 1. First Startup</h2></div></div>
-<div class="table">
-<p>
-<a name="id2785165"></a><b>Table 1.1. The first startup of BibleTime!  This table describes the features of BibleTime!</b>
-</p>
-<table summary="The first startup of BibleTime!  This table describes the features of BibleTime!" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th><i>
-Feature
-</i></th>
-<th><i>
-Description
-</i></th>
-</tr></thead>
-<tbody>
-<tr>
-<td><i>MDI</i></td>
-<td>
-MDI is the abbreviation for <i>Multiple Document Interface.</i>
-With the help of MDI it's possible to have more than one display window opened at the
-same time! You may view two different bibles side by side and compare their
-text. But it's also possible to open only one window as in prevous versions of BibleTime. The
-menu <i>Window</i> is used to work with the MDI interface.
-
-The MDI area will only contain display windows, nothing else. This clean
-presentation avoids confusing users with too many choices.
-</td>
-</tr>
-<tr>
-<td><i>Display window</i></td>
-<td>
-A display window is a window inside the MDI area of BibleTime. A display window presents
-the content of a document (Sword module) in a reasonable format (for example Bibles will be
-displayed as HTML text with hyperlinks to verse references).
-We use display windows to have a general approach for the future.
-Crosswire will extend Sword as more material is made available for distribution.
-When new module types are created for Sword we will simply create additional types of display windows.
-This approach makes BibleTime extensible in the future, and able to display any
-type of module that might be created in (for example maps or sound modules ...).
-</td>
-</tr>
-<tr>
-<td><i>
-Main index
-</i></td>
-<td>
-The main index is the tree on the left side of BibleTime's application window.  The
-main index combines bookmark management and module management.
-To work with the main index use the right mouse button menu.
-
-The main index is Drag 'n' Drop capable: You can drag verse references from a
-an open document or from the search dialog into the main index to create a bookmark, and you can move items in
-the tree (e.g. move groups or bookmarks into another group).
-</td>
-</tr>
-<tr>
-<td><i>Search interface</i></td>
-<td>
-
-The search feature is now in its own window. Click with the right mouse button
-on a module and select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search in Selected module(s)</span> to open the search dialog. The dialog
-contains sections to enter the searchphrase, set the searchscope and to navigate
-through the items found. The last tab shows the graphical search analysis.
-
-
-</td>
-</tr>
-<tr>
-<td><i>Drag 'n' Drop</i></td>
-<td>
-
-Drag &amp; Drop is an important part of BibleTime! You can drag documents, verse
-references, bookmarks, document groups, search results etc. Places where you can drop
-them are the main index, the document windows, and the commentary editor.
-
-Simply play around a little to find out how our Drag &amp; Drop system does work!
-We hope you like it.
-
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="table">
-<p>
-<a name="id2784780"></a><b>Table 1.2. Here's a short list of useful URLS with more information about BibleTime!</b>
-</p>
-<table summary="Here's a short list of useful URLS with more information about BibleTime!" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th><i>URL</i></th>
-<th><i>Description</i></th>
-</tr></thead>
-<tbody>
-<tr>
-<td><i><a href="http://www.bibletime.de/" target="_top">www.bibletime.de</a></i></td>
-<td>
-This is the homepage of BibleTime! Browse to this page to read documentation
-pages. Don't forget to read the FAQ on <a href="http://www.bibletime.de" target="_top">
-www.bibletime.de</a>, it contains answers to questions you'll probably have.
-</td>
-</tr>
-<tr>
-<td><i><a href="http://www.crosswire.org" target="_top">www.crosswire.org</a></i></td>
-<td>
-This is the home of Crosswire Bible Society!  Crosswire Bible Society produces the
-Bible text module library - and the library manager Sword! You can down load the
-Bible text modules from this page. Most of the modules available from Crosswire Bible Society
-are either in the public domain or have been released to Crosswire Bible Society for distribution
-by the copyright holder. Modules that are not released for free distribution are
-locked. Please see the <a href="help-module-encrypted.html" title="Chapter 4. The module is encrypted">helpdialog on locked
-modules</a> before downloading locked modules.
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="help-first-time-search.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">The BibleTime Help Dialog�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�First time search dialog </td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/helpdialog/html/help-first-time-search.html b/bibletime-doc/docs/en/helpdialog/html/help-first-time-search.html
deleted file mode 100644
index 597fe1b..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/help-first-time-search.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<html>
-<head>
-<title>Chapter 2. First time search dialog </title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, Bibletime, Sword, Crosswire Bible Society, help dialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="The BibleTime Help Dialog">
-<link rel="up" href="index.html" title="The BibleTime Help Dialog">
-<link rel="previous" href="help-first-startup.html" title="Chapter 1. First Startup">
-<link rel="next" href="help-initbackend-failed.html" title="Chapter 3. Initialization of Backend Failed! ">
-</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>First time search dialog </h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-first-startup.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="help-initbackend-failed.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="help-first-time-search"></a>Chapter 2. First time search dialog </h2></div></div>
-<p>You opened the search dialog for the first time!</p>
-<p>This page describes what the search dialog is, how to use it and how to make efficient searches.</p>
-<div class="qandaset">
-<dl>
-<dt>2.1 <a href="help-first-time-search.html#id2721702">
-What's the search dialog?
-</a>
-</dt>
-<dt>2.2 <a href="help-first-time-search.html#id2721735">
-How do I search for some text?
-</a>
-</dt>
-</dl>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2721702"></a><b>2.1 </b>
-What's the search dialog?
-</p></div>
-<div class="answer"><p>
-<a name="id2721711"></a><b> </b>
-The search dialog is the where you can search the Sword documents (modules) installed in your copy of BibleTime.
-You can enter text and search this text in the documents. The entries found will
-appear in a list where you can work with them.
-</p></div>
-</div>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2721735"></a><b>2.2 </b>
-How do I search for some text?
-</p></div>
-<div class="answer">
-<p>
-<a name="id2721744"></a><b> </b>
-To search some text click on the first entry of the tab bar at the top of the dialog.
-Now enter some text in the search entry box at the top. If you don't want to do
-special things you can leave the settings untouched and click on the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search</span>
-button at the bottom of the dialog. The progress of the search will be
-displayed in the two bars at the bottom. The first bar shows the progress for
-the current module, the second one does show the percentage of the whole search.
-It's possible to search more than one module so two bars are required. But
-if you want to do more things with the search dialog we offer these settings to
-you:
-</p>
-<p>
-<i>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Multiple Words</span>
-</i>
-</p>
-<p>
-The entered words can occur in another order as entered in the line, they can
-even be part of more than one word.
-</p>
-<p>
-<i>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Exact search</span>
-</i>
-</p>
-<p>
-The text is exactly searched as entered in the line, unless you enabled case
-sensitive search the search does case insensitive search.
-</p>
-<p>
-<i>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Regular expressions</span>
-</i>
-</p>
-<p>
-If you use this type of search GNU standard regular expressions are used
-</p>
-<p>
-Normally all searches are done with insensitive character matching, to use
-case sensitive search enable the box <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Case sensitive</span>. If you have problems
-with the search types, case (in)sensitive search or other search related things
-have a look into our handbook for more information.
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="help-first-startup.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="help-initbackend-failed.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">First Startup�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�Initialization of Backend Failed! </td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/helpdialog/html/help-initbackend-failed.html b/bibletime-doc/docs/en/helpdialog/html/help-initbackend-failed.html
deleted file mode 100644
index 049fb2d..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/help-initbackend-failed.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<head>
-<title>Chapter 3. Initialization of Backend Failed! </title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, Bibletime, Sword, Crosswire Bible Society, help dialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="The BibleTime Help Dialog">
-<link rel="up" href="index.html" title="The BibleTime Help Dialog">
-<link rel="previous" href="help-first-time-search.html" title="Chapter 2. First time search dialog ">
-<link rel="next" href="help-module-encrypted.html" title="Chapter 4. The module is encrypted">
-</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>Initialization of Backend Failed! </h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-first-time-search.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="help-module-encrypted.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="help-initbackend-failed"></a>Chapter 3. Initialization of Backend Failed! </h2></div></div>
-<p>The initialization of BibleTime's backend failed!</p>
-<p>If you get this message, you have uncovered a bug we need to know about.</p>
-<p>Please send a bug-report with some information and show us how to reproduce the problem.</p>
-<p> Email us at <a href="mailto:info@bibletime.de" target="_top">info@bibletime.de!</a>
-</p>
-<p>Thank you very much for your help!</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="help-first-time-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="help-module-encrypted.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">First time search dialog �</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�The module is encrypted</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/helpdialog/html/help-module-encrypted.html b/bibletime-doc/docs/en/helpdialog/html/help-module-encrypted.html
deleted file mode 100644
index 8935cdd..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/help-module-encrypted.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<html>
-<head>
-<title>Chapter 4. The module is encrypted</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, Bibletime, Sword, Crosswire Bible Society, help dialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="The BibleTime Help Dialog">
-<link rel="up" href="index.html" title="The BibleTime Help Dialog">
-<link rel="previous" href="help-initbackend-failed.html" title="Chapter 3. Initialization of Backend Failed! ">
-<link rel="next" href="help-sword-module-trouble.html" title="Chapter 5. Sword module trouble.">
-</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 module is encrypted</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-initbackend-failed.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="help-sword-module-trouble.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="help-module-encrypted"></a>Chapter 4. The module is encrypted</h2></div></div>
-<p>The module you selected is encrypted!
-</p>
-<p>
-This page describes what encryption does mean for you.</p>
-<div class="qandaset">
-<dl>
-<dt>4.1 <a href="help-module-encrypted.html#id2722265">
-What is an encrypted
-module?
-</a>
-</dt>
-<dt>4.2 <a href="help-module-encrypted.html#id2722287">
-How do I unlock a module?
-</a>
-</dt>
-<dt>4.3 <a href="help-module-encrypted.html#id2722315">
-Why are modules locked?
-</a>
-</dt>
-</dl>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2722265"></a><b>4.1 </b>
-What is an encrypted
-module?
-</p></div>
-<div class="answer"><p>
-<a name="id2722274"></a><b> </b>
-An encrypted module (document) is a module which is locked with a key. Only a user that has
-the right key can unlock the module to read it.
-</p></div>
-</div>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2722287"></a><b>4.2 </b>
-How do I unlock a module?
-</p></div>
-<div class="answer"><p>
-<a name="id2722296"></a><b> </b>
-For normal users it's sadly not possible at this time to use encrypted modules.
-The problem is that the copyright owners of the modules do not want to release
-the stuff with SWORD.  But If you have a key click with the right
-mousebutton on the module and select &quot;Unlock module ...&quot;.  A dialog appears,
-please enter here the key to unlock the encrypted module.
-</p></div>
-</div>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2722315"></a><b>4.3 </b>
-Why are modules locked?
-</p></div>
-<div class="answer"><p>
-<a name="id2722324"></a><b> </b>
-Modules are locked because the copyright owners of the module do not want to
-release their texts through the Sword project. Please contact the
-copyright owners and ask for the modules to be made available. If you want to
-pay for it please let them know, this is a thing they like. We know freely available module would be
-great, so try to get them!  You can also visit 
-<a href="http://www.crosswire.org/sword/copyright/" target="_top">Crosswire Bible Society</a> and
-read the information on the effort to make copyrighted texts available through
-crosswire. This project needs your support.  Thank you very much for your efforts!
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="help-initbackend-failed.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="help-sword-module-trouble.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Initialization of Backend Failed! �</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�Sword module trouble.</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/helpdialog/html/help-no-mods-d.html b/bibletime-doc/docs/en/helpdialog/html/help-no-mods-d.html
deleted file mode 100644
index 8ee2052..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/help-no-mods-d.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<html>
-<head>
-<title>Chapter 6. Initialization of Module directory failed!</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, Bibletime, Sword, Crosswire Bible Society, help dialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="The BibleTime Help Dialog">
-<link rel="up" href="index.html" title="The BibleTime Help Dialog">
-<link rel="previous" href="help-sword-module-trouble.html" title="Chapter 5. Sword module trouble.">
-<link rel="next" href="help-no-modules.html" title="Chapter 7. No modules installed!">
-</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>Initialization of Module directory failed!</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-sword-module-trouble.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="help-no-modules.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="help-no-mods-d"></a>Chapter 6. Initialization of Module directory failed!</h2></div></div>
-<p>There's no mods.d directory!</p>
-<p>This page describes what the <tt>mods.d</tt> directory is and how to solve this problem! </p>
-<div class="qandaset">
-<dl>
-<dt>6.1 <a href="help-no-mods-d.html#id2721962">
-What is the mods.d directory?
-</a>
-</dt>
-<dt>6.2 <a href="help-no-mods-d.html#id2721998">
-How do I solve this problem?
-</a>
-</dt>
-<dt>6.3 <a href="help-no-mods-d.html#id2784883">
-Can I start BibleTime without this directory?
-</a>
-</dt>
-</dl>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2721962"></a><b>6.1 </b>
-What is the <tt>mods.d</tt> directory?
-</p></div>
-<div class="answer"><p>
-<a name="id2721975"></a><b> </b>
-The <tt>mods.d</tt> directory is the directory which should contain the config files of
-the modules!  You must have this directory, otherwise you can't use Bibletime
-and Sword! Please read the installation instructions on our homepage!
-</p></div>
-</div>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2721998"></a><b>6.2 </b>
-How do I solve this problem?
-</p></div>
-<div class="answer"><p>
-<a name="id2722008"></a><b> </b>
-The solution is to create a directory <tt>mods.d</tt>:
-Please go into your Sword directory and type &quot;<span class="command"><b>mkdir mods.d</b></span>&quot; to create the directory.
-Now copy the config files of your modules into this package and remove (if they
-exist) the file <tt>mods.conf</tt> which isn't required any more.
-The <tt>mods.d</tt> directory replaced this file.
- </p></div>
-</div>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2784883"></a><b>6.3 </b>
-Can I start BibleTime without this directory?
-</p></div>
-<div class="answer"><p>
-<a name="id2723417"></a><b> </b>
-Yes, it's possible. But it's not very useful.
-There are no modules in the main index. It's possible to test BibleTime this
-way, but it's not possible to work with it without 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="help-sword-module-trouble.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="help-no-modules.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Sword module trouble.�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�No modules installed!</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/helpdialog/html/help-no-modules.html b/bibletime-doc/docs/en/helpdialog/html/help-no-modules.html
deleted file mode 100644
index b1be441..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/help-no-modules.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<html>
-<head>
-<title>Chapter 7. No modules installed!</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, Bibletime, Sword, Crosswire Bible Society, help dialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="The BibleTime Help Dialog">
-<link rel="up" href="index.html" title="The BibleTime Help Dialog">
-<link rel="previous" href="help-no-mods-d.html" title="Chapter 6. Initialization of Module directory failed!">
-</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>No modules installed!</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-no-mods-d.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="help-no-modules"></a>Chapter 7. No modules installed!</h2></div></div>
-<p>There are no installed Sword modules! </p>
-<p>This page describes what modules are and how to solve the problem </p>
-<div class="qandaset">
-<dl>
-<dt>7.1 <a href="help-no-modules.html#id2784947">
-What is a module?
-</a>
-</dt>
-<dt>7.2 <a href="help-no-modules.html#id2784993">
-How do I solve the problem?
-</a>
-</dt>
-<dt>7.3 <a href="help-no-modules.html#id2785028">
-What should I do if it doesn't work?
-</a>
-</dt>
-</dl>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2784947"></a><b>7.1 </b>
-What is a module?
-</p></div>
-<div class="answer"><p>
-<a name="id2784956"></a><b> </b>
-A Sword module is the base of BibleTime. A module may be a Bible,
-a commentary or a lexicon. Later we will have maps and other interesting stuff.
-It's not possible to use with BibleTime if no modules are installed
-although it's possible to test BibleTime without installed modules.
-When modules are displayed in BibleTime we call them documents.
-</p></div>
-</div>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2784993"></a><b>7.2 </b>
-How do I solve the problem?
-</p></div>
-<div class="answer"><p>
-<a name="id2785002"></a><b> </b>Please download some modules and install them!  Get the modules at
-<a href="http://www.crosswire.org" target="_top">www.crosswire.org</a>.
-Please read the installation instructions of our handbook and of our homepage.
-</p></div>
-</div>
-<div class="qandaentry">
-<div class="question"><p>
-<a name="id2785028"></a><b>7.3 </b>
-What should I do if it doesn't work?
-</p></div>
-<div class="answer"><p>
-<a name="id2785038"></a><b> </b>
-Please read the documentation on <a href="http://www.bibletime.de" target="_top">
-www.bibletime.de</a> and if you can't get it
-working please send an email to <a href="mailto:info@bbibletime.de" target="_top">info@bibletime.de </a>. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="help-no-mods-d.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">Initialization of Module directory failed!�</td>
-<td width="34%" align="center"><a href="index.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/bibletime-doc/docs/en/helpdialog/html/help-sword-module-trouble.html b/bibletime-doc/docs/en/helpdialog/html/help-sword-module-trouble.html
deleted file mode 100644
index 2fb7d48..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/help-sword-module-trouble.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html>
-<head>
-<title>Chapter 5. Sword module trouble.</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, Bibletime, Sword, Crosswire Bible Society, help dialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="The BibleTime Help Dialog">
-<link rel="up" href="index.html" title="The BibleTime Help Dialog">
-<link rel="previous" href="help-module-encrypted.html" title="Chapter 4. The module is encrypted">
-<link rel="next" href="help-no-mods-d.html" title="Chapter 6. Initialization of Module directory failed!">
-</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 module trouble.</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-module-encrypted.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="help-no-mods-d.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="help-sword-module-trouble"></a>Chapter 5. Sword module trouble.</h2></div></div>
-<p>The sword module did not open.  This is usually caused by an out of date or damaged sword module.
-Please visit <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a> for an update of your module.</p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">
-<a name="id2784896"></a>Note</h3>
-<p>Currently sword does not trap this problem.  BibleTime and sword will crash with no error message.
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="help-module-encrypted.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="help-no-mods-d.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">The module is encrypted�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�Initialization of Module directory failed!</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/helpdialog/html/index.html b/bibletime-doc/docs/en/helpdialog/html/index.html
deleted file mode 100644
index 9787907..0000000
--- a/bibletime-doc/docs/en/helpdialog/html/index.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<html>
-<head>
-<title>The BibleTime Help Dialog</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<meta name="keywords" content="KDE, Bibletime, Sword, Crosswire Bible Society, help dialog">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<meta name="GENERATOR" content="KDE XSL Stylesheet V1.12 using libxslt">
-<link rel="home" href="index.html" title="The BibleTime Help Dialog">
-<link rel="next" href="help-first-startup.html" title="Chapter 1. First Startup">
-</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 Help Dialog</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="help-first-startup.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="book" id="id2785651">
-<div class="titlepage">
-<div><h1 class="title">
-<a name="id2785651"></a>The BibleTime Help Dialog</h1></div>
-<div>
-<h3 class="author">Fred  Saalbach</h3>
-<div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:info@bibletime.de">info@bibletime.de</a>&gt;</tt></div></div>
-<h3 class="author">Jeffrey Hoyt</h3>
-</div>
-<div>Revision <span class="releaseinfo">1.01.00<br></span>
-</div>
-<div><p class="copyright">Copyright � 1999, 2000, 2001 The team of BibleTime, info@bibletime.de</p></div>
-<div><div class="legalnotice">
-<p>The BibleTime helpdialog 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" id="id2785876">
-<a name="id2785876"></a><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="help-first-startup.html">First Startup</a>
-</dt>
-<dt>2 <a href="help-first-time-search.html">First time search dialog </a>
-</dt>
-<dt>3 <a href="help-initbackend-failed.html">Initialization of Backend Failed! </a>
-</dt>
-<dt>4 <a href="help-module-encrypted.html">The module is encrypted</a>
-</dt>
-<dt>5 <a href="help-sword-module-trouble.html">Sword module trouble.</a>
-</dt>
-<dt>6 <a href="help-no-mods-d.html">Initialization of Module directory failed!</a>
-</dt>
-<dt>7 <a href="help-no-modules.html">No modules installed!</a>
-</dt>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="help-first-startup.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">�</td>
-<td width="34%" align="center">�</td>
-<td width="33%" align="right">�First Startup</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/Makefile.am b/bibletime-doc/docs/en/helpdialog/unicode/Makefile.am
deleted file mode 100644
index 61f8a38..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/Makefile.am
+++ /dev/null
@@ -1,31 +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 = help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/helpdialog/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/Makefile.in b/bibletime-doc/docs/en/helpdialog/unicode/Makefile.in
deleted file mode 100644
index 077b493..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/unicode/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/helpdialog/unicode/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/helpdialog/unicode
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/helpdialog/unicode/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/helpdialog/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  help-first-startup.docbook help-first-time-search.docbook help-initbackend-failed.docbook help-module-encrypted.docbook help-no-mods-d.docbook help-no-modules.docbook help-sword-module-trouble.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/helpdialog/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/helpdialog/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/helpdialog/unicode/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/help-first-startup.docbook b/bibletime-doc/docs/en/helpdialog/unicode/help-first-startup.docbook
deleted file mode 100644
index f6dbf4a..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/help-first-startup.docbook
+++ /dev/null
@@ -1,157 +0,0 @@
-<chapter id="help-first-startup">
-<title>First Startup</title>
-
-<table>
-<title>The first startup of &bibletime;!  This table describes the features of &bibletime;!</title>
-<tgroup cols="2">
-<thead>
-<row>
-<entry>
-<emphasis>
-Feature
-</emphasis>
-</entry>
-<entry>
-<emphasis>
-Description
-</emphasis>
-</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry>
-<emphasis>MDI</emphasis>
-</entry>
-
-<entry>
-MDI is the abbreviation for <emphasis>Multiple Document Interface.</emphasis>
-With the help of MDI it's possible to have more than one display window opened at the
-same time! You may view two different bibles side by side and compare their
-text. But it's also possible to open only one window as in prevous versions of &bibletime;. The
-menu <emphasis>Window</emphasis> is used to work with the MDI interface.
-
-The MDI area will only contain display windows, nothing else. This clean
-presentation avoids confusing users with too many choices.
-</entry>
-
-</row>
-<row>
-<entry>
-<emphasis>Display window</emphasis>
-</entry>
-
-<entry>
-A display window is a window inside the MDI area of &bibletime;. A display window presents
-the content of a document (&sword; module) in a reasonable format (for example Bibles will be
-displayed as HTML text with hyperlinks to verse references).
-We use display windows to have a general approach for the future.
-Crosswire will extend &sword; as more material is made available for distribution.
-When new module types are created for &sword; we will simply create additional types of display windows.
-This approach makes &bibletime; extensible in the future, and able to display any
-type of module that might be created in (for example maps or sound modules ...).
-</entry>
-
-</row>
-<row>
-<entry>
-<emphasis>
-Main index
-</emphasis>
-</entry>
-
-<entry>
-The main index is the tree on the left side of &bibletime;'s application window.  The
-main index combines bookmark management and module management.
-To work with the main index use the &RMB; menu.
-
-The main index is Drag 'n' Drop capable: You can drag verse references from a
-an open document or from the search dialog into the main index to create a bookmark, and you can move items in
-the tree (e.g. move groups or bookmarks into another group).
-</entry>
-
-</row>
-<row>
-<entry>
-<emphasis>Search interface</emphasis>
-</entry>
-<entry>
-
-The search feature is now in its own window. Click with the &RMB;
-on a module and select <guimenuitem>Search in Selected module(s)</guimenuitem> to open the search dialog. The dialog
-contains sections to enter the searchphrase, set the searchscope and to navigate
-through the items found. The last tab shows the graphical search analysis.
-
-
-</entry>
-</row>
-<row>
-<entry>
-<emphasis>Drag 'n' Drop</emphasis>
-</entry>
-<entry>
-
-Drag &amp; Drop is an important part of &bibletime;! You can drag documents, verse
-references, bookmarks, document groups, search results etc. Places where you can drop
-them are the main index, the document windows, and the commentary editor.
-
-Simply play around a little to find out how our Drag &amp; Drop system does work!
-We hope you like it.
-
-</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-<table>
-<title>Here's a short list of useful URLS with more information about &bibletime;!</title>
-<tgroup cols="2">
-<thead>
-<row>
-
-<entry>
-<emphasis>URL</emphasis>
-</entry>
-
-<entry>
-<emphasis>Description</emphasis>
-</entry>
-
-</row>
-</thead>
-<tbody>
-<row>
-
-<entry>
-<emphasis><ulink url="http://www.bibletime.de/">www.bibletime.de</ulink></emphasis>
-</entry>
-
-<entry>
-This is the homepage of &bibletime;! Browse to this page to read documentation
-pages. Don't forget to read the &FAQ; on <ulink url="http://www.bibletime.de">
-www.bibletime.de</ulink>, it contains answers to questions you'll probably have.
-</entry>
-</row>
-
-<row>
-<entry>
-<emphasis><ulink url="http://www.crosswire.org">www.crosswire.org</ulink></emphasis>
-</entry>
-
-<entry>
-This is the home of &crosswire;!  &crosswire; produces the
-Bible text module library - and the library manager &sword;! You can down load the
-Bible text modules from this page. Most of the modules available from &crosswire;
-are either in the public domain or have been released to &crosswire; for distribution
-by the copyright holder. Modules that are not released for free distribution are
-locked. Please see the <link linkend="help-module-encrypted">helpdialog on locked
-modules</link> before downloading locked modules.
-</entry>
-
-</row>
-</tbody>
-</tgroup>
-</table>
-</chapter>
-
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/help-first-time-search.docbook b/bibletime-doc/docs/en/helpdialog/unicode/help-first-time-search.docbook
deleted file mode 100644
index 7fcfb14..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/help-first-time-search.docbook
+++ /dev/null
@@ -1,77 +0,0 @@
-<chapter id="help-first-time-search">
-<title>First time search dialog </title>
-
-<para>You opened the search dialog for the first time!</para>
-<para>This page describes what the search dialog is, how to use it and how to make efficient searches.</para>
-
-<qandaset>
-<qandaentry>
-<question>
-<para>
-What's the search dialog?
-</para>
-</question>
-<answer>
-<para>
-The search dialog is the where you can search the &sword; documents (modules) installed in your copy of &bibletime;.
-You can enter text and search this text in the documents. The entries found will
-appear in a list where you can work with them.
-</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para>
-How do I search for some text?
-</para>
-</question>
-<answer>
-<para>
-To search some text click on the first entry of the tab bar at the top of the dialog.
-Now enter some text in the search entry box at the top. If you don't want to do
-special things you can leave the settings untouched and click on the <guibutton>Search</guibutton>
-button at the bottom of the dialog. The progress of the search will be
-displayed in the two bars at the bottom. The first bar shows the progress for
-the current module, the second one does show the percentage of the whole search.
-It's possible to search more than one module so two bars are required. But
-if you want to do more things with the search dialog we offer these settings to
-you:
-</para>
-<para>
-<emphasis>
-<guilabel>Multiple Words</guilabel>
-</emphasis>
-</para>
-<para>
-The entered words can occur in another order as entered in the line, they can
-even be part of more than one word.
-</para>
-<para>
-<emphasis>
-<guilabel>Exact search</guilabel>
-</emphasis>
-</para>
-<para>
-The text is exactly searched as entered in the line, unless you enabled case
-sensitive search the search does case insensitive search.
-</para>
-<para>
-<emphasis>
-<guilabel>Regular expressions</guilabel>
-</emphasis>
-</para>
-<para>
-If you use this type of search GNU standard regular expressions are used
-</para>
-<para>
-Normally all searches are done with insensitive character matching, to use
-case sensitive search enable the box <guilabel>Case sensitive</guilabel>. If you have problems
-with the search types, case (in)sensitive search or other search related things
-have a look into our handbook for more information.
-</para>
-</answer>
-</qandaentry>
-</qandaset>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/help-initbackend-failed.docbook b/bibletime-doc/docs/en/helpdialog/unicode/help-initbackend-failed.docbook
deleted file mode 100644
index f67bd35..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/help-initbackend-failed.docbook
+++ /dev/null
@@ -1,12 +0,0 @@
-<chapter id="help-initbackend-failed">
-<title>Initialization of Backend Failed! </title>
-<para>The initialization of &bibletime;'s backend failed!</para>
-
-<para>If you get this message, you have uncovered a bug we need to know about.</para>
-
-
-<para>Please send a bug-report with some information and show us how to reproduce the problem.</para>
-<para> Email us at <ulink url="mailto:info@bibletime.de">info@bibletime.de!</ulink></para>
-<para>Thank you very much for your help!</para>
-</chapter>
-
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/help-module-encrypted.docbook b/bibletime-doc/docs/en/helpdialog/unicode/help-module-encrypted.docbook
deleted file mode 100644
index 24e3d4a..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/help-module-encrypted.docbook
+++ /dev/null
@@ -1,60 +0,0 @@
-<chapter id="help-module-encrypted">
-<title>The module is encrypted</title>
-<para>The module you selected is encrypted!
-</para>
-<para>
-This page describes what encryption does mean for you.</para>
-<qandaset>
-<qandaentry>
-<question>
-<para>
-What is an encrypted
-module?
-</para>
-</question>
-<answer>
-<para>
-An encrypted module (document) is a module which is locked with a key. Only a user that has
-the right key can unlock the module to read it.
-</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para>
-How do I unlock a module?
-</para>
-</question>
-<answer>
-<para>
-For normal users it's sadly not possible at this time to use encrypted modules.
-The problem is that the copyright owners of the modules do not want to release
-the stuff with SWORD.  But If you have a key click with the right
-mousebutton on the module and select "Unlock module ...".  A dialog appears,
-please enter here the key to unlock the encrypted module.
-</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para>
-Why are modules locked?
-</para>
-</question>
-<answer>
-<para>
-Modules are locked because the copyright owners of the module do not want to
-release their texts through the &sword; project. Please contact the
-copyright owners and ask for the modules to be made available. If you want to
-pay for it please let them know, this is a thing they like. We know freely available module would be
-great, so try to get them!  You can also visit 
-<ulink url="http://www.crosswire.org/sword/copyright/">&crosswire;</ulink> and
-read the information on the effort to make copyrighted texts available through
-crosswire. This project needs your support.  Thank you very much for your efforts!
-</para>
-
-</answer>
-</qandaentry>
-</qandaset>
-</chapter>
-
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/help-no-mods-d.docbook b/bibletime-doc/docs/en/helpdialog/unicode/help-no-mods-d.docbook
deleted file mode 100644
index 945f3ab..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/help-no-mods-d.docbook
+++ /dev/null
@@ -1,54 +0,0 @@
-<chapter id="help-no-mods-d">
-<title>Initialization of Module directory failed!</title>
-
-<para>There's no mods.d directory!</para>
-
-<para>This page describes what the <filename>mods.d</filename> directory is and how to solve this problem! </para>
-<qandaset>
-<qandaentry>
-<question>
-<para>
-What is the <filename>mods.d</filename> directory?
-</para>
-</question>
-<answer>
-<para>
-The <filename>mods.d</filename> directory is the directory which should contain the config files of
-the modules!  You must have this directory, otherwise you can't use Bibletime
-and &sword;! Please read the installation instructions on our homepage!
-</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para>
-How do I solve this problem?
-</para>
-</question>
-<answer>
-<para>
-The solution is to create a directory <filename>mods.d</filename>:
-Please go into your &sword; directory and type "<command>mkdir mods.d</command>" to create the directory.
-Now copy the config files of your modules into this package and remove (if they
-exist) the file <filename>mods.conf</filename> which isn't required any more.
-The <filename>mods.d</filename> directory replaced this file.
- </para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para>
-Can I start &bibletime; without this directory?
-</para>
-</question>
-<answer>
-<para>
-Yes, it's possible. But it's not very useful.
-There are no modules in the main index. It's possible to test &bibletime; this
-way, but it's not possible to work with it without modules.
-</para>
-</answer>
-</qandaentry>
-</qandaset>
-</chapter>
-
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/help-no-modules.docbook b/bibletime-doc/docs/en/helpdialog/unicode/help-no-modules.docbook
deleted file mode 100644
index 3b2f9da..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/help-no-modules.docbook
+++ /dev/null
@@ -1,53 +0,0 @@
-<chapter id="help-no-modules">
-<title>No modules installed!</title>
-
-<para>There are no installed &sword; modules! </para>
-<para>This page describes what modules are and how to solve the problem </para>
-
-<qandaset>
-<qandaentry>
-<question>
-<para>
-What is a module?
-</para>
-</question>
-<answer>
-<para>
-A &sword; module is the base of &bibletime;. A module may be a Bible,
-a commentary or a lexicon. Later we will have maps and other interesting stuff.
-It's not possible to use with &bibletime; if no modules are installed
-although it's possible to test &bibletime; without installed modules.
-When modules are displayed in &bibletime; we call them documents.
-</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para>
-How do I solve the problem?
-</para>
-</question>
-<answer>
-<para>Please download some modules and install them!  Get the modules at
-<ulink url="http://www.crosswire.org">www.crosswire.org</ulink>.
-Please read the installation instructions of our handbook and of our homepage.
-</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para>
-What should I do if it doesn't work?
-</para>
-</question>
-<answer>
-<para>
-Please read the documentation on <ulink url="http://www.bibletime.de">
-www.bibletime.de</ulink> and if you can't get it
-working please send an email to <ulink
-url="mailto:info@bbibletime.de">info@bibletime.de </ulink>. </para>
-</answer>
-</qandaentry>
-</qandaset>
-</chapter>
-
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/help-sword-module-trouble.docbook b/bibletime-doc/docs/en/helpdialog/unicode/help-sword-module-trouble.docbook
deleted file mode 100644
index 83dd65b..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/help-sword-module-trouble.docbook
+++ /dev/null
@@ -1,9 +0,0 @@
-<chapter id="help-sword-module-trouble">
-<title>Sword module trouble.</title>
-<para>The sword module did not open.  This is usually caused by an out of date or damaged sword module.
-Please visit <ulink url="http://www.crosswire.org">Crosswire Bible Society</ulink> for an update of your module.</para>
-<note>
-<para>Currently sword does not trap this problem.  &bibletime; and sword will crash with no error message.
-</para>
-</note>
-</chapter>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/helpdialog/unicode/index.docbook b/bibletime-doc/docs/en/helpdialog/unicode/index.docbook
deleted file mode 100644
index c022fbb..0000000
--- a/bibletime-doc/docs/en/helpdialog/unicode/index.docbook
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE"><!-- change language only here -->
-
-  <!-- user entities -->
-  <!-- application name entities -->
-  <!ENTITY bibletime '<application>BibleTime</application>'>
-  <!ENTITY sword '<application>Sword</application>'>
-  <!ENTITY swordInstmgr '<application>Sword Installmgr</application>'>
-  <!ENTITY crosswire '<application>Crosswire Bible Society</application>'>
-
-  <!-- called file entities -->
-  <!ENTITY hdchap1 SYSTEM "help-first-startup.docbook">
-  <!ENTITY hdchap2 SYSTEM "help-first-time-search.docbook">
-  <!ENTITY hdchap3 SYSTEM "help-initbackend-failed.docbook">
-  <!ENTITY hdchap4 SYSTEM "help-module-encrypted.docbook">
-  <!ENTITY hdchap5 SYSTEM "help-sword-module-trouble.docbook">
-  <!ENTITY hdchap6 SYSTEM "help-no-mods-d.docbook">
-  <!ENTITY hdchap7 SYSTEM "help-no-modules.docbook">
-
-]>
-
-<book lang="&language;">
-
-<bookinfo>
-<title>The &bibletime; Help Dialog</title>
-
-<authorgroup>
-<author>
-<firstname>Fred</firstname>
-<othername></othername>
-<surname>Saalbach</surname>
-<affiliation>
-<address><email>info@bibletime.de</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>
-<holder>The team of &bibletime;, info@bibletime.de</holder>
-</copyright>
-
-<legalnotice>
-
-<para>The &bibletime; helpdialog 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>12/18/2001</date>
-<releaseinfo>1.01.00</releaseinfo>
-
-<abstract>
-<para>
-&bibletime; is an application to aid in study of the Bible.
-
-</para>
-</abstract>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>Bibletime</keyword>
-<keyword>Sword</keyword>
-<keyword>Crosswire Bible Society</keyword>
-<keyword>help dialog</keyword>
-</keywordset>
-
-</bookinfo>
-
-&hdchap1;
-&hdchap2;
-&hdchap3;
-&hdchap4;
-&hdchap5;
-&hdchap6;
-&hdchap7;
-
-</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/bibletime-doc/docs/en/howto/Makefile.am b/bibletime-doc/docs/en/howto/Makefile.am
deleted file mode 100644
index 17d7a2a..0000000
--- a/bibletime-doc/docs/en/howto/Makefile.am
+++ /dev/null
@@ -1,23 +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 = html unicode 
-
-pot-files:
-	for f in `ls unicode/*.docbook`; do \
-		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \
-		potfile=`echo $$potfile | sed s/unicode//`; \
-		echo "Calling xml2pot $$f > pot/$$potfile"; \
-		xml2pot $$f > pot/$$potfile; \
-		done;
-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/bibletime-doc/docs/en/howto/Makefile.in b/bibletime-doc/docs/en/howto/Makefile.in
deleted file mode 100644
index 0eca588..0000000
--- a/bibletime-doc/docs/en/howto/Makefile.in
+++ /dev/null
@@ -1,480 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = html unicode 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/howto/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/howto
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/howto/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-pot-files:
-	for f in `ls unicode/*.docbook`; do \
-		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \
-		potfile=`echo $$potfile | sed s/unicode//`; \
-		echo "Calling xml2pot $$f > pot/$$potfile"; \
-		xml2pot $$f > pot/$$potfile; \
-		done;
-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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/howto/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/howto/html/Makefile.am b/bibletime-doc/docs/en/howto/html/Makefile.am
deleted file mode 100644
index c5601ff..0000000
--- a/bibletime-doc/docs/en/howto/html/Makefile.am
+++ /dev/null
@@ -1,5 +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/bibletime-doc/docs/en/howto/html/Makefile.in b/bibletime-doc/docs/en/howto/html/Makefile.in
deleted file mode 100644
index a1cb458..0000000
--- a/bibletime-doc/docs/en/howto/html/Makefile.in
+++ /dev/null
@@ -1,364 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=h2-rules-context.html h2-importance.html h2-importance-exhortations.html h2-basics-interpretation.html h2-basics.html h2-importance-wars.html h2-basics-worksheet.html h2-rules.html h2-importance-liberates.html index.html h2-basics-expository.html h2-rules-normal.html h2-basics-approaches.html h2-importance-breathed.html h2-importance-once.html h2-basics-types.html h2-rules-parables.html h2-rules-hcontest.html h2-importance-supplement.html h2-importance-works.html 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/html/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/howto/html/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/howto/html
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/howto/html/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/howto/html/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/howto/html/h2-basics-approaches.html b/bibletime-doc/docs/en/howto/html/h2-basics-approaches.html
deleted file mode 100644
index 4099dee..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-basics-approaches.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<html>
-<head>
-<title>Approaches to God's Word</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-basics-approaches"></a><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">
-<a name="h2-basics-approaches-hear"></a><div class="titlepage"><div><h3 class="title">
-<a name="h2-basics-approaches-hear"></a>Hear </h3></div></div>
-<p>Lk.11:28 <i>&quot;blessed are those who hear the word of God, and
-observe it.&quot;</i>
-</p>
-</div>
-<div class="section">
-<a name="h2-basics-approaches-read"></a><div class="titlepage"><div><h3 class="title">
-<a name="h2-basics-approaches-read"></a>Read  </h3></div></div>
-<p>Rev.1:3
-<i>&quot;Blessed is he who reads and those who hear the words of this
-prophecy...&quot;</i>
-</p>
-<p>1 Tim.4:13 <i>&quot;give
-attention to the public reading of Scripture...&quot;</i>
-</p>
-</div>
-<div class="section">
-<a name="h2-basics-approaches-study"></a><div class="titlepage"><div><h3 class="title">
-<a name="h2-basics-approaches-study"></a>Study </h3></div></div>
-<p>Acts 17:11 <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>
-</p>
-<p>2 Tim.2:15 <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>
-</p>
-</div>
-<div class="section">
-<a name="h2-basics-approaches-memorize"></a><div class="titlepage"><div><h3 class="title">
-<a name="h2-basics-approaches-memorize"></a>Memorize </h3></div></div>
-<p>Ps.119:11 <i>&quot;Thy word I have hid in my heart, that I may not
-sin against Thee.&quot;</i>
-</p>
-</div>
-<div class="section">
-<a name="h2-basics-approaches-meditate"></a><div class="titlepage"><div><h3 class="title">
-<a name="h2-basics-approaches-meditate"></a>Meditate</h3></div></div>
-<p>Ps.1:2-3 <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>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-basics-expository.html b/bibletime-doc/docs/en/howto/html/h2-basics-expository.html
deleted file mode 100644
index 2ab3023..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-basics-expository.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<title>An Expository Study
-of Matthew 6:1-18</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-basics-expository"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-basics-interpretation.html b/bibletime-doc/docs/en/howto/html/h2-basics-interpretation.html
deleted file mode 100644
index 4a90666..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-basics-interpretation.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>Basics of Correct Interpretation</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-basics-interpretation"></a><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">
-<a name="h2-basics-interpretation-content"></a><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">
-<a name="h2-basics-interpretation-context"></a><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">
-<a name="h2-basics-interpretation-cross"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-basics-types.html b/bibletime-doc/docs/en/howto/html/h2-basics-types.html
deleted file mode 100644
index 6fa9a4c..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-basics-types.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<title>Types of Bible Studies</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-basics-types"></a><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">
-<a name="basics-types-topical"></a><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">
-<a name="h2-basics-types-character"></a><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">
-<a name="basics-types-expository"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-basics-worksheet.html b/bibletime-doc/docs/en/howto/html/h2-basics-worksheet.html
deleted file mode 100644
index da40963..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-basics-worksheet.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<html>
-<head>
-<title>Worksheet: How to Use a Concordance</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-basics-worksheet"></a><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">
-<a name="h2-basics-worksheet-select"></a><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>
-<a name="id2784811"></a>Pick out a key word or most-unusual word of the verse.</p></li>
-<li><p>
-<a name="id2784818"></a>Turn to this word alphabetically.</p></li>
-<li><p>
-<a name="id2784824"></a>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">
-<a name="h2-basics-worksheet-study"></a><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">
-<a name="h2-basics-worksheet-clarify"></a><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>
-<a name="id2722856"></a>Look up &quot;judge.&quot;</p></li>
-<li><p>
-<a name="id2722861"></a>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>
-<a name="id2722870"></a>Now look up &quot;judgeth.&quot;</p></li>
-<li><p>
-<a name="id2722876"></a>Go down the column to 1 Cor.2:15 . . . . . 350.</p></li>
-<li><p>
-<a name="id2722883"></a>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">
-<a name="h2-basics-worksheet-names"></a><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>
-<li><p>
-<a name="id2722921"></a>Nabal </p></li>
-<li><p>
-<a name="id2722926"></a>Abigail </p></li>
-<li><p>
-<a name="id2722932"></a>Joshua  </p></li>
-<li><p>
-<a name="id2722937"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-basics.html b/bibletime-doc/docs/en/howto/html/h2-basics.html
deleted file mode 100644
index 7685c18..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-basics.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<html>
-<head>
-<title>Chapter 2. Bible Study Basics</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-basics-purpose"></a><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<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>
-</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, <i>Christ the
-Controversialist</i>, 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-importance-breathed.html b/bibletime-doc/docs/en/howto/html/h2-importance-breathed.html
deleted file mode 100644
index aefa34a..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-importance-breathed.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html>
-<head>
-<title>A Book that God Breathed</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-importance-breathed"></a><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>
-<i>Heb.4:12 </i>&quot;<i>For the word of God is living and active...
-</i>&quot; Jesus said <i>(Mt.4:4),</i>
-&quot;<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>&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;<i>All scripture is inspired by God [lit.,
-God-breathed].</i>&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, <i>Christ the Controversialist</i>,
-InterVarsity Press 1978, pp.93-95 </span>
-</td>
-<td width="10%" valign="top">�</td>
-</tr>
-</table>
-<p>2 Tim.3:16 goes on, &quot;<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>&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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-importance-exhortations.html b/bibletime-doc/docs/en/howto/html/h2-importance-exhortations.html
deleted file mode 100644
index bdec1fe..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-importance-exhortations.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>Exhortations</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-importance-exhortations"></a><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;<i>Study to show thyself approved unto God, a workman that needeth not to be ashamed, rightly
-dividing the word of truth.</i>&quot;
-</p>
-<p>
-Col.3:16 &quot;<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>&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;<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>&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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-importance-liberates.html b/bibletime-doc/docs/en/howto/html/h2-importance-liberates.html
deleted file mode 100644
index 1df18ed..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-importance-liberates.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<title>A Book that Liberates</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-importance-liberates"></a><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;<i>and you shall know the truth, and the truth shall make you
-free.</i>&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;<i>If you abide in My word, then you are truly disciples of
-Mine... </i>&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 <i>violent wind.</i>
-&quot;<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>&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>
-<i>But Jesus answered and said to them, </i>&quot;<i>You are mistaken [KJV Ye do err], not
-understanding the Scriptures, or the power of God.</i>&quot;Mt.22:29</p>
-<p>What 2 things do we need to know to be kept from error?</p>
-<div class="itemizedlist"><ul>
-<li><p>
-<a name="id2722163"></a>God's word</p></li>
-<li><p>
-<a name="id2722169"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-importance-once.html b/bibletime-doc/docs/en/howto/html/h2-importance-once.html
deleted file mode 100644
index f81c190..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-importance-once.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<html>
-<head>
-<title>Appendix: &quot;Once for
-All&quot;</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-importance-once"></a><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;<i>Christ also died for sins once for all</i>&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, <i>Christ the Controversialist,</i>
-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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-importance-supplement.html b/bibletime-doc/docs/en/howto/html/h2-importance-supplement.html
deleted file mode 100644
index 4f34727..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-importance-supplement.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-<head>
-<title>Supplement: Bible Reading
-Programs</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-importance-supplement"></a><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>
-<a name="id2720907"></a>New Testament in a Year: read one chapter each day, 5 days a
-week.</p></li>
-<li><p>
-<a name="id2720914"></a>Proverbs in a Month: read one chapter of Proverbs each day,
-corresponding to the day of the month.</p></li>
-<li><p>
-<a name="id2720922"></a>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>
-<a name="id2720928"></a>Psalms &amp; Proverbs in 6 months: read through Psalms and Proverbs
-one chapter per day.</p></li>
-<li><p>
-<a name="id2720936"></a>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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-importance-wars.html b/bibletime-doc/docs/en/howto/html/h2-importance-wars.html
deleted file mode 100644
index f7a2199..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-importance-wars.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-<title>A Book that Wars</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-importance-wars"></a><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>
-<a name="id2722195"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-importance-works.html b/bibletime-doc/docs/en/howto/html/h2-importance-works.html
deleted file mode 100644
index 6c0ab05..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-importance-works.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<html>
-<head>
-<title>A Book that Works</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-importance-works"></a><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;<i>performs its work in you
-who believe.</i>&quot;  Beside each scripture, write down the work the Word
-performs.
-</p>
-<div class="table">
-<p>
-<a name="id2772116"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-importance.html b/bibletime-doc/docs/en/howto/html/h2-importance.html
deleted file mode 100644
index 415d03e..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-importance.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<html>
-<head>
-<title>Chapter 1. Importance of God's Word</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-importance-unique"></a><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>
-<li><p>
-<a name="id2785060"></a>
-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>
-<a name="id2785069"></a>
-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>
-<a name="id2785081"></a>
-preservation.  F. F. Bruce in <i>Are New Testament Documents Reliable?</i>
-compares New Testament manuscripts with other ancient texts:
-</p></li>
-</ul></div>
-<div class="table">
-<p>
-<a name="id2785096"></a><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 <i>Gallic War</i>
-</td>
-<td>50-58 B.C.</td>
-<td>900 A.D.</td>
-<td>950 years</td>
-<td>10
-</td>
-</tr>
-<tr>
-<td>Livy's <i>Roman History</i>
-</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 <i>Gallic War</i> 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 <i>Questions of Life</i> 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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-rules-context.html b/bibletime-doc/docs/en/howto/html/h2-rules-context.html
deleted file mode 100644
index 63db36c..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-rules-context.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<title>Rule 2 - Interpret within the biblical
-context</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-rules-context"></a><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">
-<a name="h2-rules-context-ex2a"></a><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 <i>&quot;born of water and the Spirit.&quot;</i>  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">
-<a name="h2-rules-context-ex2b"></a><div class="titlepage"><div><h3 class="title">
-<a name="h2-rules-context-ex2b"></a>Example 2B</h3></div></div>
-<p>1 Cor.14:34  <i>&quot;Let the women keep silent in the churches&quot;</i>  has to be taken within the biblical
-context of 1 Cor.11:5 <i>&quot;every woman...while praying or prophesying...&quot;</i>
-</p>
-</div>
-<div class="section">
-<a name="h2-rules-context-ex2c"></a><div class="titlepage"><div><h3 class="title">
-<a name="h2-rules-context-ex2c"></a>Example 2C</h3></div></div>
-<p>Acts 2:38 <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>  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 <i>&quot;For Christ did not send me to baptize, but to preach the gospel&quot;</i>?
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-rules-hcontest.html b/bibletime-doc/docs/en/howto/html/h2-rules-hcontest.html
deleted file mode 100644
index cd758c2..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-rules-hcontest.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
-<title>Rule 3 - Interpret within the historical and
-cultural context</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-rules-hcontest"></a><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">
-<a name="h2-rules-hcontest-ex3a"></a><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">
-<a name="h2-rules-hcontest-ex3b"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-rules-normal.html b/bibletime-doc/docs/en/howto/html/h2-rules-normal.html
deleted file mode 100644
index 1104f27..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-rules-normal.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
-<title>Rule 4 - Interpret according to the normal
-usage of words in language</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-rules-normal"></a><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">
-<a name="h2-rules-normal-ex4a"></a><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;<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>&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">
-<a name="h2-rules-normal-ex4b"></a><div class="titlepage"><div><h4 class="title">
-<a name="h2-rules-normal-ex4b"></a>Example 4B</h4></div></div>
-<p>Is.59:1 &quot;<i>The Lord's hand is not short;</i>&quot; Deut.33:27 &quot;<i>Underneath are the everlasting arms.</i>&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 <i>Kingdom of the Cults</i>)
-with an enumeration of verses like these.  Dr. Martin then asked the Mormons to read one more scripture:
-Ps.91:4 &quot;<i>He will cover you with His feathers; And under His wings shalt thou trust.</i>&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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-rules-parables.html b/bibletime-doc/docs/en/howto/html/h2-rules-parables.html
deleted file mode 100644
index 38f0a93..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-rules-parables.html
+++ /dev/null
@@ -1,70 +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="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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">
-<a name="h2-rules-parables"></a><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">
-<a name="h2-rules-parables-ex5a"></a><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">
-<a name="h2-rules-parables-ex5b"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/h2-rules.html b/bibletime-doc/docs/en/howto/html/h2-rules.html
deleted file mode 100644
index 88f914e..0000000
--- a/bibletime-doc/docs/en/howto/html/h2-rules.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<html>
-<head>
-<title>Chapter 3. Rules of Bible Interpretation (Hermeneutics)</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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 <i>&quot;Knowing this first, that no
-prophesy of scripture is of any private interpretation.&quot;</i>)  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 <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>
-</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">
-<a name="h2-rules-exact"></a><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">
-<a name="h2-rules-exact-definition"></a><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">
-<a name="h2-rules-exact-crossref"></a><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">
-<a name="h2-rules-exact-crossref-ex1a"></a><div class="titlepage"><div><h4 class="title">
-<a name="h2-rules-exact-crossref-ex1a"></a>Example 1A</h4></div></div>
-<p>Jn.20:17 <i>&quot;Touch me not&quot;</i> (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' <i>The Complete Word Study New Testament</i> (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><i>MARY IS ALREADY CLINGING TO JESUS, AND HE IS SAYING TO STOP HOLDING HIM!</i></p>
-</div>
-<div class="section">
-<a name="h2-rules-exact-crossref-ex1b"></a><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, <i>Elders are told to pray and anoint someone who is sick</i>.  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  <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>  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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/html/index.html b/bibletime-doc/docs/en/howto/html/index.html
deleted file mode 100644
index 0adcb90..0000000
--- a/bibletime-doc/docs/en/howto/html/index.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<html>
-<head>
-<title>The Biblestudy HowTo</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 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('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('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('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('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" id="id2722812">
-<div class="titlepage">
-<div><h1 class="title">
-<a name="id2722812"></a>The Biblestudy HowTo</h1></div>
-<div><h3 class="author">Bob Harman</h3></div>
-<div>Revision <span class="releaseinfo">1.01.00<br></span>
-</div>
-<div><p class="copyright">Copyright � 2001, 2002 The team of BibleTime, info@bibletime.de</p></div>
-<div><p class="copyright">Copyright � 2001, 2002 Bob Harman</p></div>
-<div><div class="legalnotice">
-<p>
-This 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:N_Cov_Church@compuserve.com">N_Cov_Church@compuserve.com</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>
-<a name="id2785700"></a><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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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/bibletime-doc/docs/en/howto/unicode/Makefile.am b/bibletime-doc/docs/en/howto/unicode/Makefile.am
deleted file mode 100644
index 300f0ce..0000000
--- a/bibletime-doc/docs/en/howto/unicode/Makefile.am
+++ /dev/null
@@ -1,31 +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 \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/howto; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/howto/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;\
-	fi;
-	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/bibletime-doc/docs/en/howto/unicode/Makefile.in b/bibletime-doc/docs/en/howto/unicode/Makefile.in
deleted file mode 100644
index 3c22d48..0000000
--- a/bibletime-doc/docs/en/howto/unicode/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/unicode/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/howto/unicode/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/howto/unicode
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/howto/unicode/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-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 \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/howto; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/howto/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;\
-	fi;
-	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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/howto/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/howto/unicode/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/howto/unicode/how2-interpretation.docbook b/bibletime-doc/docs/en/howto/unicode/how2-interpretation.docbook
deleted file mode 100644
index 0688a71..0000000
--- a/bibletime-doc/docs/en/howto/unicode/how2-interpretation.docbook
+++ /dev/null
@@ -1,197 +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/bibletime-doc/docs/en/howto/unicode/index.docbook b/bibletime-doc/docs/en/howto/unicode/index.docbook
deleted file mode 100644
index 056cbb6..0000000
--- a/bibletime-doc/docs/en/howto/unicode/index.docbook
+++ /dev/null
@@ -1,108 +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>
-<holder>The team of BibleTime, info@bibletime.de</holder>
-</copyright><copyright>
-<year>2001</year><year>2002</year>
-<holder>Bob Harman</holder>
-</copyright>
-
-<legalnotice><para>
-This 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>N_Cov_Church@compuserve.com</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:
--->
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bibletime-doc/docs/en/install/Makefile.am b/bibletime-doc/docs/en/install/Makefile.am
deleted file mode 100644
index 17d7a2a..0000000
--- a/bibletime-doc/docs/en/install/Makefile.am
+++ /dev/null
@@ -1,23 +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 = html unicode 
-
-pot-files:
-	for f in `ls unicode/*.docbook`; do \
-		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \
-		potfile=`echo $$potfile | sed s/unicode//`; \
-		echo "Calling xml2pot $$f > pot/$$potfile"; \
-		xml2pot $$f > pot/$$potfile; \
-		done;
-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/bibletime-doc/docs/en/install/Makefile.in b/bibletime-doc/docs/en/install/Makefile.in
deleted file mode 100644
index 4cbbfde..0000000
--- a/bibletime-doc/docs/en/install/Makefile.in
+++ /dev/null
@@ -1,480 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = html unicode 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/install/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/install
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/install/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-pot-files:
-	for f in `ls unicode/*.docbook`; do \
-		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \
-		potfile=`echo $$potfile | sed s/unicode//`; \
-		echo "Calling xml2pot $$f > pot/$$potfile"; \
-		xml2pot $$f > pot/$$potfile; \
-		done;
-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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/install/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/install/html/Makefile.am b/bibletime-doc/docs/en/install/html/Makefile.am
deleted file mode 100644
index 06213c2..0000000
--- a/bibletime-doc/docs/en/install/html/Makefile.am
+++ /dev/null
@@ -1,31 +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 = instmgr.png 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/install/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  instmgr.png; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/install; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/install/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/install/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  instmgr.png; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;
diff --git a/bibletime-doc/docs/en/install/html/Makefile.in b/bibletime-doc/docs/en/install/html/Makefile.in
deleted file mode 100644
index 87ccb9e..0000000
--- a/bibletime-doc/docs/en/install/html/Makefile.in
+++ /dev/null
@@ -1,390 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = instmgr.png 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=inst-user-source.html inst-preq.html instmgr-load.html installmgr.html inst-user.html inst-bin.html inst-user-troubleshooting.html installmgr-install.html instmgr-rep.html index.html inst-sources.html instmgr-cfg.html inst-preq-install.html inst-sources-bibletime.html 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/html/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/install/html/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/install/html
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/install/html/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/install/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  instmgr.png; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/install; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/install/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/install/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  instmgr.png; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/install/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/install/html/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/install/html/index.html b/bibletime-doc/docs/en/install/html/index.html
deleted file mode 100644
index 82ef062..0000000
--- a/bibletime-doc/docs/en/install/html/index.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<html>
-<head>
-<title>BibleTime Installation Guide</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="next" href="inst-bin.html" title="Chapter 1. BibleTime Program Files
-">
-</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>BibleTime Installation Guide</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-bin.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="book" id="id2785661">
-<div class="titlepage">
-<div><h1 class="title">
-<a name="id2785661"></a>BibleTime Installation Guide</h1></div>
-<div>
-<h3 class="author">Joachim Ansorg</h3>
-<h3 class="author">Fred  Saalbach</h3>
-<h3 class="author">Jeffrey Hoyt</h3>
-</div>
-<div>Revision <span class="releaseinfo">1.01.00<br></span>
-</div>
-<div><p class="copyright">Copyright � 1999, 2000, 2001 The team of BibleTime, info@bibletime.de</p></div>
-<div><div class="legalnotice">
-<p>The bibletime installation guide 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" id="id2785789">
-<a name="id2785789"></a><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="inst-bin.html">BibleTime Program Files
-</a>
-</dt>
-<dt>2 <a href="inst-preq.html">BibleTime Prerequisites
-</a>
-</dt>
-<dd><dl><dt> <a href="inst-preq.html#devl-10"> Requirements for BibleTime 1.1</a>
-</dt></dl></dd>
-<dt>3 <a href="inst-sources.html">Installing BibleTime Sources</a>
-</dt>
-<dd><dl>
-<dt> <a href="inst-sources.html#inst-sources-sword">Installation of Sword and the Sword
-Modules </a>
-</dt>
-<dd><dl>
-<dt> <a href="inst-sources.html#inst-sources-sword-install">Installation of SWORD
-</a>
-</dt>
-<dt> <a href="inst-sources.html#inst-sources-sword-modules">Installation of modules</a>
-</dt>
-</dl></dd>
-</dl></dd>
-<dt>4 <a href="inst-user.html">Installation of BibleTime</a>
-</dt>
-<dd><dl>
-<dt> <a href="inst-user.html#inst-user-RPM">RPM Installation</a>
-</dt>
-<dt> <a href="inst-user-source.html">Source</a>
-</dt>
-<dt> <a href="inst-user-troubleshooting.html">Troubleshooting</a>
-</dt>
-</dl></dd>
-<dt>5 <a href="installmgr.html">How to install and use Sword Installmgr</a>
-</dt>
-<dd><dl>
-<dt> <a href="installmgr.html#installmgr-req"> Requirements for Sword Installmgr</a>
-</dt>
-<dt> <a href="installmgr-install.html">Sword Installmgr</a>
-</dt>
-<dt> <a href="instmgr-rep.html">Setting up your repository</a>
-</dt>
-<dt> <a href="instmgr-cfg.html">Setting up the Sword configuration file.</a>
-</dt>
-<dt> <a href="instmgr-load.html">Using Sword Installmgr to load sword modules.</a>
-</dt>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-bin.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">�</td>
-<td width="34%" align="center">�</td>
-<td width="33%" align="right">�BibleTime Program Files
-</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/inst-bin.html b/bibletime-doc/docs/en/install/html/inst-bin.html
deleted file mode 100644
index 8bcd8a8..0000000
--- a/bibletime-doc/docs/en/install/html/inst-bin.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<html>
-<head>
-<title>Chapter 1. BibleTime Program Files
-</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="index.html" title="BibleTime Installation Guide">
-<link rel="previous" href="index.html" title="BibleTime Installation Guide">
-<link rel="next" href="inst-preq.html" title="Chapter 2. BibleTime Prerequisites
-">
-</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>BibleTime Program Files
-</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-preq.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="inst-bin"></a>Chapter 1. BibleTime Program Files
-</h2></div></div>
-<p>Program files are provided in the following formats.</p>
-<div class="table">
-<p>
-<a name="id2784946"></a><b>Table 1.1. BibleTime Distribution Formats</b>
-</p>
-<table summary="BibleTime Distribution Formats" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Format name</th>
-<th>Description</th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-RPM Packages.
-</td>
-<td>
-See the <a href="http://sourceforge.net/projects/bibletime" target="_top">sourceforge BibleTime</a>
-home page for the distributions supported.
-RPM packages are installed using any package manager or the RPM command line.
-RPM Installation instructions are <a href="inst-user.html#inst-user-RPM" title="RPM Installation">here</a>.
-</td>
-</tr>
-<tr>
-<td>
-Source code.
-</td>
-<td>
-The source code can be installed on any distribution meeting the installation prerequisites.
-The source code should compile on non Intel&#8482; platforms, and most UNIX� meeting the prerequisites.
-Instructions for installation from sourcecode are <a href="inst-user-source.html" title="Source">here</a>.
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<p>
-Language modules which contain the BibleTime handbook, Bible Study HowTo, Installation Instructions,
-and the Help Dialog are provided seperately in RPM, and as tarball sources.  The language modules contain
-the documents in both HTML and XML&#8482; Docbook format, so they can be viewed without the main BibleTime package.</p>
-<p>Language modules are installed in the same way as the program modules</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-preq.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">BibleTime Installation Guide�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�BibleTime Prerequisites
-</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/inst-preq-install.html b/bibletime-doc/docs/en/install/html/inst-preq-install.html
deleted file mode 100644
index 9edc9a9..0000000
--- a/bibletime-doc/docs/en/install/html/inst-preq-install.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
-<title>Installation of prerequisite programs</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="Bibletime Installation Guide for Bibletime version 1.1">
-<link rel="up" href="inst-preq.html" title="Chapter 2. Bibletime Prerequisites
-">
-<link rel="previous" href="inst-preq.html" title="Chapter 2. Bibletime Prerequisites
-">
-<link rel="next" href="inst-sources.html" title="Chapter 3. Installing Bibletime Sources">
-</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>Installation of prerequisite programs</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-preq.html">Prev</a></td>
-<td align="center" class="center">Bibletime Prerequisites
-</td>
-<td align="right" class="right"><a accesskey="n" href="inst-sources.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="inst-preq-install"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="inst-preq-install"></a>Installation of prerequisite programs</h2></div></div>
-<p>Now download the prerequisites and compile the libraries</p>
-<p>First you have to compile the QT 2.2.2 or QT 2.2.3 sources. I assume the
-user has his QT sources in <tt>/usr/lib/qt2</tt>, his KDE2 sources
-in <tt>/usr/src/kde2/kdelibs</tt> and his KDE2 directory is
-<tt>/usr/local/kde2</tt>, if you don't like it use your own settings
-for this.</p>
-<pre class="screen">
-export QTDIR=/usr/lib/qt-2.2.2
-cd $QTDIR
-./configure -sm -system-libpng -system-jpeg
-make
-</pre>
-<p>
-If you have enough RAM and a fast computer you can speedup the compile process
-by adding <span class="command"><b>&quot;-j2&quot;</b></span> to the make options. For example
-<span class="command"><b>&quot;make -j2&quot;</b></span>. If you have a slow computer with little RAM
-exit X windows and run make from a terminal to speed up the process.  After the
-compiling process is finished you have to compile your KDE2 stuff. Please do
-something like this:</p>
-<pre class="screen">
-export QTDIR=/usr/lib/qt-2.2.2
-export KDEDIR=/usr/local/kde2
-cd /usr/src/kde2/kdelibs
-./configure
-make
-make install
-</pre>
-<p>The compilation of QT and KDE should finish without problems or errors.
-It's possible to add <span class="command"><b>&quot;-j2&quot;</b></span> again to speed up the compiling
-process if you have enough RAM and a fast PC.</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-preq.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="inst-sources.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Bibletime Prerequisites
-�</td>
-<td width="34%" align="center"><a href="inst-preq.html">Up</a></td>
-<td width="33%" align="right">�Installing Bibletime Sources</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/inst-preq.html b/bibletime-doc/docs/en/install/html/inst-preq.html
deleted file mode 100644
index 7d694bc..0000000
--- a/bibletime-doc/docs/en/install/html/inst-preq.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<html>
-<head>
-<title>Chapter 2. BibleTime Prerequisites
-</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="index.html" title="BibleTime Installation Guide">
-<link rel="previous" href="inst-bin.html" title="Chapter 1. BibleTime Program Files
-">
-<link rel="next" href="inst-sources.html" title="Chapter 3. Installing BibleTime Sources">
-</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>BibleTime Prerequisites
-</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-bin.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="inst-sources.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="inst-preq"></a>Chapter 2. BibleTime Prerequisites
-</h2></div></div>
-<div class="section">
-<a name="devl-10"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="devl-10"></a> Requirements for BibleTime 1.1</h2></div></div>
-<p>
-All of the packages required for BibleTime to compile are included in the major
-Linux� distributions. It is also possible to compile BibleTime on most other UNIX�
-distributions.  If you encounter compile errors, please read the messages, they
-should lead you to missing packages which you will probably find on your
-installation disks. </p>
-<p> The following table contains the minimum requirements for BibleTime
-binaries to run, or for the source version to compile.</p>
-<div class="table">
-<p>
-<a name="id2785166"></a><b>Table 2.1. 
-Packages required for installation of BibleTime 1.1
-</b>
-</p>
-<table summary="
-Packages required for installation of BibleTime 1.1
-" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Package</th>
-<th>Location</th>
-</tr></thead>
-<tbody>
-<tr>
-<td>Qt&#8482; 2.2.x
-</td>
-<td><a href="http://www.trolltech.com" target="_top"> http://www.trolltech.com</a></td>
-</tr>
-<tr>
-<td>KDE 2.x (at least the libraries)
-</td>
-<td><a href="http://www.kde.org" target="_top"> http://www.kde.org</a></td>
-</tr>
-<tr>
-<td>Sword 1.5.3
-</td>
-<td><a href="ftp://ftp.crosswire/pub/sword/source" target="_top">
-ftp://ftp.crosswire/pub/sword/source</a></td>
-</tr>
-</tbody>
-</table>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-bin.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="inst-sources.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">BibleTime Program Files
-�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�Installing BibleTime Sources</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/inst-sources-bibletime.html b/bibletime-doc/docs/en/install/html/inst-sources-bibletime.html
deleted file mode 100644
index fec9822..0000000
--- a/bibletime-doc/docs/en/install/html/inst-sources-bibletime.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-<title>Installing the Bibletime Source</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="Bibletime Installation Guide for Bibletime version 1.1">
-<link rel="up" href="inst-sources.html" title="Chapter 3. Installing Bibletime Sources">
-<link rel="previous" href="inst-sources.html" title="Chapter 3. Installing Bibletime Sources">
-<link rel="next" href="inst-sources-compiler-notes.html" title="Compiler notes">
-</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>Installing the Bibletime Source</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-sources.html">Prev</a></td>
-<td align="center" class="center">Installing Bibletime Sources</td>
-<td align="right" class="right"><a accesskey="n" href="inst-sources-compiler-notes.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="inst-sources-bibletime"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="inst-sources-bibletime"></a>Installing the Bibletime Source</h2></div></div>
-<p>
-First you have to unpack the downloaded .tar.gz file (if you are using the CVS
-version, your sources will already be unpacked, so skip this step) to a
-temporary directory. Do something like this: </p>
-<pre class="screen">
-mkdir /tmp
-cd /tmp
-tar -xzf bibletime.tar.gz
-cd /tmp/bibletime
-</pre>
-<p>
-(the tar file will have unpacked into a directory named something similar to
-bibletime) </p>
-<p>
-Now open a terminal and execute the following commands to compile the
-sources.
-</p>
-<pre class="screen">
-$ su
-$ password *****
-$ cd ./Develop/bibletime-2         # Path of source code
-$ export QTDIR=/usr/lib/qt-2.2.2   # QT 2.2.x source directory&gt;
-$ export KDEDIR=/usr/local/kde2    # KDE2 directory (where KDE2 is installed)
-$ make -f Makefile.cvs             # configure for CVS version
-$ ./configure                      # create makefiles
-$ make                             # compile BibleTime
-$ make install                     # install BibleTime
-</pre>
-<p>Path to QTDIR and KDE2 may be different on your computer.</p>
-<p>Now open a terminal as a normal user and type
-<span class="command"><b>/usr/local/kde2/bin/bibletime</b></span> (if this is in your PATH, you
-can type bibletime).  Bibletime will start. </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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-sources.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="inst-sources-compiler-notes.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Installing Bibletime Sources�</td>
-<td width="34%" align="center"><a href="inst-sources.html">Up</a></td>
-<td width="33%" align="right">�Compiler notes</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/inst-sources.html b/bibletime-doc/docs/en/install/html/inst-sources.html
deleted file mode 100644
index f125170..0000000
--- a/bibletime-doc/docs/en/install/html/inst-sources.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<html>
-<head>
-<title>Chapter 3. Installing BibleTime Sources</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="index.html" title="BibleTime Installation Guide">
-<link rel="previous" href="inst-preq.html" title="Chapter 2. BibleTime Prerequisites
-">
-<link rel="next" href="inst-user.html" title="Chapter 4. Installation of 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>Installing BibleTime Sources</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-preq.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="inst-user.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="inst-sources"></a>Chapter 3. Installing BibleTime Sources</h2></div></div>
-<p>
-This chapter describes how sources are compiled.  These steps apply for both the
-development version and the released version of BibleTime and Sword. </p>
-<div class="section">
-<a name="inst-sources-sword"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="inst-sources-sword"></a>Installation of Sword and the Sword
-Modules </h2></div></div>
-<p>
-Sword and Sword modules are the <i>book library</i> for BibleTime.
-Please see the page download for further information about downloading BibleTime.
-</p>
-<p>
-Have a look at the requirements page to obtain Sword. See page links to
-obtain Sword's modules.</p>
-<div class="section">
-<a name="inst-sources-sword-install"></a><div class="titlepage"><div><h3 class="title">
-<a name="inst-sources-sword-install"></a>Installation of SWORD
-</h3></div></div>
-<p>
-This page shows Sword 1.5.1a.  For other versions of Sword, the file names
-will be different.</p>
-<p>
-First you have to unpack the downloaded .tar.gz file (if you are using the CVS
-version, your sources will already be unpacked, so skip this step) to a
-temporary directory. Do something like this: </p>
-<pre class="screen">
-mkdir /tmp
-cd /tmp
-tar -xzf sword-1.5.1a.tar.gz
-cd /tmp/sword-1.5.1a
-</pre>
-<p>
-(the tar file will have unpacked into a directory named something similar to
-sword-1.5.1a) </p>
-<p>
-Before you try to compile Sword, you may need to modify
-<tt> Makefile.cfg</tt> (it is located in the top directory of the
-unpacked sources).  The customized section of <tt>Makefile.cfg</tt>
-is marked, do not try to change parts of the file outside of the area marked
-<i>##### Customizable stuff. Set it how you like it #####</i>
-unless you really know what you are doing. </p>
-<p>
-For many installations the defaults will work.  When the defaults don't work,
-these switches may be set.</p>
-<div class="table">
-<p>
-<a name="id2723181"></a><b>Table 3.1. Sword Makefile.cfg switches</b>
-</p>
-<table summary="Sword Makefile.cfg switches" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Switch</th>
-<th>Description</th>
-</tr></thead>
-<tbody>
-<tr>
-<td># compiler</td>
-<td>If you have gcc leave this alone, otherwise enter the compiler
-you will be using.</td>
-</tr>
-<tr>
-<td># shared library-</td>
-<td>Set to 'yes'.  this causes the shared library
-<tt>libsord.so</tt> to be generated.  An entry must be placed into
-the file <tt>/etc/ld.so.conf</tt> that points to libsword.
-<tt>/usr/local/sword/lib</tt> is typical.  The shared
-library is necessary for BibleTime to work, but Sword will compile without
-errors if you don't do this.  Be careful here. </td>
-</tr>
-<tr>
-<td># VCL library-</td>
-<td>Use the default 'no' unless you are using the Sword install
-manager, then use 'yes'.</td>
-</tr>
-<tr>
-<td># Debugging options etc...</td>
-<td>The defaults should work.</td>
-</tr>
-<tr>
-<td># endian, etc. support for other hardware</td>
-<td>Use the default if compiling on an Intel.  If you have other
-hardware, select the correct entry.</td>
-</tr>
-<tr>
-<td># zLib support</td>
-<td>Use the default 'yes'</td>
-</tr>
-<tr>
-<td># paths</td>
-<td>The defaults are OK for most distributions, don't change them unless you know what you are doing.
-
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<p>Now start compiling.</p>
-<pre class="screen">
-make
-su
-make install
-make configure
-</pre>
-<p>
-In the event that make command reports an error on completion, it probably
-indicates that you are missing a package.  For example:</p>
-<pre class="screen">
-bash-2.03# make
-make just-pre nodeps=yes
-make[1]: Entering directory `/bible/sword-1.5.1a'
-make -C src just-pre
-.
-.
-.
-make[1]: Entering directory `/bible/sword-1.5.1a/include'
-make[1]: Nothing to be done for `just-targets'.
-make[1]: Leaving directory `/bible/sword-1.5.1a/include'
-make -C apps/X11/VCL just-targets
-make[1]: Entering directory `/bible/sword-1.5.1a/apps/X11/VCL'
-gcc -I../../../include/ -D_GNU_SOURCE -I. `gtk-config --cflags` -static -pipe -Wall -Wno-format
--fomit-frame-pointer -ggdb -O0 -m486 -c -o TWinControl.o TWinControl.cpp
-<i>/bin/sh: gtk-config: command not found </i>
-In file included from TWinControl.cpp:1:
-<i>TWinControl.h:6: gtk/gtkwidget.h: No such file or directory</i>
-<i>TWinControl.cpp:3: gtk/gtkwidget.h: No such file or directory </i>
-In file included from TWinControl.cpp:1:
-TWinControl.h:281: syntax error before `*'
-TWinControl.h:284: parse error before `*'
-TWinControl.cpp:10: parse error before `*'
-make[1]: *** [TWinControl.o] Error 1
-make[1]: Leaving directory `/bible/sword-1.5.1a/apps/X11/VCL'
-make: *** [apps/X11/VCL/targets] Error 2
-bash-2.03#
-</pre>
-<p>The italic lines above indicate that a gtk application was missing.  A
-review of the available packages showed that one of the gtk packages
-supplied with SuSE is gtkdev.  This turns out to be the application required to
-allow make to run to completion without errors.  Often missing packages
-will be found on your installation disks, or on your distribution's website.
-Once <span class="command"><b>make</b></span> runs to completion without errors, then
-<span class="command"><b>make install</b></span>. If it still doesn't work, edit the
-file <tt>Makefile.cfg</tt> in the top directory of the SWORD sources
-and change the line <span class="command"><b>buildvcl := yes</b></span> to <span class="command"><b>buildvcl
-:= no</b></span> and try again.
-</p>
-</div>
-<div class="section">
-<a name="inst-sources-sword-modules"></a><div class="titlepage"><div><h3 class="title">
-<a name="inst-sources-sword-modules"></a>Installation of modules</h3></div></div>
-<p>Sword currently supports 3 types of modules: Bibles, dictionaries and
-commentaries.  In order for Sword and BibleTime to be useful these modules must be installed.
-</p>
-<p>
-Sword modules can be installed <a href="inst-sources.html#inst-sources-sword-modules" title="Installation of modules">manually</a> or with
-Sword Installmgr.
-Sword Installmgr is provided as part of the Sword package.  The directions for compiling and installing
-Sword Installmgr can be found in the section
-<a href="installmgr.html" title="Chapter 5. How to install and use Sword Installmgr">How to install and use Sword Installmgr</a>
-or in the Sword source at <tt>/sword/apps/X11/InstallMgr/INSTALL</tt>.</p>
-<div class="section">
-<a name="inst-sources-sword-modules-dir"></a><div class="titlepage"><div><h4 class="title">
-<a name="inst-sources-sword-modules-dir"></a>Choose a Sword directory</h4></div></div>
-<p>
-Sword currently supports 3 types of modules: Bibles, dictionaries and
-commentaries. You have to install the files of the modules their own directory.
-You must decide which directory will be your Sword directory. If you installed
-the libs and includes in an extra directory use that directory as your Sword
-directory (e.g. <tt>/usr/local/sword/</tt>). If you installed the
-library and include files in a common place like
-<tt>/usr/local/</tt> please select another location for your Sword
-directory. </p>
-</div>
-<div class="section">
-<a name="inst-sources-sword-modules-upack"></a><div class="titlepage"><div><h4 class="title">
-<a name="inst-sources-sword-modules-upack"></a>
-Unpack the downloaded package</h4></div></div>
-<p>
-First you have to unpack the downloaded package. On the download page of Sword
-you can choose if you want to get a Windows� or RAW package. If you have a &quot;Linux�
-only&quot; box please get the RAW packages. But if you accidentally get a Windows�
-self extracting executable try using WINE to extract the files. Perhaps you have
-to change the filename of <tt>_INSTALL.1</tt> to
-<tt>_install.1</tt> to get the setup running.
-</p>
-</div>
-<div class="section">
-<a name="inst-sources-sword-modules-config"></a><div class="titlepage"><div><h4 class="title">
-<a name="inst-sources-sword-modules-config"></a>
-Integrating modules</h4></div></div>
-<p>
-Create the directory <tt>mods.d</tt> inside of your Sword directory.
-Please copy the file <tt>[modulename].conf</tt> into the
-<tt>mods.d</tt> directory. the <tt>.conf</tt> file is
-normally inside the unpacked module files. Now move the whole dir <tt>/modules</tt>
-which contains your unpacked module data files to the Sword directory.  In the
-example <tt>/usr/local/sword/share</tt> is the SWORD directory.</p>
-<p> Directory Structure looks like this:
-</p>
-<pre class="screen">
-/usr/local/sword/share/ -|- mods.d/ -|- module_1_name.conf
-                         |           |- module_2_name.conf
-                         |
-                         |- texts/rawtext/ -|-module_1_name/files
-                                            |-module_2_name/files
-</pre>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-preq.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="inst-user.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">BibleTime Prerequisites
-�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�Installation of BibleTime</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/inst-user-source.html b/bibletime-doc/docs/en/install/html/inst-user-source.html
deleted file mode 100644
index 6321468..0000000
--- a/bibletime-doc/docs/en/install/html/inst-user-source.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<title>Source</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="inst-user.html" title="Chapter 4. Installation of BibleTime">
-<link rel="previous" href="inst-user.html" title="Chapter 4. Installation of BibleTime">
-<link rel="next" href="inst-user-troubleshooting.html" title="Troubleshooting">
-</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>Source</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-user.html">Prev</a></td>
-<td align="center" class="center">Installation of BibleTime</td>
-<td align="right" class="right"><a accesskey="n" href="inst-user-troubleshooting.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="inst-user-source"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="inst-user-source"></a>Source</h2></div></div>
-<p>
-Source tarballs need to be uncompressed (Archiver or similar).  Then try:
-
-<pre class="screen">
-export QTDIR=/usr/lib
-export KDEDIR=/usr
-export PATH=$KDEDIR/bin:$PATH
-./configure				# create makefiles
-make					# compile BibleTime
-make install				# install BibleTime
-</pre>
-The location QTDIR is the directory contining the Qt&#8482; 2 directory.
-The location KDEDIR is the folder containing the /bin directory containing the KDE executables.
-The above locations apply to Mandrake&#8482;.  Your distribution may require different locations.
-</p>
-<p>
-Additional information can be found in the sourcecode at
-<tt>bibletime/INSTALL</tt>.
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-user.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="inst-user-troubleshooting.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Installation of BibleTime�</td>
-<td width="34%" align="center"><a href="inst-user.html">Up</a></td>
-<td width="33%" align="right">�Troubleshooting</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/inst-user-troubleshooting.html b/bibletime-doc/docs/en/install/html/inst-user-troubleshooting.html
deleted file mode 100644
index 11dc06f..0000000
--- a/bibletime-doc/docs/en/install/html/inst-user-troubleshooting.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-<head>
-<title>Troubleshooting</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="inst-user.html" title="Chapter 4. Installation of BibleTime">
-<link rel="previous" href="inst-user-source.html" title="Source">
-<link rel="next" href="installmgr.html" title="Chapter 5. How to install and use Sword Installmgr">
-</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>Troubleshooting</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-user-source.html">Prev</a></td>
-<td align="center" class="center">Installation of BibleTime</td>
-<td align="right" class="right"><a accesskey="n" href="installmgr.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="inst-user-troubleshooting"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="inst-user-troubleshooting"></a>Troubleshooting</h2></div></div>
-<p>
-<a href="http://www.bibletime.de/" target="_top">www.bibletime.de</a> has all the
-answers. Please look there.  :-)
-</p>
-<p>
-Don't forget to read the FAQ and the installation instructions on
-www.bibletime.de. If you downloaded the sourcecode please do also read the file
-README and INSTALL included in the sourcecode package.
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-user-source.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="installmgr.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Source�</td>
-<td width="34%" align="center"><a href="inst-user.html">Up</a></td>
-<td width="33%" align="right">�How to install and use Sword Installmgr</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/inst-user.html b/bibletime-doc/docs/en/install/html/inst-user.html
deleted file mode 100644
index acfc0f1..0000000
--- a/bibletime-doc/docs/en/install/html/inst-user.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-<head>
-<title>Chapter 4. Installation of BibleTime</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="index.html" title="BibleTime Installation Guide">
-<link rel="previous" href="inst-sources.html" title="Chapter 3. Installing BibleTime Sources">
-<link rel="next" href="inst-user-source.html" title="Source">
-</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>Installation of BibleTime</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-sources.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="inst-user-source.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="inst-user"></a>Chapter 4. Installation of BibleTime</h2></div></div>
-<div class="section">
-<a name="inst-user-RPM"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="inst-user-RPM"></a>RPM Installation</h2></div></div>
-<p>
-If you are installing BibleTime RPM, just open your package manager (rpm, KPackage, or similar)
-and install in the normal way.
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-sources.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="inst-user-source.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Installing BibleTime Sources�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�Source</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/installmgr-install.html b/bibletime-doc/docs/en/install/html/installmgr-install.html
deleted file mode 100644
index d9101a3..0000000
--- a/bibletime-doc/docs/en/install/html/installmgr-install.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<html>
-<head>
-<title>Sword Installmgr</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="installmgr.html" title="Chapter 5. How to install and use Sword Installmgr">
-<link rel="previous" href="installmgr.html" title="Chapter 5. How to install and use Sword Installmgr">
-<link rel="next" href="instmgr-rep.html" title="Setting up your repository">
-</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 Installmgr</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="installmgr.html">Prev</a></td>
-<td align="center" class="center">How to install and use Sword Installmgr</td>
-<td align="right" class="right"><a accesskey="n" href="instmgr-rep.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="installmgr-install"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="installmgr-install"></a>Sword Installmgr</h2></div></div>
-<p>To compile Sword Installmgr first Sword must have been compiled.
-	<a href="inst-sources.html#inst-sources-sword-install" title="Installation of SWORD
-">See the instructions for
-	Sword</a>.
-	</p>
-<p>Find the file <tt> libsword.so</tt>, Sword probably installed it to
-	<tt>/usr/local/sword/lib</tt> unless you customized the installation.
-	</p>
-<p>
-	In order that Sword Installmgr (and also BibleTime) can find this shared library
-	open a text editor and add <tt>/usr/local/sword/lib</tt> to the
-	end of <tt>/etc/ld.so.conf</tt>.
-	</p>
-<p>
-	Now you are ready to compile Sword Installmgr.
-	</p>
-<p>
-	CD to your Sword source and open the directory
-	<tt>.../sword/apps/X11/InstallMgr</tt>.
-	Now in a shell do:
-	</p>
-<pre class="screen">
-	ldconfig
-	./configure
-	make
-	su
-	make install
-	</pre>
-<p>
-	Now in a shell as root (su) you can run installmgr by typing
-	<tt>/usr/local/bin/installmgr</tt>.
-	</p>
-<p>
-	If this was successful, there are two options for loading
-	text modules into Sword.
-	</p>
-<div class="itemizedlist"><ul>
-<li><p>
-<a name="id2783852"></a>
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Options</span> -&gt; <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Manage remote sources</span> -- Connect to Crosswire by modem and download
-	sword documents and modules from the crosswire repository.  This is a feature that has not yet been ported to
-	Linux� and UNIX�.
-	</p></li>
-<li><p>
-<a name="id2783886"></a>
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Options</span> -&gt; <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Local Path</span> -- If you have unzipped sources, point this to your local
-	module repository.  The local repository may be on a local or networked hard drive, or
-	the Sword CD mounted on a local or networked CD ROM drive.
-	All of the available modules will be displayed, and
-	may now be installed.
-	</p></li>
-</ul></div>
-<p>
-	Sword CD's can be obtained from the
-	<a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a>
-	</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="installmgr.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="instmgr-rep.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">How to install and use Sword Installmgr�</td>
-<td width="34%" align="center"><a href="installmgr.html">Up</a></td>
-<td width="33%" align="right">�Setting up your repository</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/installmgr.html b/bibletime-doc/docs/en/install/html/installmgr.html
deleted file mode 100644
index dc07129..0000000
--- a/bibletime-doc/docs/en/install/html/installmgr.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<html>
-<head>
-<title>Chapter 5. How to install and use Sword Installmgr</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="index.html" title="BibleTime Installation Guide">
-<link rel="previous" href="inst-user-troubleshooting.html" title="Troubleshooting">
-<link rel="next" href="installmgr-install.html" title="Sword Installmgr">
-</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>How to install and use Sword Installmgr</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="inst-user-troubleshooting.html">Prev</a></td>
-<td align="center" class="center">�</td>
-<td align="right" class="right"><a accesskey="n" href="installmgr-install.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="chapter">
-<div class="titlepage"><div><h2 class="title">
-<a name="installmgr"></a>Chapter 5. How to install and use Sword Installmgr</h2></div></div>
-<p>Sword Installmgr is not provided with the BibleTime .rpm.  You need to download the
-source tarball from the <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a>.
-A precompiled copy of Sword Installmgr is included on the Sword CD which can be obtained
-from the <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a>
-</p>
-<div class="section">
-<a name="installmgr-req"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="installmgr-req"></a> Requirements for Sword Installmgr</h2></div></div>
-<p>
-	All of the packages required for Sword Installmgr to compile are included in the major
-	Linux� distributions. It is also possible to compile Sword Installmgr on most UNIX�
-	distributions.  If you encounter compile errors, please read the messages, they
-	should lead you to missing packages which you will probably find on your
-	installation disks. </p>
-<p> The following table contains the minimum requirements for Sword Installmgr
-	binaries to run, or for the source version to compile.</p>
-<div class="table">
-<p>
-<a name="id2783630"></a><b>Table 5.0. 
-	Packages required for Sword Installmgr
-	</b>
-</p>
-<table summary="
-	Packages required for Sword Installmgr
-	" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Package</th>
-<th>Location</th>
-</tr></thead>
-<tbody>
-<tr>
-<td>Sword</td>
-<td>
-	Use the version provided with your copy of Sword.  Must be configured
-	(in the file ~/sword/Makefile.cfg) with the VCL libraries = yes
-	</td>
-</tr>
-<tr>
-<td>
-	GTK
-	</td>
-<td>
-	If you are compiling Sword Installmgr, any version of GTK should work.
-	</td>
-</tr>
-</tbody>
-</table>
-</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="inst-user-troubleshooting.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="installmgr-install.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Troubleshooting�</td>
-<td width="34%" align="center"><a href="index.html">Up</a></td>
-<td width="33%" align="right">�Sword Installmgr</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/instmgr-cfg.html b/bibletime-doc/docs/en/install/html/instmgr-cfg.html
deleted file mode 100644
index feeb866..0000000
--- a/bibletime-doc/docs/en/install/html/instmgr-cfg.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<head>
-<title>Setting up the Sword configuration file.</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="installmgr.html" title="Chapter 5. How to install and use Sword Installmgr">
-<link rel="previous" href="instmgr-rep.html" title="Setting up your repository">
-<link rel="next" href="instmgr-load.html" title="Using Sword Installmgr to load sword modules.">
-</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>Setting up the Sword configuration file.</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="instmgr-rep.html">Prev</a></td>
-<td align="center" class="center">How to install and use Sword Installmgr</td>
-<td align="right" class="right"><a accesskey="n" href="instmgr-load.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="instmgr-cfg"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="instmgr-cfg"></a>Setting up the Sword configuration file.</h2></div></div>
-<p>
-	Instructions for the Sword configuration file can be found in the section
-	<a href="inst-sources.html#inst-sources-sword-modules-config" title="
-Integrating modules">&quot;The Sword configuration
-	file&quot;</a> which covers the manual installation of the Sword modules.
-	</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="instmgr-rep.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="instmgr-load.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Setting up your repository�</td>
-<td width="34%" align="center"><a href="installmgr.html">Up</a></td>
-<td width="33%" align="right">�Using Sword Installmgr to load sword modules.</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/instmgr-load.html b/bibletime-doc/docs/en/install/html/instmgr-load.html
deleted file mode 100644
index 66aa000..0000000
--- a/bibletime-doc/docs/en/install/html/instmgr-load.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<title>Using Sword Installmgr to load sword modules.</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="installmgr.html" title="Chapter 5. How to install and use Sword Installmgr">
-<link rel="previous" href="instmgr-cfg.html" title="Setting up the Sword configuration file.">
-</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>Using Sword Installmgr to load sword modules.</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="instmgr-cfg.html">Prev</a></td>
-<td align="center" class="center">How to install and use Sword Installmgr</td>
-<td align="right" class="right"></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="instmgr-load"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="instmgr-load"></a>Using Sword Installmgr to load sword modules.</h2></div></div>
-<p>
-	You must start Sword Installmgr as root for it to be able to load modules.
-	Start it with these commands:
-	</p>
-<pre class="screen">
-	[me@localhost user]$ su
-	Password:
-	[root@localhost user]# /usr/local/bin/installmgr
-	</pre>
-<p>
-	You will now see the installmgr window.  You will need to use
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">options&gt;local path</span> to point to your local module repository.
-	</p>
-<p>
-	Now the available modules will be shown on the left pane and
-	the installed modules on the right.  All you need to do is
-	select modules in the left pane and click install to make them
-	available to Sword and BibleTime.
-	<div class="mediaobject"><img src="instmgr.png" alt="Sword Installmgr screenshot"></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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="instmgr-cfg.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">Setting up the Sword configuration file.�</td>
-<td width="34%" align="center"><a href="installmgr.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/bibletime-doc/docs/en/install/html/instmgr-rep.html b/bibletime-doc/docs/en/install/html/instmgr-rep.html
deleted file mode 100644
index 004e1e7..0000000
--- a/bibletime-doc/docs/en/install/html/instmgr-rep.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<html>
-<head>
-<title>Setting up your repository</title>
-<link rel="stylesheet" href="common/kde-default.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.40">
-<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.12 using libxslt">
-<link rel="home" href="index.html" title="BibleTime Installation Guide">
-<link rel="up" href="installmgr.html" title="Chapter 5. How to install and use Sword Installmgr">
-<link rel="previous" href="installmgr-install.html" title="Sword Installmgr">
-<link rel="next" href="instmgr-cfg.html" title="Setting up the Sword configuration file.">
-</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>Setting up your repository</h1></div>
-<div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('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('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('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('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="installmgr-install.html">Prev</a></td>
-<td align="center" class="center">How to install and use Sword Installmgr</td>
-<td align="right" class="right"><a accesskey="n" href="instmgr-cfg.html">Next</a></td>
-</tr></tbody></table></div>
-</div>
-<div class="section">
-<a name="instmgr-rep"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
-<a name="instmgr-rep"></a>Setting up your repository</h2></div></div>
-<p>If you have the Sword CD, you can skip this step.  The texts are stored on the CD
-	uncompressed, and are accessed directly from installmgr under the manage remote sources tab.
-	</p>
-<p>
-	Download modules from <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a>
-	use the zipped up modules (modulename.zip),
-	not the windows executable compressed files (modulename.exe).
-	</p>
-<p>
-	Create a directory for your module repository, <tt>$HOME/sword_modules</tt>
-	for example.
-	</p>
-<p>
-	Open a program that can uncompress zip files.  Such as gnozup or archiver.  Command line
-	tools can also be used, to find which ones are installed on your system do a <span class="command"><b>man -k zip</b></span>
-	</p>
-<p>
-	Use your unzipping program to extract the module files into <tt>$HOME/sword_modules</tt>.
-	All of the files will be placed into the correct subdirectories. If you wish to add modules later
-	remember to unzip to <tt>$HOME/sword_modules</tt>.
-	</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('common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;">
-<img src="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="installmgr-install.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="instmgr-cfg.html">Next</a></td>
-</tr>
-<tr>
-<td width="33%" align="left">Sword Installmgr�</td>
-<td width="34%" align="center"><a href="installmgr.html">Up</a></td>
-<td width="33%" align="right">�Setting up the Sword configuration file.</td>
-</tr>
-</table></div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/bibletime-doc/docs/en/install/html/instmgr.png b/bibletime-doc/docs/en/install/html/instmgr.png
deleted file mode 100644
index 11c577a..0000000
--- a/bibletime-doc/docs/en/install/html/instmgr.png
+++ /dev/null
diff --git a/bibletime-doc/docs/en/install/unicode/Makefile.am b/bibletime-doc/docs/en/install/unicode/Makefile.am
deleted file mode 100644
index 0d69a3b..0000000
--- a/bibletime-doc/docs/en/install/unicode/Makefile.am
+++ /dev/null
@@ -1,31 +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 = index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook 
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/install/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/install; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/install/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/install/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;
diff --git a/bibletime-doc/docs/en/install/unicode/Makefile.in b/bibletime-doc/docs/en/install/unicode/Makefile.in
deleted file mode 100644
index 3e8922b..0000000
--- a/bibletime-doc/docs/en/install/unicode/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# 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
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/unicode/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/install/unicode/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = docs/en/install/unicode
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/en/install/unicode/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/install/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook; do \
-	  if test -e $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(kde_htmldir)/en/bibletime/install; \
-	    chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  else \
-	    ln -sf ../../../en/bibletime/install/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  fi; \
-	done;
-	if test -d $(DESTDIR)$(kde_htmldir)/en/bibletime/install/../../common; then \
-	  ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;\
-	else \
-	  ln -sf ../../../en/common $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;\
-	fi;
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  index.docbook inst-bin.docbook inst-installmgr.docbook inst-preq.docbook inst-sources.docbook inst-user.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/install/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/install/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/install/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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/en/install/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/en/install/unicode/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/docs/en/install/unicode/index.docbook b/bibletime-doc/docs/en/install/unicode/index.docbook
deleted file mode 100644
index ce75161..0000000
--- a/bibletime-doc/docs/en/install/unicode/index.docbook
+++ /dev/null
@@ -1,135 +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;"><!-- replace bibletimehandbook here -->
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE"><!-- change language only here -->
-
-  <!-- user entities -->
-  <!-- application name entities -->
-  <!ENTITY bibletime '<application>BibleTime</application>'>
-  <!ENTITY sword '<application>Sword</application>'>
-  <!ENTITY swordInstmgr '<application>Sword Installmgr</application>'>
-  <!ENTITY crosswire '<application>Crosswire Bible Society</application>'>
-
-  <!-- called file entities -->
-  <!ENTITY instchap1 SYSTEM "inst-bin.docbook">
-  <!ENTITY instchap2 SYSTEM "inst-preq.docbook">
-  <!ENTITY instchap3 SYSTEM "inst-sources.docbook">
-  <!ENTITY instchap4 SYSTEM "inst-user.docbook">
-  <!ENTITY appa SYSTEM "inst-installmgr.docbook">
-  <!-- Do not define any other entities; instead, use the entities
-       from kde-genent.entities and $LANG/user.entities. -->
-]>
-
-
-<!-- ................................................................ -->
-
-<!-- The language must NOT be changed here. -->
-
-<book lang="&language;">
-
-<bookinfo>
-<title>BibleTime Installation Guide</title>
-
-<authorgroup>
-<author>
-<firstname>Joachim</firstname>
-<surname>Ansorg</surname>
-</author>
-<author>
-<firstname>Fred</firstname>
-<othername></othername>
-<surname>Saalbach</surname>
-</author>
-<author>
-<firstname>Jeffrey</firstname>
-<surname>Hoyt</surname>
-</author>
-</authorgroup>
-
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-
-<copyright>
-<year>1999</year>
-<year>2000</year>
-<year>2001</year>
-<holder>The team of BibleTime, info@bibletime.de</holder>
-</copyright>
-
-<legalnotice>
-
-<para>The bibletime installation guide 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>10/23/2001</date>
-<releaseinfo>1.01.00</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>
-
-&instchap1;
-&instchap2;
-&instchap3;
-&instchap4;
-&appa;
-
-</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/bibletime-doc/docs/en/install/unicode/inst-bin.docbook b/bibletime-doc/docs/en/install/unicode/inst-bin.docbook
deleted file mode 100644
index 10ea695..0000000
--- a/bibletime-doc/docs/en/install/unicode/inst-bin.docbook
+++ /dev/null
@@ -1,51 +0,0 @@
-<chapter id="inst-bin">
-<title>&bibletime; Program Files
-</title>
-<para>Program files are provided in the following formats.</para>
-
-<table>
-   <title>&bibletime; Distribution Formats</title>
-   <tgroup cols="2">
-   <thead>
-   <row>
-   <entry>Format name</entry>
-   <entry>Description</entry>
-   </row>
-   </thead>
-<tbody>
-<row>
-<entry>
-RPM Packages.
-</entry>
-
-<entry>
-See the <ulink url="http://sourceforge.net/projects/bibletime">sourceforge &bibletime;</ulink>
-home page for the distributions supported.
-RPM packages are installed using any package manager or the RPM command line.
-RPM Installation instructions are <link linkend="inst-user-RPM">here</link>.
-</entry>
-</row>
-
-<row>
-<entry>
-Source code.
-</entry>
-
-<entry>
-The source code can be installed on any distribution meeting the installation prerequisites.
-The source code should compile on non <trademark>Intel</trademark> platforms, and most &UNIX; meeting the prerequisites.
-Instructions for installation from sourcecode are <link linkend="inst-user-source">here</link>.
-</entry>
-</row>
-
-</tbody>
-   </tgroup>
-   </table>
-<para>
-Language modules which contain the &bibletime; handbook, Bible Study HowTo, Installation Instructions,
-and the Help Dialog are provided seperately in RPM, and as tarball sources.  The language modules contain
-the documents in both HTML and &XML; Docbook format, so they can be viewed without the main &bibletime; package.</para>
-<para>Language modules are installed in the same way as the program modules</para>
-
-</chapter>
-
diff --git a/bibletime-doc/docs/en/install/unicode/inst-installmgr.docbook b/bibletime-doc/docs/en/install/unicode/inst-installmgr.docbook
deleted file mode 100644
index 3d7acd5..0000000
--- a/bibletime-doc/docs/en/install/unicode/inst-installmgr.docbook
+++ /dev/null
@@ -1,190 +0,0 @@
-<chapter id="installmgr">
-<title>How to install and use &swordInstmgr;</title>
-<para>&swordInstmgr; is not provided with the &bibletime; .rpm.  You need to download the
-source tarball from the <ulink url="http://www.crosswire.org">&crosswire;</ulink>.
-A precompiled copy of &swordInstmgr; is included on the &sword; CD which can be obtained
-from the <ulink url="http://www.crosswire.org">&crosswire;</ulink>
-</para>
-<section id="installmgr-req">
-<title> Requirements for &swordInstmgr;</title>
-
-	<para>
-	All of the packages required for &swordInstmgr; to compile are included in the major
-	&Linux; distributions. It is also possible to compile &swordInstmgr; on most &UNIX;
-	distributions.  If you encounter compile errors, please read the messages, they
-	should lead you to missing packages which you will probably find on your
-	installation disks. </para>
-	<para> The following table contains the minimum requirements for &swordInstmgr;
-	binaries to run, or for the source version to compile.</para>
-	<table>
-	<title>
-	Packages required for &swordInstmgr;
-	</title>
-	<tgroup cols="2">
-	<thead>
-
-	<row>
-	<entry>Package</entry>
-	<entry>Location</entry>
-	</row>
-	</thead>
-	<tbody>
-	<row>
-	<entry>
-	&sword;
-	</entry>
-	<entry>
-	Use the version provided with your copy of &sword;.  Must be configured
-	(in the file ~/sword/Makefile.cfg) with the VCL libraries = yes
-	</entry>
-	</row>
-	<row>
-	<entry>
-	GTK
-	</entry>
-	<entry>
-	If you are compiling &swordInstmgr;, any version of GTK should work.
-	</entry>
-	</row>
-	</tbody>
-	</tgroup>
-	</table>
-	</section>
-
-	
-	<section id="installmgr-install">
-	<title>&swordInstmgr;</title>
-	<para>To compile &swordInstmgr; first &sword; must have been compiled.
-	<link linkend="inst-sources-sword-install">See the instructions for
-	&sword;</link>.
-	</para>
-	<para>Find the file <filename> libsword.so</filename>, &sword; probably installed it to
-	<filename>/usr/local/sword/lib</filename> unless you customized the installation.
-	</para>
-	<para>
-	In order that &swordInstmgr; (and also &bibletime;) can find this shared library
-	open a text editor and add <filename>/usr/local/sword/lib</filename> to the
-	end of <filename>/etc/ld.so.conf</filename>.
-	</para>
-	<para>
-	Now you are ready to compile &swordInstmgr;.
-	</para>
-	<para>
-	CD to your &sword; source and open the directory
-	<filename>.../sword/apps/X11/InstallMgr</filename>.
-	Now in a shell do:
-	</para>
-	<screen>
-	ldconfig
-	./configure
-	make
-	su
-	make install
-	</screen>
-	<para>
-	Now in a shell as root (su) you can run installmgr by typing
-	<filename>/usr/local/bin/installmgr</filename>.
-	</para>
-	<para>
-	If this was successful, there are two options for loading
-	text modules into &sword;.
-	</para>
-	<itemizedlist>
-	<listitem>
-	<para>
-	<guimenu>Options</guimenu> -> <guimenuitem>Manage remote sources</guimenuitem> -- Connect to Crosswire by modem and download
-	sword documents and modules from the crosswire repository.  This is a feature that has not yet been ported to
-	&Linux; and &UNIX;.
-	</para>
-	</listitem>
-	<listitem>
-	<para>
-	<guimenu>Options</guimenu> -> <guimenuitem>Local Path</guimenuitem> -- If you have unzipped sources, point this to your local
-	module repository.  The local repository may be on a local or networked hard drive, or
-	the &sword; CD mounted on a local or networked CD ROM drive.
-	All of the available modules will be displayed, and
-	may now be installed.
-	</para>
-	</listitem>
-	</itemizedlist>
-	<para>
-	&sword; CD's can be obtained from the
-	<ulink url="http://www.crosswire.org">Crosswire Bible Society</ulink>
-	</para>
-	</section>
-
-	<section id="instmgr-rep">
-	<title>Setting up your repository</title>
-	<para>If you have the &sword; CD, you can skip this step.  The texts are stored on the CD
-	uncompressed, and are accessed directly from installmgr under the manage remote sources tab.
-	</para>
-	<para>
-	Download modules from <ulink url="http://www.crosswire.org">&crosswire;</ulink>
-	use the zipped up modules (modulename.zip),
-	not the windows executable compressed files (modulename.exe).
-	</para>
-	<para>
-	Create a directory for your module repository, <filename>$HOME/sword_modules</filename>
-	for example.
-	</para>
-	<para>
-	Open a program that can uncompress zip files.  Such as gnozup or archiver.  Command line
-	tools can also be used, to find which ones are installed on your system do a <command>man -k zip</command>
-	</para>
-	<para>
-	Use your unzipping program to extract the module files into <filename>$HOME/sword_modules</filename>.
-	All of the files will be placed into the correct subdirectories. If you wish to add modules later
-	remember to unzip to <filename>$HOME/sword_modules</filename>.
-	</para>
-	</section>
-
-
-	<section id="instmgr-cfg">
-	<title>Setting up the &sword; configuration file.</title>
-	<para>
-	Instructions for the &sword; configuration file can be found in the section
-	<link linkend="inst-sources-sword-modules-config">"The &sword; configuration
-	file"</link> which covers the manual installation of the &sword; modules.
-	</para>
-	</section>
-
-
-	<section id="instmgr-load">
-	<title>Using &swordInstmgr; to load sword modules.</title>
-	<para>
-	You must start &swordInstmgr; as root for it to be able to load modules.
-	Start it with these commands:
-	</para>
-	<screen>
-	[me@localhost user]$ su
-	Password:
-	[root@localhost user]# /usr/local/bin/installmgr
-	</screen>
-	<para>
-	You will now see the installmgr window.  You will need to use
-	<guimenu>options>local path</guimenu> to point to your local module repository.
-	</para>
-	<para>
-	Now the available modules will be shown on the left pane and
-	the installed modules on the right.  All you need to do is
-	select modules in the left pane and click install to make them
-	available to &sword; and &bibletime;.
-	<mediaobject>
-	<imageobject>
-	<imagedata  fileref="instmgr.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>&swordInstmgr; screenshot</phrase>
-	</textobject>
-	</mediaobject>
-	</para>
-	</section>
-</chapter>
-
-
-
-
-
-
-
-
diff --git a/bibletime-doc/docs/en/install/unicode/inst-preq.docbook b/bibletime-doc/docs/en/install/unicode/inst-preq.docbook
deleted file mode 100644
index 4cc1db0..0000000
--- a/bibletime-doc/docs/en/install/unicode/inst-preq.docbook
+++ /dev/null
@@ -1,59 +0,0 @@
-<chapter id="inst-preq">
-<title>&bibletime; Prerequisites
-</title>
-
-<section id="devl-10">
-<title> Requirements for &bibletime; 1.1</title>
-
-<para>
-All of the packages required for &bibletime; to compile are included in the major
-&Linux; distributions. It is also possible to compile &bibletime; on most other &UNIX;
-distributions.  If you encounter compile errors, please read the messages, they
-should lead you to missing packages which you will probably find on your
-installation disks. </para>
-<para> The following table contains the minimum requirements for &bibletime;
-binaries to run, or for the source version to compile.</para>
-
-
-<table>
-<title>
-Packages required for installation of &bibletime; 1.1
-</title>
-<tgroup cols="2">
-<thead>
-
-<row>
-<entry>Package</entry>
-<entry>Location</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry>
-&Qt; 2.2.x
-</entry>
-<entry>
-<ulink url="http://www.trolltech.com"> http://www.trolltech.com</ulink>
-</entry>
-</row>
-<row>
-<entry>
-&kde; 2.x (at least the libraries)
-</entry>
-<entry>
-<ulink url="http://www.kde.org"> http://www.kde.org</ulink>
-</entry>
-</row>
-<row>
-<entry>
-&sword; 1.5.3
-</entry>
-<entry>
-<ulink url="ftp://ftp.crosswire/pub/sword/source">
-ftp://ftp.crosswire/pub/sword/source</ulink>
-</entry></row> </tbody>
-</tgroup>
-</table>
-</section>
-</chapter>
-
diff --git a/bibletime-doc/docs/en/install/unicode/inst-sources.docbook b/bibletime-doc/docs/en/install/unicode/inst-sources.docbook
deleted file mode 100644
index 6445f19..0000000
--- a/bibletime-doc/docs/en/install/unicode/inst-sources.docbook
+++ /dev/null
@@ -1,215 +0,0 @@
-<chapter id="inst-sources"><title>Installing BibleTime Sources</title>
-<para>
-This chapter describes how sources are compiled.  These steps apply for both the
-development version and the released version of &bibletime; and &sword;. </para>
-<section id="inst-sources-sword"><title>Installation of &sword; and the &sword;
-Modules </title>
-<para>
-&sword; and &sword; modules are the <emphasis>book library</emphasis> for BibleTime.
-Please see the page download for further information about downloading BibleTime.
-</para>
-<para>
-Have a look at the requirements page to obtain &sword;. See page links to
-obtain &sword;'s modules.</para>
-
-<section id="inst-sources-sword-install"><title>Installation of SWORD
-</title>
-<para>
-This page shows &sword; 1.5.1a.  For other versions of &sword;, the file names
-will be different.</para>
-
- <para>
-First you have to unpack the downloaded .tar.gz file (if you are using the CVS
-version, your sources will already be unpacked, so skip this step) to a
-temporary directory. Do something like this: </para> <screen>
-mkdir /tmp
-cd /tmp
-tar -xzf sword-1.5.1a.tar.gz
-cd /tmp/sword-1.5.1a
-</screen>
-
-
-<para>
-(the tar file will have unpacked into a directory named something similar to
-sword-1.5.1a) </para>
-
-<para>
-Before you try to compile &sword;, you may need to modify
-<filename> Makefile.cfg</filename> (it is located in the top directory of the
-unpacked sources).  The customized section of <filename>Makefile.cfg</filename>
-is marked, do not try to change parts of the file outside of the area marked
-<emphasis>##### Customizable stuff. Set it how you like it #####</emphasis>
-unless you really know what you are doing. </para>
-<para>
-For many installations the defaults will work.  When the defaults don't work,
-these switches may be set.</para>
-<table>
-<title>Sword Makefile.cfg switches</title>
-<tgroup cols="2">
-<thead>
-<row>
-<entry>Switch</entry>
-<entry>Description</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry># compiler</entry>
-<entry>If you have gcc leave this alone, otherwise enter the compiler
-you will be using.</entry> </row>
-<row>
-<entry># shared library-</entry>
-<entry>Set to 'yes'.  this causes the shared library
-<filename>libsord.so</filename> to be generated.  An entry must be placed into
-the file <filename>/etc/ld.so.conf</filename> that points to libsword.
-<filename>/usr/local/sword/lib</filename> is typical.  The shared
-library is necessary for BibleTime to work, but Sword will compile without
-errors if you don't do this.  Be careful here. </entry> </row>
-<row>
-<entry># VCL library-</entry>
-<entry>Use the default 'no' unless you are using the Sword install
-manager, then use 'yes'.</entry> </row> <row>
-<entry># Debugging options etc...</entry>
-<entry>The defaults should work.</entry>
-</row>
-<row>
-<entry># endian, etc. support for other hardware</entry>
-<entry>Use the default if compiling on an Intel.  If you have other
-hardware, select the correct entry.</entry> </row>
-<row>
-<entry># zLib support</entry>
-<entry>Use the default 'yes'</entry>
-</row>
-<row>
-<entry># paths</entry>
-<entry>The defaults are OK for most distributions, don't change them unless you know what you are doing.
-
-</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-
-<para>Now start compiling.</para>
-<screen>
-make
-su
-make install
-make configure
-</screen>
-<para>
-In the event that make command reports an error on completion, it probably
-indicates that you are missing a package.  For example:</para>
-
-<screen>
-bash-2.03# make
-make just-pre nodeps=yes
-make[1]: Entering directory `/bible/sword-1.5.1a'
-make -C src just-pre
-.
-.
-.
-make[1]: Entering directory `/bible/sword-1.5.1a/include'
-make[1]: Nothing to be done for `just-targets'.
-make[1]: Leaving directory `/bible/sword-1.5.1a/include'
-make -C apps/X11/VCL just-targets
-make[1]: Entering directory `/bible/sword-1.5.1a/apps/X11/VCL'
-gcc -I../../../include/ -D_GNU_SOURCE -I. `gtk-config --cflags` -static -pipe -Wall -Wno-format
--fomit-frame-pointer -ggdb -O0 -m486 -c -o TWinControl.o TWinControl.cpp
-<emphasis>/bin/sh: gtk-config: command not found </emphasis>
-In file included from TWinControl.cpp:1:
-<emphasis>TWinControl.h:6: gtk/gtkwidget.h: No such file or directory</emphasis>
-<emphasis>TWinControl.cpp:3: gtk/gtkwidget.h: No such file or directory </emphasis>
-In file included from TWinControl.cpp:1:
-TWinControl.h:281: syntax error before `*'
-TWinControl.h:284: parse error before `*'
-TWinControl.cpp:10: parse error before `*'
-make[1]: *** [TWinControl.o] Error 1
-make[1]: Leaving directory `/bible/sword-1.5.1a/apps/X11/VCL'
-make: *** [apps/X11/VCL/targets] Error 2
-bash-2.03#
-</screen>
-
-<para>The italic lines above indicate that a gtk application was missing.  A
-review of the available packages showed that one of the gtk packages
-supplied with SuSE is gtkdev.  This turns out to be the application required to
-allow make to run to completion without errors.  Often missing packages
-will be found on your installation disks, or on your distribution's website.
-Once <command>make</command> runs to completion without errors, then
-<command>make install</command>. If it still doesn't work, edit the
-file <filename>Makefile.cfg</filename> in the top directory of the SWORD sources
-and change the line <command>buildvcl := yes</command> to <command>buildvcl
-:= no</command> and try again.
-</para>
-</section>
-
-<section id="inst-sources-sword-modules">
-<title>Installation of modules</title>
-<para>&sword; currently supports 3 types of modules: Bibles, dictionaries and
-commentaries.  In order for &sword; and &bibletime; to be useful these modules must be installed.
-</para><para>
-&sword; modules can be installed <link linkend="inst-sources-sword-modules">manually</link> or with
-&swordInstmgr;.
-&swordInstmgr; is provided as part of the &sword; package.  The directions for compiling and installing
-&swordInstmgr; can be found in the section
-<link linkend="installmgr">How to install and use &swordInstmgr;</link>
-or in the &sword; source at <filename>/sword/apps/X11/InstallMgr/INSTALL</filename>.</para>
-
-<section id="inst-sources-sword-modules-dir"><title>Choose a &sword; directory</title> <para>
-&sword; currently supports 3 types of modules: Bibles, dictionaries and
-commentaries. You have to install the files of the modules their own directory.
-You must decide which directory will be your &sword; directory. If you installed
-the libs and includes in an extra directory use that directory as your &sword;
-directory (e.g. <filename>/usr/local/sword/</filename>). If you installed the
-library and include files in a common place like
-<filename>/usr/local/</filename> please select another location for your &sword;
-directory. </para>
-</section>
-
-
-
-<section id="inst-sources-sword-modules-upack"><title>
-Unpack the downloaded package</title>
-<para>
-First you have to unpack the downloaded package. On the download page of &sword;
-you can choose if you want to get a &Windows; or RAW package. If you have a "&Linux;
-only" box please get the RAW packages. But if you accidentally get a &Windows;
-self extracting executable try using WINE to extract the files. Perhaps you have
-to change the filename of <filename>_INSTALL.1</filename> to
-<filename>_install.1</filename> to get the setup running.
-</para>
-</section>
-<section id="inst-sources-sword-modules-config"><title>
-Integrating modules</title>
-<para>
-Create the directory <filename>mods.d</filename> inside of your &sword; directory.
-Please copy the file <filename>[modulename].conf</filename> into the
-<filename>mods.d</filename> directory. the <filename>.conf</filename> file is
-normally inside the unpacked module files. Now move the whole dir <filename>/modules</filename>
-which contains your unpacked module data files to the &sword; directory.  In the
-example <filename>/usr/local/sword/share</filename> is the SWORD directory.</para>
-<para> Directory Structure looks like this:
-</para>
-<screen>
-/usr/local/sword/share/ -|- mods.d/ -|- module_1_name.conf
-                         |           |- module_2_name.conf
-                         |
-                         |- texts/rawtext/ -|-module_1_name/files
-                                            |-module_2_name/files
-</screen>
-</section>
-
-</section>
-</section>
-
-
-
-
-</chapter>
-
-
-
-
-
-
diff --git a/bibletime-doc/docs/en/install/unicode/inst-user.docbook b/bibletime-doc/docs/en/install/unicode/inst-user.docbook
deleted file mode 100644
index ec8318d..0000000
--- a/bibletime-doc/docs/en/install/unicode/inst-user.docbook
+++ /dev/null
@@ -1,42 +0,0 @@
-<chapter id="inst-user"><title>Installation of &bibletime;</title>
-<section id="inst-user-RPM"><title>RPM Installation</title>
-<para>
-If you are installing &bibletime; RPM, just open your package manager (rpm, &kpackage;, or similar)
-and install in the normal way.
-</para>
-</section>
-<section id="inst-user-source"><title>Source</title>
-<para>
-Source tarballs need to be uncompressed (Archiver or similar).  Then try:
-
-<screen>
-export QTDIR=/usr/lib
-export KDEDIR=/usr
-export PATH=$KDEDIR/bin:$PATH
-./configure				# create makefiles
-make					# compile BibleTime
-make install				# install BibleTime
-</screen>
-The location QTDIR is the directory contining the &Qt; 2 directory.
-The location KDEDIR is the folder containing the /bin directory containing the &kde; executables.
-The above locations apply to &Mandrake;.  Your distribution may require different locations.
-</para>
-<para>
-Additional information can be found in the sourcecode at
-<filename>bibletime/INSTALL</filename>.
-</para>
-</section>
-<section id="inst-user-troubleshooting"><title>Troubleshooting</title>
-<para>
-<ulink url="http://www.bibletime.de/">www.bibletime.de</ulink> has all the
-answers. Please look there.  :-)
-</para>
-<para>
-Don't forget to read the &FAQ; and the installation instructions on
-www.bibletime.de. If you downloaded the sourcecode please do also read the file
-README and INSTALL included in the sourcecode package.
-</para>
-</section>
-</chapter>
-
-
diff --git a/bibletime-doc/docs/en/tips b/bibletime-doc/docs/en/tips
deleted file mode 100644
index 4cca3a3..0000000
--- a/bibletime-doc/docs/en/tips
+++ /dev/null
@@ -1,193 +0,0 @@
-<tip category="BibleTime|General">
-<html>
-This is <B>BibleTime 1.1</B>!<BR>
-This version of BibleTime should have reached the state where it could
-be called stable, useful and user friendly!<BR>
-</html>
-</tip>
-
-<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 1.1 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)
-</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 help how to study the Bible.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-The Bible has the power to "comfort the afflicted" and "afflict the comfortable". (Revelation 10:10)
-</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>
-That 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>
-It's possible to insert the text of bookmarks and references to verses or lexicon entries into the personal commentary editor by dropping them there.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-By studying the Bible you will have no reason to stand ashamed before God. (2 Timothy 2: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 optionsdialog.
-</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 regular expression "x | y | z" for searching, which is equivalent to "x OR y OR z", e.g. "pray | worship | supplicate".
-</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.
-Now double click on it and drag the selected word on the foreign module in the main index.
-The search dialog will be opened with the word in the edit line.
-</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 (e.g. greek or hebrew) do often require a special unicode font to read them.
-Many of the fonts are available on www.crosswire.org or on the Sword CD.
-</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/bibletime-doc/docs/gen_am.dat b/bibletime-doc/docs/gen_am.dat
deleted file mode 100644
index 4023391..0000000
--- a/bibletime-doc/docs/gen_am.dat
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# gen_am.dat script
-#
-# (C) 2001 The BibleTime team
-# released under the GPL
-#
-# This script contains some basic variables for the
-# BibleTime-doc Makefile system generation
-
-
-# This variable identifies which language's directories
-# are to be included in the Makefile structure.
-#
-# If you want to exclude a language, just delete it
-# from the following variable.
-
-# NOTE: "en" MUST BE THE FIRST LANGUAGE!
-
-export DOC_LANGUAGES="en de"
-
-# This variable identifies which parts of the documentation
-# are in use.
-
-export DOC_PARTS="handbook helpdialog howto install"
-
diff --git a/bibletime-doc/docs/gen_am.sh b/bibletime-doc/docs/gen_am.sh
deleted file mode 100755
index caa978d..0000000
--- a/bibletime-doc/docs/gen_am.sh
+++ /dev/null
@@ -1,223 +0,0 @@
-#!/bin/bash
-#
-# gen_am.sh script
-#
-# (C) 2001 The BibleTime team
-# released under the GPL
-#
-# This script creates the Makefile.am files in the
-# bibletime/docs/* directories and subdirectories.
-
-# change to the dir the script is located in
-cd `dirname $0`
-
-export HEADER=\
-"# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh\n"\
-"# please do not edit this file but rather run the script to update\n\n"
-
-###########################
-# create Makefile.am in /bibletime/docs/
-###########################
-
-. gen_am.dat
-
-echo generating Makefile.am
-echo -e $HEADER"SUBDIRS = "$DOC_LANGUAGES > Makefile.am
-
-###########################
-# create Makefile.am's in /bibletime/docs/??/ directories
-###########################
-
-for I1 in $DOC_LANGUAGES; do
-
-  echo generating $I1/Makefile.am
-  ( # output to Makefile.am
-    echo -e $HEADER
-
-    echo -n "SUBDIRS = "
-
-    for PART in $DOC_PARTS; do
-      if test -d $I1/$PART; then
-        echo -n "$PART "
-      fi
-    done
-
-    echo; echo
-
-    if test -e $I1/tips; then
-      echo "EXTRA_DIST =  tips"
-      echo
-
-      echo 'rcdir = $(kde_datadir)/bibletime';
-      echo 'rc_DATA = tips';
-    fi
-  ) > $I1/Makefile.am
-
-  ###########################
-  # create Makefile.am's in /bibletime/docs/LANG/PART directories
-  ###########################
-  for PART in $DOC_PARTS; do
-
-    if test -d $I1/$PART; then
-
-      ###################################
-      #create $PART/Makefile.am
-      ###################################
-
-      export I2=$I1/$PART
-      export ENGDIR=../../en
-      echo generating $I2/Makefile.am
-      ( # output to Makefile.am
-        echo -e $HEADER
-        echo -n "SUBDIRS = "
-
-        if test -d $I2/html; then
-          echo -n "html "
-        fi
-        if test -d $I2/unicode; then
-          echo -n "unicode "
-        fi
-
-      echo
-      echo
-  if test $I1 = en; then
-      echo 'pot-files:'
-      echo '	for f in `ls unicode/*.docbook`; do \'
-      echo '		potfile=`echo $$f | sed s/\.docbook$$/\.pot/`; \'
-      echo '		potfile=`echo $$potfile | sed s/unicode//`; \'
-      echo '		echo "Calling xml2pot $$f > pot/$$potfile"; \'
-      echo '		xml2pot $$f > pot/$$potfile; \'
-      echo '		done;'
-  else
-      echo 'po-files:'
-      echo '	for f in `ls '$ENGDIR'/'$PART'/pot/*.pot`; do \'
-      echo '		pofile=`echo $$f | sed s/\.pot$$/\.po/`; \'
-      echo '		pofile=`echo $$pofile | sed s/"..\/..\/en\/'$PART'\/pot\/"//`; \'
-      echo '		if test ! -e po/$$pofile; then touch po/$$pofile; fi; \'
-      echo '		echo "Calling msgmerge -o po/$$pofile.new po/$$pofile $$f"; \'
-      echo '		msgmerge -o po/$$pofile.new po/$$pofile $$f; \'
-      echo '		if diff po/$$pofile po/$$pofile.new > /dev/null; then \'
-      echo '		rm po/$$pofile.new; \'
-      echo '		else \'
-      echo '		mv po/$$pofile.new po/$$pofile; \'
-      echo '		fi; \'
-      echo '	done;'
-      echo
-      echo
-      echo 'unicode-files:'
-      echo '	for f in `ls '$ENGDIR'/'$PART'/unicode/*.docbook`; do \'
-      echo '		pofile=`echo $$f | sed s/\.docbook$$/\.po/`; \'
-      echo '		pofile=`echo $$pofile | sed s/"..\/..\/en\/'$PART'\/unicode\/"//`; \'
-      echo '		newfile=`echo $$f | sed s/"..\/..\/en\/'$PART'\/unicode\/"//`; \'
-      echo '		echo "Calling po2xml $$f po/$$pofile  > unicode/$$newfile"; \'
-      echo '		po2xml $$f po/$$pofile > unicode/$$newfile; \'
-      echo '	done;'
-  fi;
-      echo 'html-files:'
-      echo '	if test -e unicode/index.docbook; then \'
-      echo '		olddir=$$PWD; \'
-      echo '		cd html;\'
-      echo '		echo "Validating the XML files..."; \'
-      echo '		if meinproc ../unicode/index.docbook; then\'
-      echo '			echo "HTML files created successfully."; \'
-      echo '		fi; cd $$olddir; \'
-      echo '	fi;'
-      echo
-      ) > $I2/Makefile.am
-
-      #####################################
-      #create $PART/html/Makefile.am
-      #####################################
-      #export I2=$I1/$PART/html
-
-      for SECTION in html unicode; do
-
-          I2=$I1/$PART/$SECTION
-          I2_EN=en/$PART/$SECTION
-
-          if test -d $I2; then
-
-            echo generating $I2/Makefile.am
-
-            ( # output to Makefile.am
-              echo -e $HEADER
-
-              echo -n "EXTRA_DIST = "
-	      FILES=`ls -d $I2/*.png $I2/*.html $I2/*.docbook 2>/dev/null`;
-	      if test $SECTION = "html"; then
-		if test $PART = "helpdialog"; then
-		    FILES=`ls -d $I2/*.png $I2/*.html 2>/dev/null`;
-		else
-		    FILES=`ls -d $I2/*.png 2>/dev/null`;
-		fi;
-	      fi;
-
-              for I3 in $FILES; do
-                echo -n `basename $I3`" "
-              done
-              echo
-
-	      #echo "DISTCLEANFILES = index_cache.gz"
-	      #echo
-
-              TARGET_ROOT='$(DESTDIR)$(kde_htmldir)/'$I1'/bibletime'
-              TARGET_DIR=$TARGET_ROOT/$PART
-
-              EN_FILES=""
-              HAS_FILES="NO"
-
-              if  test $PART == helpdialog; then
-                for FILE in `ls -d $I2_EN/*.png $I2_EN/*.html $I2_EN/*.docbook 2>/dev/null`; do
-                  EN_FILES="$EN_FILES `basename $FILE`";
-                  HAS_FILES="YES"
-                done
-              else
-                for FILE in `ls -d $I2_EN/*.png $I2_EN/*.docbook 2>/dev/null`; do
-                  EN_FILES="$EN_FILES `basename $FILE`";
-                  HAS_FILES="YES"
-                done
-              fi
-
-
-              if test $HAS_FILES = YES; then
-                echo
-                echo 'install-data-local:'
-                echo '	mkdir -p '$TARGET_DIR'/;'  #mkdir -p creates all directories leaing to $TARGET_DIR
-                echo '	chmod -R a+r+X  '$TARGET_ROOT';'
-                echo '	for file in '$EN_FILES'; do \'
-                echo '	  if test -e $$file; then \' ## in this directory
-                echo '	    $(INSTALL_DATA) $$file '$TARGET_DIR'; \'
-                echo '	    chmod a+r '$TARGET_DIR'/$$file; \'
-                echo '	  else \'
-                echo '	    ln -sf ../../../en/bibletime/'$PART'/$$file '$TARGET_DIR/'$$file; \'
-                echo '	  fi; \'
-                echo '	done;'
-                echo '	if test -d '$TARGET_DIR'/../../common; then \'
-                echo '	  ln -sf ../../common '$TARGET_DIR'/common;\'
-                echo '	else \'
-                ############## Use the english css data ###################
-                echo '	  ln -sf ../../../en/common '$TARGET_DIR'/common;\'
-                echo '	fi;'
-                echo '	chmod -R a+r+X '$TARGET_ROOT
-                echo
-                echo 'uninstall-local:'
-                echo '	for file in '$EN_FILES'; do \'
-                echo '	  echo Removing '$TARGET_DIR'/$$file; \'
-                echo '	  rm -f '$TARGET_DIR'/$$file; \'
-                echo '	done;'
-                echo '	echo Removing '$TARGET_DIR'/common;'
-                echo '	rm -f '$TARGET_DIR'/common;'
-              fi;
-            ) > $I2/Makefile.am
-          fi # html
-
-      done
-
-
-    fi  # PART exists?
-
-  done ### PART
-
-done ### language
-
-
diff --git a/bibletime-doc/libtool b/bibletime-doc/libtool
deleted file mode 100755
index 1f56911..0000000
--- a/bibletime-doc/libtool
+++ /dev/null
@@ -1,6005 +0,0 @@
-#! /bin/sh
-
-# libtool - Provide generalized library-building support services.
-# Generated automatically by ltconfig (GNU libtool 1.4a (1.641.2.206mm 2001/04/03 21:47:47))
-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-#
-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# 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=" CXX"
-
-### BEGIN LIBTOOL CONFIG
-# Libtool was configured as follows, on host ekonomikrisis:
-#
-# AR="" AR_FLAGS="" LTCC="gcc" CC="gcc" \
-# CFLAGS="-DNDEBUG -O2  " CPPFLAGS="" \
-# MAGIC_CMD="" LD="/usr/bin/ld" LDFLAGS="" LIBS="" \
-# LN_S="ln -s" NM="/usr/bin/nm -B" RANLIB="ranlib" STRIP="strip" \
-# AS="" DLLTOOL="" OBJDUMP="" \
-# objext="" exeext="" reload_flag=" -r" \
-# deplibs_check_method="pass_all" \
-# file_magic_cmd="\$MAGIC_CMD" \
-#   admin/ltconfig --cache-file=./config.cache --disable-shared --with-gcc --with-gnu-ld --enable-dlopen --no-verify --build=i686-pc-linux-gnu admin/ltmain.sh i686-pc-linux-gnu
-#
-# Compiler and other test output produced by ltconfig, useful for
-# debugging ltconfig, is in ./config.log if it exists.
-
-# The version of ltconfig that generated this script.
-LTCONFIG_VERSION="1.4a"
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=no
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to optimize for fast installation.
-fast_install=needless
-
-# The host system.
-host_alias=i686-pc-linux-gnu
-host=i686-pc-linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# A language-specific compiler.
-CC="gcc"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# The linker used to build libraries.
-LD="/usr/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP=strip
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# 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=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=73729
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation ?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=yes
-
-# Whether dlopen of programs is supported.
-dlopen_self=yes
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=no
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# 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="\${libname}\${release}.so\$versuffix \${libname}\${release}.so\$major \$libname.so"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}.so\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-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"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=""
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=""
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=""
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGISTW]\\)[ 	][ 	]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern char \\1;/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | sed 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-### END LIBTOOL CONFIG
-
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
-#
-# Copyright (C) 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.
-
-# 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.4a
-TIMESTAMP=" (1.641.2.206mm 2001/04/03 21:47:47)"
-
-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'
-SP2NL='tr \040 \012'
-NL2SP='tr \015\012 \040\040'
-
-# 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
-
-if test "$LTCONFIG_VERSION" != "$VERSION"; then
-  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-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/"
-
-# 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
-
-      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
-      ;;
-    *)
-      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"
-    exit 0
-    ;;
-
-  --config)
-    sed -n -e '/^### BEGIN LIBTOOL CONFIG/,/^### END LIBTOOL CONFIG/p' < "$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" ;;
-
-  --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 test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    case $nonopt in
-    *cc | *++ | gcc* | *-gcc*)
-      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=
-    prev=
-    lastarg=
-    srcfile="$nonopt"
-    suppress_output=
-
-    user_target=no
-    for arg
-    do
-      case $prev in
-      "") ;;
-      xcompiler)
-	# Aesthetically quote the previous argument.
-	prev=
-	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-
-	case $arg in
-	# Double-quote args containing other shell metacharacters.
-	# Many Bourne shells cannot handle close brackets correctly
-	# in scan sets, so we specify it separately.
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-
-	# Add the previous argument to base_compile.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
-
-      # Accept any command-line options.
-      case $arg in
-      -o)
-	if test "$user_target" != "no"; then
-	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	  exit 1
-	fi
-	user_target=next
-	;;
-
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	lastarg=
-	IFS="${IFS= 	}"; 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.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
-
-      case $user_target in
-      next)
-	# The next one is the -o target name
-	user_target=yes
-	continue
-	;;
-      yes)
-	# We got the output file
-	user_target=set
-	libobj="$arg"
-	continue
-	;;
-      esac
-
-      # Accept the current argument as the source file.
-      lastarg="$srcfile"
-      srcfile="$arg"
-
-      # Aesthetically quote the previous argument.
-
-      # Backslashify any backslashes, double quotes, and dollar signs.
-      # These are the only characters that are still specially
-      # interpreted inside of double-quoted scrings.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      case $lastarg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      # Add the previous argument to base_compile.
-      if test -z "$base_compile"; then
-	base_compile="$lastarg"
-      else
-	base_compile="$base_compile $lastarg"
-      fi
-    done
-
-    case $user_target in
-    set)
-      ;;
-    no)
-      # Get the name of the library object.
-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    *)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSfmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.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
-      "$CC "*) ;;
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
-      *)
-        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 "*)
-              # 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
-              ;;
-	    "`$echo $CC` "*)
-	      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 invokation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      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=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-
-    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=
-
-    # 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
-	  ;;
-	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 | egrep "^# 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
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi
-
-      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: not more than one -exported-symbols argument allowed"
-	  exit 1
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      # 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*)
-	  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 "$arg" = "-lc"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # These systems don't actually have c library (as such)
-	    continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  esac
-	elif test "$arg" = "-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have math library (as such)
-	    continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody math library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	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
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	IFS="${IFS= 	}"; 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=
-	IFS="${IFS= 	}"; 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
-	;;
-
-      # 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
-	;;
-
-      *.$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 | egrep "^# 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
-	;;
-      esac
-
-      # 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
-
-    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
-      "$CC "*) ;;
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
-      *)
-        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 "*)
-              # The compiler in $compile_command matches
-              # the one in the tagged configuration.
-              # Assume this is the tagged configuration we want.
-              tagname=$z
-              break
-	      ;;
-	    "`$echo $CC` "*)
-	      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
-
-    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
-      case "$libs " in
-      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-      esac
-      libs="$libs $deplib"
-    done
-
-    if test $linkmode = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    uninst_deplibs= # uninstalled libtool libraries
-    uninst_path= # paths that contain uninstalled 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; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    # Search the libtool library
-	    lib="$searchdir/lib${name}.la"
-	    if test -f "$lib"; then
-	      found=yes
-	      break
-	    fi
-	  done
-	  if test "$found" != yes; then
-	    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
-	  ;;
-	-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
-	  continue
-	  ;;
-	-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: This library needs some functionality provided by $deplib."
-	      echo "*** I have the capability to make that library automatically link in when"
-	      echo "*** you link to this library.  But I can only do this if you have a"
-	      echo "*** shared version of the library, which you do not appear to have."
-	    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
-	  ;;
-	*.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
-	if test $found = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	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 variable installed.
-	installed=yes
-
-	# 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"
-	  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"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test $linkmode != prog && test $linkmode != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
-	  fi
-	  continue
-	fi
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$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
-
-	# 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
-	  uninst_path="$uninst_path $abs_ladir"
-	fi
-	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
-
-	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
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-	  continue
-	fi
-
-	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
-
-	  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
-	    uninst_deplibs="$uninst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-	  if test $linkmode = lib && test "$hardcode_into_libs" = all; 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*)
-		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'"
-	      IFS="${IFS= 	}"; 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'"
-	      IFS="${IFS= 	}"; 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
-
-	  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"
-	      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"
-		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"
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      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 library needs some functionality provided by $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi
-
-	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"
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
-	    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="-L$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
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="-L$absdir"
-		fi
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi
-	fi
-      done
-      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
-	  # Make sure that $var contains only unique libraries
-	  # and add them in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    case "$deplib" in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    *)
-	      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
-      fi
-    done
-    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' 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 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 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' 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.
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	current="$2"
-	revision="$3"
-	age="$4"
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $revision in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $age in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	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)
-	  major=`expr $current - $age + 1`
-	  verstring="sgi$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test $loop != 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="sgi$major.$iface:$verstring"
-	  done
-
-	  # 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 != 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=
-	  verstring="0.0"
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      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 $uninst_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 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"
-	    ;;
-	  *)
- 	    # 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 behaviour.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $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" != "" -a "$name" != "0"; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		set dummy $deplib_matches
-		deplib_match=$2
-		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		  newdeplibs="$newdeplibs $i"
-		else
-		  droppeddeps=yes
-		  echo
-		  echo "*** Warning: This library needs some functionality provided by $i."
-		  echo "*** I have the capability to make that library automatically link in when"
-		  echo "*** you link to this library.  But I can only do this if you have a"
-		  echo "*** shared version of the library, which you do not appear to have."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occured in the first compile.  Let's try to salvage the situation:
-	    # Compile a seperate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	     # If $name is empty we are operating on a -L argument.
-	      if test "$name" != "" -a "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test $? -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    echo "*** Warning: This library needs some functionality provided by $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which you do not appear to have."
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "***  make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test "$name" != "" -a "$name" != "0"; then
-	      libname=`eval \\$echo \"$libname_spec\"`
-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		    for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | sed 10q \
-			 | egrep "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		    done
-	      done
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have."
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
-	     grep . >/dev/null; then
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    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 && 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"
-	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	  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 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 x$dlname = x; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-#	# Ensure that we have .o objects for linkers which dislike .lo
-#	# (e.g. aix) in case we are running --disable-static
-#	for obj in $libobjs; do
-#	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-#	  if test "X$xdir" = "X$obj"; then
-#	    xdir="."
-#	  else
-#	    xdir="$xdir"
-#	  fi
-#	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-#	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-#	  if test ! -f $xdir/$oldobj && test "$baseobj" != "$oldobj"; then
-#	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-#	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-#	  fi
-#	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    eval cmds=\"$export_symbols_cmds\"
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd" || exit $?
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test $status -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test $status -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	      libobjs="$libobjs "`find $xdir -name \*.$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 && test "$hardcode_into_libs" = all; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# 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
-        if len=`expr "X$cmds" : ".*"` &&
-           test $len -le $max_cmd_len; 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\"
-
-	  # 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.
-          IFS="${IFS= 	}"; 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
-        IFS="${IFS= 	}"; 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 && test "$hardcode_into_libs" = all; 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
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	    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\"
-      IFS="${IFS= 	}"; 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\"
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-#     else
-#	# Just create a symlink.
-#	$show $rm $libobj
-#	$run $rm $libobj
-#	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-#	if test "X$xdir" = "X$libobj"; then
-#	  xdir="."
-#	else
-#	  xdir="$xdir"
-#	fi
-#	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-#	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-#	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
-#	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit 0
-      ;;
-
-    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
-
-      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"
-
-      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="$objs$old_deplibs"
-	    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" | sort +2 | uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#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[] =
-{\
-"
-
-	    sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
-		-e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
-		  < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr_t) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  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 ;;
-	  *) exeext= ;;
-	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:
-  uninst_deplibs='$uninst_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 (eval \$relink_command); then :
-      else
-	$rm \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	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
-	# win32 systems need to use the prog path for dll
-	# lookup to work
-	*-*-cygwin* | *-*-pw32*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      # Export the path to the program.
-      PATH=\"\$progdir:\$PATH\"
-      export PATH
-
-      exec \$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  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="$objs$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test $status -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test $status -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print | $NL2SP`
-	done
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	eval cmds=\"$old_archive_from_new_cmds\"
-      else
-#	# Ensure that we have .o objects in place in case we decided
-#	# not to build a shared library, and have fallen back to building
-#	# static libs even though --disable-static was passed!
-#	for oldobj in $oldobjs; do
-#	  if test ! -f $oldobj; then
-#	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-#	    if test "X$xdir" = "X$oldobj"; then
-#	      xdir="."
-#	    else
-#	      xdir="$xdir"
-#	    fi
-#	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-#	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-#	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-#	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
-#	  fi
-#	done
-
-        eval cmds=\"$old_archive_cmds\"
-
-        if len=`expr "X$cmds" : ".*"` &&
-             test $len -le $max_cmd_len; 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
-          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
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-              eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-              objlist=
-            fi
-          done
-	  RANLIB=$save_RANLIB
-          oldobjs=$objlist
-          eval cmds=\"\$concat_cmds~$old_archive_cmds\"
-        fi
-      fi
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    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"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-
-      # 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) 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
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test $hardcode_into_libs = all &&
-	     test "$installed" = no && test $need_relink = yes; 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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	library_names=
-	old_library=
-	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 "$hardcode_into_libs" = all && test -n "$relink_command"; then
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    continue
-	  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 "$hardcode_into_libs" = all && 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\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# 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
-
-	# Do a test to see if this is really a libtool program.
-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  uninst_deplibs=
-	  relink_command=
-
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$uninst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-	    exit 1
-	  fi
-
-	  finalize=yes
-	  for lib in $uninst_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=
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  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" | $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" | $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\"
-      IFS="${IFS= 	}"; 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 $SHELL $0 --finish$current_libdirs
-      exit 1
-    fi
-
-    exit 0
-    ;;
-
-  # 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\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || 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 \`-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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	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 | egrep "^# 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 enviroment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now actually exec the command.
-      eval "exec \$cmd$args"
-
-      $echo "$modename: cannot exec \$cmd$args"
-      exit 1
-    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=
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -*) 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=
-
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$objdir"
-      else
-	objdir="$dir/$objdir"
-      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
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $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\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      eval cmds=\"$old_postuninstall_cmds\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-	      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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-          # Read the .lo file
-          . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-          if test -n "$pic_object" \
-             && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-          fi
-
-	  # Add non-PIC object to the list of files to remove.
-          if test -n "$non_pic_object" \
-             && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-          fi
-	fi
-	;;
-
-      *)
-	# Do a test to see if this is a libtool program.
-	if test $mode = clean &&
-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  relink_command=
-	  . $dir/$file
-
-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	  if test "$fast_install" = yes && test -n "$relink_command"; then
-	    rmfiles="$rmfiles $objdir/lt-$name"
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles
-    done
-
-    # 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 0
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$generic_help" 1>&2
-  exit 1
-fi # test -z "$show_help"
-
-# 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."
-  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
-  -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:
-### BEGIN LIBTOOL TAG CONFIG: CXX
-# Libtool was configured as follows, on host ekonomikrisis:
-#
-# AR="" AR_FLAGS="" LTCC="gcc" CC="c++" \
-# CFLAGS="-DNDEBUG -O2 -fno-exceptions -fno-check-new" CPPFLAGS="" \
-# MAGIC_CMD="" LD="/usr/bin/ld" LDFLAGS="" LIBS="" \
-# LN_S="ln -s" NM="/usr/bin/nm -B" RANLIB="ranlib" STRIP="strip" \
-# AS="" DLLTOOL="" OBJDUMP="" \
-# objext="" exeext="" reload_flag=" -r" \
-# deplibs_check_method="pass_all" \
-# file_magic_cmd="\$MAGIC_CMD" \
-#   admin/ltconfig -o libtool --cache-file=./config.cache --disable-shared --with-gcc --with-gnu-ld --enable-dlopen --build=i686-pc-linux-gnu --add-tag=CXX admin/ltcf-cxx.sh i686-pc-linux-gnu
-#
-# Compiler and other test output produced by ltconfig, useful for
-# debugging ltconfig, is in ./config.log if it exists.
-
-# The version of ltconfig that generated this script.
-LTCONFIG_VERSION="1.4a"
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=no
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to optimize for fast installation.
-fast_install=needless
-
-# The host system.
-host_alias=i686-pc-linux-gnu
-host=i686-pc-linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# A language-specific compiler.
-CC="c++"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# The linker used to build libraries.
-LD="/usr/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP=strip
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# 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=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=73729
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation ?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=yes
-
-# Whether dlopen of programs is supported.
-dlopen_self=yes
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=no
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# 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="\${libname}\${release}.so\$versuffix \${libname}\${release}.so\$major \$libname.so"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}.so\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects="/usr/lib/crti.o /usr/lib/gcc-lib/i386-linux/2.95.4/crtbeginS.o"
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects="/usr/lib/gcc-lib/i386-linux/2.95.4/crtendS.o /usr/lib/crtn.o"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps="-lstdc++ -lm -lgcc -lc -lgcc"
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc-lib/i386-linux/2.95.4"
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGISTW]\\)[ 	][ 	]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern char \\1;/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | sed 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-### END LIBTOOL TAG CONFIG: CXX
-
diff --git a/bibletime-doc/po/Makefile.am b/bibletime-doc/po/Makefile.am
deleted file mode 100644
index 6845461..0000000
--- a/bibletime-doc/po/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-#############################################
-# Only contain the pofiles that are finished.
-POFILES = de.po
-#############################################
-#POFILES = de.po fr.po nl.po it.po cs.po sk.po no.po
-#############################################
-
-PACKAGE=bibletime
-##EXTRA_DIST = $POFILES
-
-GMOFILES = $(POFILES:.po=.gmo)
-
-localedir = $(DESTDIR)$(kde_locale)
-MAINTAINERCLEANFILES = $(GMOFILES)
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-EXTRA_DIST = bibletime.pot $(POFILES) $(GMOFILES)
-
-all: all-yes
-install-data-local: install-yes
-
-SUFFIXES = .po .gmo
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	&& rm -f $$file && $(GMSGFMT) -o $$file $< 
-
-all-yes: $(GMOFILES)
-all-no:
-
-install-yes: all
-	@catalogs='$(GMOFILES)'; \
-	for cat in $$catalogs; do \
-	destdir=$(localedir); \
-	lang=`echo $$cat | sed 's/\.gmo//'`; \
-	name=$(PACKAGE).mo \
-	dir=$$destdir/$$lang/LC_MESSAGES; \
-	$(mkinstalldirs) $$dir; \
-	$(INSTALL_DATA) $$cat $$dir/$$name; \
-	  echo "installing $$cat as $$dir/$$name"; \
-	done
-
-install-no:
-
-uninstall-local:
-	@catalogs='$(GMOFILES)'; \
-	for cat in $$catalogs; do \
-	destdir=$(localedir); \
-	lang=`echo $$cat | sed 's/\.gmo//'`; \
-	name=$(PACKAGE).mo; \
-	dir=$$destdir/$$lang/LC_MESSAGES; \
-	rm -f $$cat $$dir/$$name; \
-	echo "removing $$dir/$$name" ; \
-	done
-
-merge:
-	@catalogs='$(POFILES)'; \
-	for cat in $$catalogs; do \
-	name=$(PACKAGE).pot ; \
-	echo $$cat $$name; \
-	msgmerge $$cat $$name > $$cat.new ; \
-	if diff $$cat $$cat.new; then \
-		rm $$cat.new;  \
-	else  \
-		mv $$cat.new $$cat ; \
-	fi; \
-	done
diff --git a/bibletime-doc/po/Makefile.in b/bibletime-doc/po/Makefile.in
deleted file mode 100644
index e949383..0000000
--- a/bibletime-doc/po/Makefile.in
+++ /dev/null
@@ -1,435 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-#############################################
-# Only contain the pofiles that are finished.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-POFILES = de.po
-#############################################
-#POFILES = de.po fr.po nl.po it.po cs.po sk.po no.po
-#############################################
-
-PACKAGE = bibletime
-
-GMOFILES = $(POFILES:.po=.gmo)
-
-localedir = $(DESTDIR)$(kde_locale)
-MAINTAINERCLEANFILES = $(GMOFILES)
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-EXTRA_DIST = bibletime.pot $(POFILES) $(GMOFILES)
-
-SUFFIXES = .po .gmo
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=pl.po sk.po de.gmo it.gmo sk.gmo hu.po it.po no.gmo no.po da.po cs.po fr.gmo fr.po de.po nl.gmo cs.gmo nl.po 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-.SUFFIXES: .gmo .po
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile
-	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = po
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu po/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-all: all-yes
-install-data-local: install-yes
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	&& rm -f $$file && $(GMSGFMT) -o $$file $< 
-
-all-yes: $(GMOFILES)
-all-no:
-
-install-yes: all
-	@catalogs='$(GMOFILES)'; \
-	for cat in $$catalogs; do \
-	destdir=$(localedir); \
-	lang=`echo $$cat | sed 's/\.gmo//'`; \
-	name=$(PACKAGE).mo \
-	dir=$$destdir/$$lang/LC_MESSAGES; \
-	$(mkinstalldirs) $$dir; \
-	$(INSTALL_DATA) $$cat $$dir/$$name; \
-	  echo "installing $$cat as $$dir/$$name"; \
-	done
-
-install-no:
-
-uninstall-local:
-	@catalogs='$(GMOFILES)'; \
-	for cat in $$catalogs; do \
-	destdir=$(localedir); \
-	lang=`echo $$cat | sed 's/\.gmo//'`; \
-	name=$(PACKAGE).mo; \
-	dir=$$destdir/$$lang/LC_MESSAGES; \
-	rm -f $$cat $$dir/$$name; \
-	echo "removing $$dir/$$name" ; \
-	done
-
-merge:
-	@catalogs='$(POFILES)'; \
-	for cat in $$catalogs; do \
-	name=$(PACKAGE).pot ; \
-	echo $$cat $$name; \
-	msgmerge $$cat $$name > $$cat.new ; \
-	if diff $$cat $$cat.new; then \
-		rm $$cat.new;  \
-	else  \
-		mv $$cat.new $$cat ; \
-	fi; \
-	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
-docs-am:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile
-	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime-doc/po/bibletime.pot b/bibletime-doc/po/bibletime.pot
deleted file mode 100644
index 8263ff2..0000000
--- a/bibletime-doc/po/bibletime.pot
+++ /dev/null
@@ -1,2704 +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: 2002-04-07 01:40+0200\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=CHARSET\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: bibletime/backend/cswordbackend.cpp:313
-#: bibletime/frontend/coptionsdialog.cpp:272
-msgid "Footnotes"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:315
-msgid "Strong's Numbers"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:317
-msgid "Headings"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:319
-msgid "Morphological Tags"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:321
-msgid "Lemmas"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:323
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:325
-msgid "Hebrew Cantillation"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:327
-msgid "Greek Accents"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:329
-msgid "Textual Variants"
-msgstr ""
-
-#: bibletime/main.cpp:110
-msgid "Enable debug messages"
-msgstr ""
-
-#: bibletime/main.cpp:111
-msgid "Ignore the startup profile saved after the last BibleTime execution."
-msgstr ""
-
-#: bibletime/main.cpp:119
-msgid "Bible study tool for KDE 2"
-msgstr ""
-
-#: bibletime/main.cpp:121
-msgid "(c)1999-2002, The BibleTime Team"
-msgstr ""
-
-#: bibletime/main.cpp:122
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-
-#: bibletime/main.cpp:130
-msgid "Project coordinator"
-msgstr ""
-
-#: bibletime/main.cpp:131
-msgid "Frontend, backend"
-msgstr ""
-
-#: bibletime/main.cpp:132
-msgid "Searchdialog"
-msgstr ""
-
-#: bibletime/main.cpp:138
-msgid "Icons, startlogo, banners"
-msgstr ""
-
-#: bibletime/main.cpp:141
-msgid "Handbook"
-msgstr ""
-
-#: bibletime/main.cpp:144
-msgid "Translation into Czech"
-msgstr ""
-
-#: bibletime/main.cpp:145
-msgid "Translation into Danish"
-msgstr ""
-
-#: bibletime/main.cpp:146
-msgid "Translation into Dutch"
-msgstr ""
-
-#: bibletime/main.cpp:148
-msgid "Translation into French"
-msgstr ""
-
-#: bibletime/main.cpp:149
-msgid "Translation into Hungarian"
-msgstr ""
-
-#: bibletime/main.cpp:150 bibletime/main.cpp:151
-msgid "Translation into Italian"
-msgstr ""
-
-#: bibletime/main.cpp:152
-msgid "Translation into Norwegian"
-msgstr ""
-
-#: bibletime/main.cpp:153
-msgid "Translation into Polish"
-msgstr ""
-
-#: bibletime/main.cpp:154
-msgid "Translation into Portoguese"
-msgstr ""
-
-#: bibletime/main.cpp:155
-msgid "Translation into Russian"
-msgstr ""
-
-#: bibletime/main.cpp:156
-msgid "Translation into Slovak"
-msgstr ""
-
-#: bibletime/main.cpp:157
-msgid "Translation into Spanish"
-msgstr ""
-
-#: bibletime/main.cpp:160
-msgid "Bible study HowTo"
-msgstr ""
-
-#: bibletime/main.cpp:185
-msgid "Starting BibleTime"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:59
-msgid "Creating BibleTime's GUI"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:77
-msgid "Initializing menu- and toolbars"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:81
-msgid "Clear printing queue"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:99 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:105
-msgid "Search in module(s)"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:111
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:297
-msgid "Remove selected item(s)"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:122
-msgid "&Show main index"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:137
-msgid "&Cascade"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:143
-msgid "&Tile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:149
-msgid "&Auto cascade"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:155
-msgid "A&uto Tile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:161
-msgid "&Close all"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:167
-msgid "&Save profile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:172
-msgid "&Load profile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:177
-msgid "&Configure profiles"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:183
-msgid "&Fullscreen mode"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:202
-msgid "&Handbook"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:208
-msgid "&Installation"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:214
-msgid "&Bible Study Howto"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:229
-msgid "&Daily tip"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:294
-msgid "Initializing Sword"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:341
-msgid "Initializing printing system"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:40
-msgid "style editor"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:63
-msgid "Name of style:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose the 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 (in point):"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:170
-msgid "Line style:"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:218
-#: bibletime/frontend/coptionsdialog.cpp:735
-#: bibletime/printing/cprintdialogpages.cpp:176
-#: bibletime/printing/cprinter.cpp:307 bibletime/printing/cprinter.cpp:316
-#: bibletime/printing/cstyle.cpp:180
-#: bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr ""
-
-#: bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:181
-msgid "Colored style for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:182
-msgid "Black&White for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:187
-msgid "unknown name"
-msgstr ""
-
-#: bibletime/dummy.h:166 bibletime/printing/cprintdialogpages.cpp:43
-#: bibletime/tooltipdef.h:166
-msgid "Styles"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:48
-msgid "Margins (in millimeter)"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Top"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Left"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Right"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:104
-msgid "List of style items:"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:192
-msgid "Print queue"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:203
-msgid "Choose a style"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:215
-msgid "Entries which should be printed:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:239
-#: bibletime/printing/cprintitemlist.cpp:44
-msgid "Module"
-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/frontend/chtmldialog.cpp:84
-msgid "Backward"
-msgstr ""
-
-#: bibletime/frontend/chtmldialog.cpp:102
-msgid "Forward"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:264
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid "Save text as HTML page ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid "Save text as plain text ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:501
-msgid "Choose a font:"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:505
-msgid "Choose font size"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:509
-msgid "Bold"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:513
-msgid "Underlined"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:522
-msgid "Justify"
-msgstr ""
-
-#: bibletime/frontend/cprofile.cpp:33
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:178
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:189
-msgid "unknown"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:214
-msgid "Bookmark to"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:539
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:241
-msgid "Language"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:549
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:243
-msgid "Unlock key"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-msgid "not set"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:532
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-msgid "Version"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:149
-msgid "Bibles"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:150
-msgid "Books"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:151
-msgid "Commentaries"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:152
-msgid "Lexicons"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:269
-msgid "Caption"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:277
-msgid "Main index"
-msgstr ""
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:278
-#: bibletime/tooltipdef.h:57
-msgid "Create a new folder"
-msgstr ""
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:281
-#: bibletime/tooltipdef.h:58
-msgid "Change this folder"
-msgstr ""
-
-#: bibletime/dummy.h:59 bibletime/frontend/groupmanager/cgroupmanager.cpp:285
-#: bibletime/tooltipdef.h:59
-msgid "Change this bookmark"
-msgstr ""
-
-#: bibletime/dummy.h:60 bibletime/frontend/groupmanager/cgroupmanager.cpp:288
-#: bibletime/tooltipdef.h:60
-msgid "Import bookmarks"
-msgstr ""
-
-#: bibletime/dummy.h:61 bibletime/frontend/groupmanager/cgroupmanager.cpp:291
-#: bibletime/tooltipdef.h:61
-msgid "Export bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:294
-msgid "Print bookmark"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-msgid "Search in selected module(s)"
-msgstr ""
-
-#: bibletime/dummy.h:63 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:63
-msgid "Unlock this module"
-msgstr ""
-
-#: bibletime/dummy.h:64 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:64
-msgid "About this module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Please enter here the description:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Change bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Please change the description of the item!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Change folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Please change the name of the group!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:536
-msgid "Location"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:544
-msgid "Writable"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:545
-msgid "yes"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Encoding"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:219
-#: bibletime/frontend/coptionsdialog.cpp:738
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Unicode"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "iso8859-1"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:564
-msgid "Features"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Enter name of folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Please enter the name of the folder!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "BibleTime - Unlock module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "Enter the key to unlock the module!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1148
-msgid "Import bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1156
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1159
-msgid "Import of bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1173
-msgid "Export bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid "BibleTime - Reset main index"
-msgstr ""
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:85
-msgid "Lexicon window"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:88
-msgid "Entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:100
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:89
-msgid "Text of entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:106
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:90
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:95
-msgid "Entry with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:100
-#: bibletime/frontend/presenters/cbookpresenter.cpp:98
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:103
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:92
-msgid "Selected text"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:109
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:98
-msgid "Entry as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:106
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:110
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:99
-msgid "Entry as HTML"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:112
-#: bibletime/frontend/presenters/cbookpresenter.cpp:109
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:113
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:102
-msgid "Lookup selected text in lexicon"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:114
-#: bibletime/frontend/presenters/cbookpresenter.cpp:111
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:115
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:104
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:270
-msgid "Copy..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:115
-#: bibletime/frontend/presenters/cbookpresenter.cpp:112
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:116
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:105
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:271
-msgid "Add to printing queue..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:116
-#: bibletime/frontend/presenters/cbookpresenter.cpp:113
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:117
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:106
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:272
-msgid "Save..."
-msgstr ""
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:259
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:267
-msgid "Next entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:260
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:270
-msgid "Previous entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:92
-msgid "Bible window"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:95
-msgid "Verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:96
-msgid "Text of verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:97
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:103
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:107
-msgid "Verse with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:98
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:104
-msgid "Chapter"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:108
-msgid "Chapter as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:109
-msgid "Chapter as HTML"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:327
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:343
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:413
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:432
-msgid "Next book"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:328
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:345
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:414
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:434
-msgid "Previous book"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:330
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:348
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:416
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:437
-msgid "Next chapter"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:331
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:350
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:417
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:439
-msgid "Previous chapter"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:333
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:353
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:419
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:442
-msgid "Next verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:334
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:355
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:420
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:444
-msgid "Previous verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:47
-msgid "Select additional modules"
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:126
-msgid "NONE"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:70
-msgid "Display options"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:73
-msgid "Use linebreaks"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:74
-msgid "Show versenumbers"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:663
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:76
-msgid "Show headings"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/frontend/coptionsdialog.cpp:653
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:78
-#: bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:658
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:80
-msgid "Show Strong's Numbers"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:668
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:83
-msgid "Show morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:673
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:85
-msgid "Show lemmas"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:678
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:87
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:683
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:89
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:688
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:91
-msgid "Show Greek accents"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:93
-msgid "Use alternative textual variant"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:80
-msgid "Synchronize..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-msgid "Edit entry..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:96
-msgid "Commentary window"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:232
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:392
-msgid "The text was not saved to the module. Save the changes now?"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:422
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:447
-msgid "Toggle synchronize button"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:511
-msgid "Save changes to module?"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:68
-msgid "Toggle tree..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:90
-msgid "Book window"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:200
-#: bibletime/frontend/presenters/cbookpresenter.cpp:208
-msgid "Toggle tree"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:173
-msgid "module not set"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:53
-msgid "Search properties"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:72
-msgid "Multiple Words"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:80
-msgid "Exact Search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:87
-msgid "Regular Expression"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:100
-msgid "Case Sensitive"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:104
-msgid "Search scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:108
-msgid "Search progress"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:113
-msgid "Current module:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:114
-msgid "Overall:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search Dialog"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Interrupt"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid "Choose modules"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-msgid "Choose the modules for the search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Search Text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Enter the text to search for"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "Search Result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "The result of your search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Graphical analysis of your search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "HTML files"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "Save Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:155
-msgid "BibleTime Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:156
-msgid "Search Text :"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:157
-msgid "Search Type :"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:158
-msgid "Search Scope:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:161
-msgid "Book"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:162
-msgid "Total Hits"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:186
-msgid "Created by"
-msgstr ""
-
-#: bibletime/dummy.h:112
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:112
-msgid "No scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:223
-msgid "Choose custom range"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:224
-msgid "Define range text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:225
-msgid "Range parsing results"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Range name"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Please enter a name for the new range"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Search result with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:152
-msgid "Appending keys to the printing queue ..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:166
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:195
-msgid "Copying search result to clipboard..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:181
-msgid "Saving the search result ..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:209
-msgid "Saving the search result..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:260
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:267
-msgid "Key"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:261
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:264
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:268
-msgid "Key with text"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid "Save key ..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid ""
-"Choose the module you want to use for the search. The tree on the left "
-"contains all available modules, the tree on the right the modules for the "
-"search. Use the two arrow buttons to add or remove modules from the right "
-"tree."
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:79
-msgid "The file does already exist!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:80
-msgid "Do you want to overwrite it?"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:96
-msgid "Sorry! But the file couldn't be saved!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:97
-msgid "Please check permissions etc. !"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-msgid "Save search result ..."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:68
-msgid "Optionsdialog"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#: bibletime/frontend/coptionsdialog.cpp:314
-msgid "Create new profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-msgid "Please enter the name of the new profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-msgid "Rename profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-msgid "Please enter the new name of the profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:170
-msgid "Startup"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:174
-msgid "Show tip of the day"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:184
-msgid "Show startuplogo"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:193
-msgid "Restore windows in workspace area"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid "Choose fonts"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid ""
-"The fonts you can choose here are used in the display windows. Use the drop-"
-"down box below to choose the area of application. Then select a font for it. "
-"Make sure the charset \"iso10646-1\" is available for the selected Unicode "
-"font.!"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:225
-msgid "The quick brown fox jumps over the lazy dog"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:238
-msgid "Colors"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:245
-msgid "Choose colors"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:246
-msgid ""
-"Choose the colors to change the look of the display windows to your own "
-"preferences. Some options like \"Words of Jesus\" do only apply to texts "
-"which support this special feature."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:252
-msgid "Text"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:257
-msgid "Background"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:262
-msgid "Highlighted verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:267
-msgid "Hyperlinks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:277
-msgid "Strong's numbers"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:282
-msgid "Morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:287
-msgid "Words of Jesus"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:297
-msgid "Profiles"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:302
-msgid "Manage your profiles"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:303
-msgid ""
-"Profiles define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. Don't forget "
-"that new profiles only work after you've saved something in them."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:318
-msgid "Delete selected profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:322
-msgid "Rename selected profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:340
-msgid "Accelerators"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:345
-msgid "Application wide"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:368
-msgid "Bible windows"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:381
-msgid "Commentary windows"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:394
-msgid "Lexicon windows"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:408
-msgid "Book windows"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:422
-msgid "Sword"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:425
-msgid "General"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:431
-#: bibletime/frontend/coptionsdialog.cpp:439
-msgid "Use key cache for lexicons"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:432
-msgid ""
-"BibleTime can create a key cache for lexicons, which speeds up opening large "
-"lexicon modules a lot. However these files consume some disk space (usually "
-"not much), and reside in $KDEHOME/share/apps/bibletime/cache."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:447
-msgid "Scrolling behaviour"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:448
-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/dummy.h:134 bibletime/frontend/coptionsdialog.cpp:454
-#: bibletime/tooltipdef.h:134
-msgid "Use down arrow to scroll to next verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:461
-msgid "Specify a language for biblical booknames"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:462
-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 "
-"choose. If you want to create a new locale, see http://www.crosswire.org/"
-"sword/develop for details."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:469
-msgid "Language for booknames"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:477
-msgid "English"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:495
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid "Default modules"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid ""
-"Default modules are used, when no module is specified. This may happen with "
-"references into modules like Bibles or Lexicons."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:505
-msgid "Default Bible"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:513
-msgid "Default Commentary"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:522
-msgid "Default Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:530
-msgid "Default Hebrew Strong's Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:538
-msgid "Default Greek Strong's Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:546
-msgid "Default Hebrew Morphological Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:553
-msgid "Default Greek Morphological Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:636
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid "Filter settings"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can choose the default settings of the various filter settings. You can "
-"change the settings in each display window, too."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:643
-msgid "Show line break after each verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:648
-msgid "Show verse numbers"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:693
-msgid "Use textual variants"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Printing..."
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Abort printing"
-msgstr ""
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr ""
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:3
-msgid ""
-"This is <B>BibleTime 1.1</B>!<BR>\n"
-"This version of BibleTime should have reached the state where it could\n"
-"be called stable, useful and user friendly!<BR>\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:9
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:13
-msgid ""
-"BibleTime 1.1 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:18
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:22
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:26
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>! \n"
-"It was written by Bob Harman and is a great help how to study the Bible.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:31
-msgid ""
-"The Bible has the power to \"comfort the afflicted\" and \"afflict the "
-"comfortable\". (Revelation 10:10)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:35
-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:39
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:43
-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:48
-msgid "That the Bible is truth. (John 17:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:52
-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:57
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:61
-msgid ""
-"It's possible to insert the text of bookmarks and references to verses or "
-"lexicon entries into the personal commentary editor by dropping them there.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:65
-msgid ""
-"By studying the Bible you will have no reason to stand ashamed before God. "
-"(2 Timothy 2:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:69
-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 optionsdialog.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:76
-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:80
-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:84
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:88
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the regular expression \"x | y | z\" for searching, which is "
-"equivalent to \"x OR y OR z\", e.g. \"pray | worship | supplicate\".\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:92
-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:96
-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:100
-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"
-"Now double click on it and drag the selected word on the foreign module in "
-"the main index.\n"
-"The search dialog will be opened with the word in the edit line.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:106
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:110
-msgid ""
-"Foreign modules (e.g. greek or hebrew) do often require a special unicode "
-"font to read them.\n"
-"Many of the fonts are available on www.crosswire.org or on the Sword CD.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:115
-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:119
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:123
-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:128
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:132
-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/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr ""
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr ""
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr ""
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr ""
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr ""
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr ""
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr ""
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr ""
-
-#: bibletime/dummy.h:37 bibletime/dummy.h:227 bibletime/tooltipdef.h:37
-#: bibletime/whatsthisdef.h:46
-msgid "Save current profile"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-msgid "Edit profiles"
-msgstr ""
-
-#: bibletime/dummy.h:39 bibletime/dummy.h:229 bibletime/tooltipdef.h:39
-#: bibletime/whatsthisdef.h:48
-msgid "Load a new profile"
-msgstr ""
-
-#: bibletime/dummy.h:40 bibletime/dummy.h:230 bibletime/tooltipdef.h:40
-#: bibletime/whatsthisdef.h:49
-msgid "Toggle fullscreen mode"
-msgstr ""
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Edit toolbar"
-msgstr ""
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "BibleTime's handbook"
-msgstr ""
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "BibleTime's installation documentation"
-msgstr ""
-
-#: bibletime/dummy.h:47 bibletime/tooltipdef.h:47
-msgid "BibleTime's Bible study HowTo"
-msgstr ""
-
-#: bibletime/dummy.h:48 bibletime/tooltipdef.h:48
-msgid "Enter \"What's this?\" mode"
-msgstr ""
-
-#: bibletime/dummy.h:49 bibletime/tooltipdef.h:49
-msgid "Send bugreport"
-msgstr ""
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-msgid "Show daily tips at startup"
-msgstr ""
-
-#: bibletime/dummy.h:51 bibletime/tooltipdef.h:51
-msgid "About BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:52 bibletime/tooltipdef.h:52
-msgid "About KDE"
-msgstr ""
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "The main index"
-msgstr ""
-
-#: bibletime/dummy.h:62 bibletime/tooltipdef.h:62
-msgid "Add bookmark to printing queue"
-msgstr ""
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "The working area"
-msgstr ""
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Show the next entry"
-msgstr ""
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Show the previous entry"
-msgstr ""
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-msgid "Jump to the next verse"
-msgstr ""
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-msgid "Jump to the previous verse"
-msgstr ""
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-msgid "Show the next chapter"
-msgstr ""
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-msgid "Show the previous chapter"
-msgstr ""
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-msgid "Show the next book"
-msgstr ""
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-msgid "Show the previous book"
-msgstr ""
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of books"
-msgstr ""
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of chapters"
-msgstr ""
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "List of verses"
-msgstr ""
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "List of entries"
-msgstr ""
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Scroll through the list"
-msgstr ""
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Edit this entry"
-msgstr ""
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Save this comment"
-msgstr ""
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Delete this comment"
-msgstr ""
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Comment up to"
-msgstr ""
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set bold"
-msgstr ""
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set italic"
-msgstr ""
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set underlined"
-msgstr ""
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set font"
-msgstr ""
-
-#: bibletime/dummy.h:90 bibletime/tooltipdef.h:90
-msgid "Set the color"
-msgstr ""
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Set the fontsize"
-msgstr ""
-
-#: bibletime/dummy.h:93 bibletime/tooltipdef.h:93
-msgid "Synchronize with Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Save as HTML"
-msgstr ""
-
-#: bibletime/dummy.h:98 bibletime/tooltipdef.h:98
-msgid "Copy to clipboard"
-msgstr ""
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-msgid "Choose the modules to search in"
-msgstr ""
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "Add the selected module to the list"
-msgstr ""
-
-#: bibletime/dummy.h:103 bibletime/tooltipdef.h:103
-msgid "Remove the selected module from the list"
-msgstr ""
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "List of modules used for the search"
-msgstr ""
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-msgid "Search for this text"
-msgstr ""
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search multiple words"
-msgstr ""
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Exact match"
-msgstr ""
-
-#: bibletime/dummy.h:109 bibletime/tooltipdef.h:109
-msgid "Search with GNU regular expressions"
-msgstr ""
-
-#: bibletime/dummy.h:110 bibletime/tooltipdef.h:110
-msgid "Search case sensitive"
-msgstr ""
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Last search result"
-msgstr ""
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-msgid "Use custom scope"
-msgstr ""
-
-#: bibletime/dummy.h:115 bibletime/tooltipdef.h:115
-msgid "Add a new scope"
-msgstr ""
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Delete this search scope"
-msgstr ""
-
-#: bibletime/dummy.h:117 bibletime/dummy.h:307 bibletime/tooltipdef.h:117
-#: bibletime/whatsthisdef.h:126
-msgid "Edit and define your search scopes"
-msgstr ""
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Choose a search scope from the list"
-msgstr ""
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Enter your own search scope"
-msgstr ""
-
-#: bibletime/dummy.h:120 bibletime/tooltipdef.h:120
-msgid "Parsed result"
-msgstr ""
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Close this dialog"
-msgstr ""
-
-#: bibletime/dummy.h:123 bibletime/tooltipdef.h:123
-msgid "Used modules"
-msgstr ""
-
-#: bibletime/dummy.h:124 bibletime/tooltipdef.h:124
-msgid "Items found"
-msgstr ""
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Preview"
-msgstr ""
-
-#: bibletime/dummy.h:127 bibletime/tooltipdef.h:127
-msgid "Graphical Search Analysis"
-msgstr ""
-
-#: bibletime/dummy.h:131 bibletime/tooltipdef.h:131
-msgid "Show daily tip"
-msgstr ""
-
-#: bibletime/dummy.h:132 bibletime/tooltipdef.h:132
-msgid "List of languages"
-msgstr ""
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-msgid "Show start-up logo"
-msgstr ""
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Restore the windows in the workspace on startup"
-msgstr ""
-
-#: bibletime/dummy.h:137 bibletime/tooltipdef.h:137
-msgid "Use cache files for the lexicon entries"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "The default bible used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:139 bibletime/tooltipdef.h:139
-msgid "The default commentary used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "The default lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "The default Hebrew lexicon used in the workspace are"
-msgstr ""
-
-#: bibletime/dummy.h:142 bibletime/tooltipdef.h:142
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:143 bibletime/tooltipdef.h:143
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Set keyboard accelerators"
-msgstr ""
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "Choose the area of application"
-msgstr ""
-
-#: bibletime/dummy.h:150 bibletime/dummy.h:337 bibletime/tooltipdef.h:150
-#: bibletime/whatsthisdef.h:156
-msgid "Choose a font"
-msgstr ""
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Color of the background"
-msgstr ""
-
-#: bibletime/dummy.h:153 bibletime/tooltipdef.h:153
-msgid "Color of the highlighted verse"
-msgstr ""
-
-#: bibletime/dummy.h:155 bibletime/tooltipdef.h:155
-msgid "Keyboard accelerators used by all display windows"
-msgstr ""
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Keyboard accelerators used by Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Keyboard accelerators used by commentary windows"
-msgstr ""
-
-#: bibletime/dummy.h:158 bibletime/tooltipdef.h:158
-msgid "Keyboard accelerators used by lexicon windows"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Start printing"
-msgstr ""
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-msgid "Preview print job"
-msgstr ""
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Open help"
-msgstr ""
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "List of print items"
-msgstr ""
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Move item up"
-msgstr ""
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Move item down"
-msgstr ""
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Delete items"
-msgstr ""
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "Insert a page break"
-msgstr ""
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Page borders"
-msgstr ""
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Left border"
-msgstr ""
-
-#: bibletime/dummy.h:175 bibletime/tooltipdef.h:175
-msgid "Right border"
-msgstr ""
-
-#: bibletime/dummy.h:176 bibletime/tooltipdef.h:176
-msgid "Upper border"
-msgstr ""
-
-#: bibletime/dummy.h:177 bibletime/tooltipdef.h:177
-msgid "Lower border"
-msgstr ""
-
-#: bibletime/dummy.h:178 bibletime/tooltipdef.h:178
-msgid "List of print styles"
-msgstr ""
-
-#: bibletime/dummy.h:179 bibletime/tooltipdef.h:179
-msgid "Delete the selected style"
-msgstr ""
-
-#: bibletime/dummy.h:180 bibletime/tooltipdef.h:180
-msgid "Edit the selected style"
-msgstr ""
-
-#: bibletime/dummy.h:181 bibletime/tooltipdef.h:181
-msgid "Create a new printing style"
-msgstr ""
-
-#: bibletime/dummy.h:209 bibletime/whatsthisdef.h:28
-msgid ""
-"Clear the print queue of BibleTime. All items will be removed from the list "
-"and the print button will be disabled."
-msgstr ""
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:29
-msgid ""
-"Open the printer dialog of BibleTime.  Here you can edit the print queue and "
-"assign styles to the items."
-msgstr ""
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr ""
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:32
-msgid "Open the search dialog to search for text in one or more modules."
-msgstr ""
-
-#: bibletime/dummy.h:214 bibletime/whatsthisdef.h:33
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder, "
-"the subitems of it will be removed too."
-msgstr ""
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:34
-msgid ""
-"Reset the main index.<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:36
-msgid "Toggle the main index view."
-msgstr ""
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:37
-msgid "Toggle the main toolbar view."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:38
-msgid "Toggle footnotes in the modules."
-msgstr ""
-
-#: bibletime/dummy.h:220 bibletime/whatsthisdef.h:39
-msgid "Toggle Strong's numbers in the modules."
-msgstr ""
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:41
-msgid "Tile the open display windows."
-msgstr ""
-
-#: bibletime/dummy.h:223 bibletime/whatsthisdef.h:42
-msgid "Automatically tile the display windows."
-msgstr ""
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:43
-msgid "Cascade the open display windows."
-msgstr ""
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:44
-msgid "Automatically cascade the opened display windows."
-msgstr ""
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr ""
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:47
-msgid "Edit profiles..."
-msgstr ""
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:52
-msgid "Open the BibleTime tool bar editor."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:53
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:55
-msgid ""
-"Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr ""
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:56
-msgid ""
-"Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The "
-"installation instructions explain how to set up BibleTime and the text "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:57
-msgid ""
-"Open KDE's helpbrowser with the Bible study HowTo included with BibleTime."
-"<BR>This HowTo is an introduction how to study the Bible in an efficient way."
-msgstr ""
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:58
-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/dummy.h:240 bibletime/whatsthisdef.h:59
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr ""
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:60
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:242 bibletime/whatsthisdef.h:61
-msgid "Show detailed information about BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:243 bibletime/whatsthisdef.h:62
-msgid "Show the \"about\" dialog of KDE 2."
-msgstr ""
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:66
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:67
-msgid ""
-"Create a new folder in the main index.<BR>If you press the right mouse "
-"button on a folder, the new folder will become a sub-folder of it."
-"<BR>Otherwise you will create a toplevel folder."
-msgstr ""
-
-#: bibletime/dummy.h:249 bibletime/whatsthisdef.h:68
-msgid "Change the properties of the selected folder."
-msgstr ""
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:69
-msgid "Change the properties of the selected bookmark."
-msgstr ""
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:70
-msgid "Import bookmarks from a file."
-msgstr ""
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:71
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:72
-msgid ""
-"Use this to add this bookmark to BibleTime's print queue. The key, the "
-"description, and the text of the key will be used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:73
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:74
-msgid "Open a dialog to show information about the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:77
-msgid ""
-"This area is the main workspace of Bibletime.<BR>All display windows are "
-"opened in this window."
-msgstr ""
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:79
-msgid "The next entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:80
-msgid "The previous entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:81
-msgid ""
-"For Bible texts, the next verse will be highlighted.<BR>In commentaries, the "
-"next entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:263 bibletime/whatsthisdef.h:82
-msgid ""
-"For Bible texts, the previous verse will be highlighted. In commentaries,  "
-"the previous entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:83
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:84
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:85
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:86
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:87
-msgid "This list contains the books which are available in this module."
-msgstr ""
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:88
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr ""
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:89
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:90
-msgid "This list contains the entries of the current module."
-msgstr ""
-
-#: bibletime/dummy.h:272 bibletime/whatsthisdef.h:91
-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/dummy.h:273 bibletime/whatsthisdef.h:92
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-
-#: bibletime/dummy.h:274 bibletime/whatsthisdef.h:93
-msgid "Save new personal comments."
-msgstr ""
-
-#: bibletime/dummy.h:275 bibletime/whatsthisdef.h:94
-msgid "Clear the text and delete the entry from the module."
-msgstr ""
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:95
-msgid "Toggle bold formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:96
-msgid "Toggle italic formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:97
-msgid "Toggle underlined formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:279 bibletime/whatsthisdef.h:98
-msgid "Choose a new font for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:280 bibletime/whatsthisdef.h:99
-msgid "Choose a new color for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:100
-msgid "Choose a new fontsize for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:102
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:105
-msgid "Save the displayed chapter as an HTML file."
-msgstr ""
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:106
-msgid "Select all text."
-msgstr ""
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:107
-msgid "Copy the displayed text to the clipboard."
-msgstr ""
-
-#: bibletime/dummy.h:291 bibletime/whatsthisdef.h:110
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two buttons "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:111
-msgid "Add the selected module to the list on the right."
-msgstr ""
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:112
-msgid "Remove the selected module from the list on the right side."
-msgstr ""
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:113
-msgid "The list of modules used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:115
-msgid ""
-"The text entered in this edit box will be searched for in all selected "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:297 bibletime/whatsthisdef.h:116
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit box above "
-"is searched as a single word."
-msgstr ""
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:117
-msgid ""
-"Select this to search for exactly the same text you entered in the edit box."
-msgstr ""
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:118
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:119
-msgid "Activate this to use a case sensitive search."
-msgstr ""
-
-#: bibletime/dummy.h:302 bibletime/whatsthisdef.h:121
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr ""
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:122
-msgid ""
-"Select this if you want to use the last search result as the search scope."
-msgstr ""
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:123
-msgid "Create a new search scope."
-msgstr ""
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:124
-msgid ""
-"Use a custom scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-
-#: bibletime/dummy.h:306 bibletime/whatsthisdef.h:125
-msgid "Use this button to delete the chosen search scope."
-msgstr ""
-
-#: bibletime/dummy.h:308 bibletime/whatsthisdef.h:127
-msgid "Choose a search scope from the combo box"
-msgstr ""
-
-#: bibletime/dummy.h:309 bibletime/whatsthisdef.h:128
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:129
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:130
-msgid "Close this dialog and save the changes."
-msgstr ""
-
-#: bibletime/dummy.h:313 bibletime/whatsthisdef.h:132
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-
-#: bibletime/dummy.h:314 bibletime/whatsthisdef.h:133
-msgid "This contains the items found in the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:134
-msgid "This text box shows a preview of the chosen item."
-msgstr ""
-
-#: bibletime/dummy.h:317 bibletime/whatsthisdef.h:136
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-
-#: bibletime/dummy.h:320 bibletime/whatsthisdef.h:139
-msgid "Activate this box to see a daily tip on startup."
-msgstr ""
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:140
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:141
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr ""
-
-#: bibletime/dummy.h:323 bibletime/whatsthisdef.h:142
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr ""
-
-#: bibletime/dummy.h:324 bibletime/whatsthisdef.h:143
-msgid ""
-"Save the windows in the workspace if BibleTime is closed<BR>and restore them "
-"on the next startup. "
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:145
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This will speed up opening the lexicons a lot, but consume some disk space. "
-"Recommended."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:146
-msgid "The default Bible is used when a hyperlink into a Bible was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:147
-msgid ""
-"The default commentary is used when a hyperlink into a commentary was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:329 bibletime/whatsthisdef.h:148
-msgid "The default lexicon is used when a hyperlink into a lexicon was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:149
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon "
-"was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:150
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon was "
-"clicked"
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:151
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:152
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:154
-msgid "Select an action and change the key binding for the action."
-msgstr ""
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:155
-msgid ""
-"Use this box to select how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-
-#: bibletime/dummy.h:339 bibletime/whatsthisdef.h:158
-msgid "This is the background color used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:159
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:161
-msgid "Set the keyboard accelerators used in all display windows"
-msgstr ""
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:162
-msgid "Set keyboard accelerators used in Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:163
-msgid "Set the keyboard accelerators used in commentary windows"
-msgstr ""
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:164
-msgid "Set the keyboard accelerators used in lexicon windows"
-msgstr ""
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:168
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:169
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:170
-msgid "Closes this dialog without doing anything else."
-msgstr ""
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:171
-msgid "Open the online help of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:173
-msgid "This combo box contains the available print styles."
-msgstr ""
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:174
-msgid "This is the list which contains the available print items."
-msgstr ""
-
-#: bibletime/dummy.h:356 bibletime/whatsthisdef.h:175
-msgid "Move the selected item up one item."
-msgstr ""
-
-#: bibletime/dummy.h:357 bibletime/whatsthisdef.h:176
-msgid "Move the selected item down one item."
-msgstr ""
-
-#: bibletime/dummy.h:358 bibletime/whatsthisdef.h:177
-msgid "Delete the selected items."
-msgstr ""
-
-#: bibletime/dummy.h:359 bibletime/whatsthisdef.h:178
-msgid ""
-"Inserts a page break into the list.<BR>The printer will start a new page."
-msgstr ""
-
-#: bibletime/dummy.h:361 bibletime/whatsthisdef.h:180
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr ""
-
-#: bibletime/dummy.h:362 bibletime/whatsthisdef.h:181
-msgid "The size of the border on the left side of the paper."
-msgstr ""
-
-#: bibletime/dummy.h:363 bibletime/whatsthisdef.h:182
-msgid "The size of the border on the right side of the paper."
-msgstr ""
-
-#: bibletime/dummy.h:364 bibletime/whatsthisdef.h:183
-msgid "The size of the border on the top of the paper."
-msgstr ""
-
-#: bibletime/dummy.h:365 bibletime/whatsthisdef.h:184
-msgid "The size of the border on the bottom of the paper."
-msgstr ""
-
-#: bibletime/dummy.h:366 bibletime/whatsthisdef.h:185
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-
-#: bibletime/dummy.h:367 bibletime/whatsthisdef.h:186
-msgid "Remove the selected printing style from the list."
-msgstr ""
-
-#: bibletime/dummy.h:368 bibletime/whatsthisdef.h:187
-msgid "Change the properties of the selected printing style."
-msgstr ""
-
-#: bibletime/dummy.h:369 bibletime/whatsthisdef.h:188
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr ""
diff --git a/bibletime-doc/po/cs.gmo b/bibletime-doc/po/cs.gmo
deleted file mode 100644
index 7f963ea..0000000
--- a/bibletime-doc/po/cs.gmo
+++ /dev/null
diff --git a/bibletime-doc/po/cs.po b/bibletime-doc/po/cs.po
deleted file mode 100644
index 8bbe26b..0000000
--- a/bibletime-doc/po/cs.po
+++ /dev/null
@@ -1,3330 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bibletime-1.0\n"
-"POT-Creation-Date: 2002-04-07 01:40+0200\n"
-"PO-Revision-Date: 2001-06-11 11:02GMT+1\n"
-"Last-Translator: Michal Rovnaník <Michal.Rovnanik@seznam.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.8\n"
-
-#: bibletime/backend/cswordbackend.cpp:313
-#: bibletime/frontend/coptionsdialog.cpp:272
-msgid "Footnotes"
-msgstr "Poznámky"
-
-#: bibletime/backend/cswordbackend.cpp:315
-#, fuzzy
-msgid "Strong's Numbers"
-msgstr "Strongova čísla"
-
-#: bibletime/backend/cswordbackend.cpp:317
-msgid "Headings"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:319
-msgid "Morphological Tags"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:321
-msgid "Lemmas"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:323
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:325
-#, fuzzy
-msgid "Hebrew Cantillation"
-msgstr "Orientace"
-
-#: bibletime/backend/cswordbackend.cpp:327
-msgid "Greek Accents"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:329
-msgid "Textual Variants"
-msgstr ""
-
-#: bibletime/main.cpp:110
-#, fuzzy
-msgid "Enable debug messages"
-msgstr "Povolit ladicí zprávy"
-
-#: bibletime/main.cpp:111
-msgid "Ignore the startup profile saved after the last BibleTime execution."
-msgstr ""
-
-#: bibletime/main.cpp:119
-msgid "Bible study tool for KDE 2"
-msgstr "Nástroj pro studium Bible pro KDE 2"
-
-#: bibletime/main.cpp:121
-#, fuzzy
-msgid "(c)1999-2002, The BibleTime Team"
-msgstr "(c)1999-2001, The BibleTime Team"
-
-#: bibletime/main.cpp:122
-#, fuzzy
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-"BibleTime je snadno použitelný, ale mocný nástroj pro studium Bible pro "
-"prostředí KDE 2.\n"
-"\n"
-"Hledáme nové programátory, překladatele a autory příručky.\n"
-"Pokud se chcete připojit, napište e-mail na adresu info@bibletime.de"
-
-#: bibletime/main.cpp:130
-#, fuzzy
-msgid "Project coordinator"
-msgstr "Koordinátor projektu, uživatelské rozhraní, backend"
-
-#: bibletime/main.cpp:131
-#, fuzzy
-msgid "Frontend, backend"
-msgstr "Uživatelské rozhraní, backend, různé"
-
-#: bibletime/main.cpp:132
-#, fuzzy
-msgid "Searchdialog"
-msgstr "Hledání"
-
-#: bibletime/main.cpp:138
-msgid "Icons, startlogo, banners"
-msgstr ""
-
-#: bibletime/main.cpp:141
-msgid "Handbook"
-msgstr "Příručka"
-
-#: bibletime/main.cpp:144
-msgid "Translation into Czech"
-msgstr "Překlad do češtiny"
-
-#: bibletime/main.cpp:145
-msgid "Translation into Danish"
-msgstr "Překlad do dánštiny"
-
-#: bibletime/main.cpp:146
-msgid "Translation into Dutch"
-msgstr "Překlad do holandštiny"
-
-#: bibletime/main.cpp:148
-msgid "Translation into French"
-msgstr "Překlad do francouzštiny"
-
-#: bibletime/main.cpp:149
-msgid "Translation into Hungarian"
-msgstr "Překlad do maďarštiny"
-
-#: bibletime/main.cpp:150 bibletime/main.cpp:151
-msgid "Translation into Italian"
-msgstr "Překlad do italštiny"
-
-#: bibletime/main.cpp:152
-msgid "Translation into Norwegian"
-msgstr "Překlad do norštiny"
-
-#: bibletime/main.cpp:153
-msgid "Translation into Polish"
-msgstr "Překlad do polštiny"
-
-#: bibletime/main.cpp:154
-msgid "Translation into Portoguese"
-msgstr "Překlad do portugalštiny"
-
-#: bibletime/main.cpp:155
-#, fuzzy
-msgid "Translation into Russian"
-msgstr "Překlad do maďarštiny"
-
-#: bibletime/main.cpp:156
-msgid "Translation into Slovak"
-msgstr "Překlad do slovenštiny"
-
-#: bibletime/main.cpp:157
-#, fuzzy
-msgid "Translation into Spanish"
-msgstr "Překlad do dánštiny"
-
-#: bibletime/main.cpp:160
-msgid "Bible study HowTo"
-msgstr "Návod, jak studovat Bibli"
-
-#: bibletime/main.cpp:185
-#, fuzzy
-msgid "Starting BibleTime"
-msgstr "O aplikaci BibleTime"
-
-#: bibletime/bibletime_init.cpp:59
-#, fuzzy
-msgid "Creating BibleTime's GUI"
-msgstr "Ukončit BibleTime"
-
-#: bibletime/bibletime_init.cpp:77
-msgid "Initializing menu- and toolbars"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:81
-msgid "Clear printing queue"
-msgstr "Vyprázdnit tiskovou frontu"
-
-#: bibletime/bibletime_init.cpp:99 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr "Reset hlavního seznamu"
-
-#: bibletime/bibletime_init.cpp:105
-msgid "Search in module(s)"
-msgstr "Hledat v modulu (-ech)"
-
-#: bibletime/bibletime_init.cpp:111
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:297
-msgid "Remove selected item(s)"
-msgstr "Odstranit zvolenou (-é) položku (-y)"
-
-#: bibletime/bibletime_init.cpp:122
-msgid "&Show main index"
-msgstr "&Hlavní seznam"
-
-#: bibletime/bibletime_init.cpp:137
-msgid "&Cascade"
-msgstr "&Kaskádovat"
-
-#: bibletime/bibletime_init.cpp:143
-msgid "&Tile"
-msgstr "&Vydláždit"
-
-#: bibletime/bibletime_init.cpp:149
-msgid "&Auto cascade"
-msgstr "&Automaticky kaskádovat"
-
-#: bibletime/bibletime_init.cpp:155
-msgid "A&uto Tile"
-msgstr "A&utomaticky dláždit"
-
-#: bibletime/bibletime_init.cpp:161
-msgid "&Close all"
-msgstr "&Zavřít vše"
-
-#: bibletime/bibletime_init.cpp:167
-#, fuzzy
-msgid "&Save profile"
-msgstr "Vytvořit novou složku"
-
-#: bibletime/bibletime_init.cpp:172
-#, fuzzy
-msgid "&Load profile"
-msgstr "Vytvořit novou složku"
-
-#: bibletime/bibletime_init.cpp:177
-#, fuzzy
-msgid "&Configure profiles"
-msgstr "Nastavení barev pro BibleTime"
-
-#: bibletime/bibletime_init.cpp:183
-#, fuzzy
-msgid "&Fullscreen mode"
-msgstr "Aktuální modul:"
-
-#: bibletime/bibletime_init.cpp:202
-#, fuzzy
-msgid "&Handbook"
-msgstr "Příručka"
-
-#: bibletime/bibletime_init.cpp:208
-msgid "&Installation"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:214
-#, fuzzy
-msgid "&Bible Study Howto"
-msgstr "Návod, jak studovat Bibli"
-
-#: bibletime/bibletime_init.cpp:229
-msgid "&Daily tip"
-msgstr "&Tip dne"
-
-#: bibletime/bibletime_init.cpp:294
-msgid "Initializing Sword"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:341
-msgid "Initializing printing system"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:40
-msgid "style editor"
-msgstr "editor stylů"
-
-#: bibletime/printing/cstyleeditordialog.cpp:63
-msgid "Name of style:"
-msgstr "Jméno stylu:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose the part of the style:"
-msgstr "Zvolte část stylu:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:73
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Header"
-msgstr "Hlavička"
-
-#: bibletime/printing/cstyleeditordialog.cpp:74
-#: bibletime/printing/cstyleeditordialog.cpp:293
-msgid "Description"
-msgstr "Popis"
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-#: bibletime/printing/cstyleeditordialog.cpp:297
-msgid "Module text"
-msgstr "Text modulu"
-
-#: bibletime/printing/cstyleeditordialog.cpp:81
-msgid "Enable this part"
-msgstr "Povolit tuto část"
-
-#: bibletime/printing/cstyleeditordialog.cpp:104
-msgid "Foreground:"
-msgstr "Popředí:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:115
-msgid "Background:"
-msgstr "Pozadí:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:126
-msgid "Choose font"
-msgstr "Zvolte písmo"
-
-#: bibletime/printing/cstyleeditordialog.cpp:129
-msgid "Font preview"
-msgstr "Náhled písma"
-
-#: bibletime/printing/cstyleeditordialog.cpp:143
-msgid "Use frame"
-msgstr "Použít rámeček"
-
-#: bibletime/printing/cstyleeditordialog.cpp:154
-msgid "Line thickness (in point):"
-msgstr "Síla čáry (v bodech):"
-
-#: bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr "Barva rámečku:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:170
-#, fuzzy
-msgid "Line style:"
-msgstr "Jméno stylu:"
-
-#: bibletime/frontend/coptionsdialog.cpp:218
-#: bibletime/frontend/coptionsdialog.cpp:735
-#: bibletime/printing/cprintdialogpages.cpp:176
-#: bibletime/printing/cprinter.cpp:307 bibletime/printing/cprinter.cpp:316
-#: bibletime/printing/cstyle.cpp:180
-#: bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr "Standard"
-
-#: bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr "Jméno:"
-
-#: bibletime/printing/cstyle.cpp:181
-msgid "Colored style for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:182
-msgid "Black&White for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:187
-msgid "unknown name"
-msgstr "neznámé jméno"
-
-#: bibletime/dummy.h:166 bibletime/printing/cprintdialogpages.cpp:43
-#: bibletime/tooltipdef.h:166
-msgid "Styles"
-msgstr "Styly"
-
-#: bibletime/printing/cprintdialogpages.cpp:48
-msgid "Margins (in millimeter)"
-msgstr "Okraje (v milimetrech)"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Top"
-msgstr "&Horní"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Left"
-msgstr "&Levý"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Right"
-msgstr "&Pravý"
-
-#: bibletime/printing/cprintdialogpages.cpp:104
-msgid "List of style items:"
-msgstr "Seznam prvků stylu:"
-
-#: bibletime/printing/cprintdialogpages.cpp:192
-#, fuzzy
-msgid "Print queue"
-msgstr "Tiskárna"
-
-#: bibletime/printing/cprintdialogpages.cpp:203
-msgid "Choose a style"
-msgstr "Zvolte styl"
-
-#: bibletime/printing/cprintdialogpages.cpp:215
-msgid "Entries which should be printed:"
-msgstr "Tisknutelné záznamy:"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:239
-#: bibletime/printing/cprintitemlist.cpp:44
-msgid "Module"
-msgstr "Modul"
-
-#: bibletime/printing/cprintitemlist.cpp:45
-msgid "From"
-msgstr "Od"
-
-#: bibletime/printing/cprintitemlist.cpp:46
-msgid "To"
-msgstr "Do"
-
-#: bibletime/printing/cprintitemlist.cpp:47
-msgid "Style"
-msgstr "Styl"
-
-#: bibletime/frontend/chtmldialog.cpp:84
-#, fuzzy
-msgid "Backward"
-msgstr "Pozadí"
-
-#: bibletime/frontend/chtmldialog.cpp:102
-msgid "Forward"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr "Ok"
-
-#: bibletime/frontend/chtmlwidget.cpp:264
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr "Nemohu najít stránku %1!"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.html *.htm *.shtml *.shtm | HTML soubory\n"
-" *.* | Všechny soubory (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid "Save text as HTML page ..."
-msgstr "Uložit text jako HTML stránku ..."
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-"*.txt | Textové soubory (*.txt)\n"
-"*.* | Všechny soubory (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid "Save text as plain text ..."
-msgstr "Uložit stránku jako obyčejný text ..."
-
-#: bibletime/frontend/chtmlwidget.cpp:501
-msgid "Choose a font:"
-msgstr "Zvolte písmo:"
-
-#: bibletime/frontend/chtmlwidget.cpp:505
-msgid "Choose font size"
-msgstr "Zvolte velikost písma"
-
-#: bibletime/frontend/chtmlwidget.cpp:509
-msgid "Bold"
-msgstr "Tučné"
-
-#: bibletime/frontend/chtmlwidget.cpp:513
-msgid "Underlined"
-msgstr "Podtržené"
-
-#: bibletime/frontend/chtmlwidget.cpp:522
-msgid "Justify"
-msgstr "Zarovnat do bloku"
-
-#: bibletime/frontend/cprofile.cpp:33
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:178
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:189
-msgid "unknown"
-msgstr "neznámý"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:214
-msgid "Bookmark to"
-msgstr "Záložka na"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:539
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:241
-#, fuzzy
-msgid "Language"
-msgstr "Seznam jazyků"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:549
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:243
-msgid "Unlock key"
-msgstr "Odemykací klíč"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-msgid "not set"
-msgstr "není nastaveno"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:532
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-msgid "Version"
-msgstr "Verze"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:149
-msgid "Bibles"
-msgstr "Bible"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:150
-msgid "Books"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:151
-msgid "Commentaries"
-msgstr "Komentáře"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:152
-msgid "Lexicons"
-msgstr "Slovníky"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:269
-msgid "Caption"
-msgstr "Kapitola"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:277
-msgid "Main index"
-msgstr "Hlavní seznam"
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:278
-#: bibletime/tooltipdef.h:57
-msgid "Create a new folder"
-msgstr "Vytvořit novou složku"
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:281
-#: bibletime/tooltipdef.h:58
-msgid "Change this folder"
-msgstr "Změnit tuto složku"
-
-#: bibletime/dummy.h:59 bibletime/frontend/groupmanager/cgroupmanager.cpp:285
-#: bibletime/tooltipdef.h:59
-msgid "Change this bookmark"
-msgstr "Změnit tuto záložku"
-
-#: bibletime/dummy.h:60 bibletime/frontend/groupmanager/cgroupmanager.cpp:288
-#: bibletime/tooltipdef.h:60
-msgid "Import bookmarks"
-msgstr "Import záložek"
-
-#: bibletime/dummy.h:61 bibletime/frontend/groupmanager/cgroupmanager.cpp:291
-#: bibletime/tooltipdef.h:61
-msgid "Export bookmarks"
-msgstr "Export záložek"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:294
-msgid "Print bookmark"
-msgstr "Tisk záložek"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-msgid "Search in selected module(s)"
-msgstr "Hledat ve vybraných modulech"
-
-#: bibletime/dummy.h:63 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:63
-msgid "Unlock this module"
-msgstr "Odemknout tento modul"
-
-#: bibletime/dummy.h:64 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:64
-msgid "About this module"
-msgstr "O tomto modulu"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Bookmark description - BibleTime"
-msgstr "Popis záložky - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Please enter here the description:"
-msgstr "Sem prosím vložte popis:"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Change bookmark description - BibleTime"
-msgstr "Změna popisu záložky - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Please change the description of the item!"
-msgstr "Změňte prosím popis položky!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Change folder - BibleTime"
-msgstr "Změna složky - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Please change the name of the group!"
-msgstr "Změňte prosím jméno skupiny!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:536
-#, fuzzy
-msgid "Location"
-msgstr "Kapitola"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:544
-msgid "Writable"
-msgstr "Zapisovatelný"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:545
-#, fuzzy
-msgid "yes"
-msgstr "Styly"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Encoding"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:219
-#: bibletime/frontend/coptionsdialog.cpp:738
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Unicode"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "iso8859-1"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:564
-msgid "Features"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Enter name of folder - BibleTime"
-msgstr "Vložte jméno složky - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Please enter the name of the folder!"
-msgstr "Vložte prosím jméno složky!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "BibleTime - Unlock module"
-msgstr "BibleTime - Odemknutí modulu"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "Enter the key to unlock the module!"
-msgstr "Vložte klíč k odemknutí modulu!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1148
-msgid "Import bookmarks ..."
-msgstr "Import záložek ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1156
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Při importování záložek došlo k chybě!<BR>Formát záložek importovaného "
-"souboru je novější<BR>než verze formátu záložek této verze BibleTime!"
-"<BR><B>Import záložek nemusí proběhnout korektně!</B><BR>Chcete pokračovat?</"
-"qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1159
-msgid "Import of bookmarks"
-msgstr "Import záložek"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1173
-msgid "Export bookmarks ..."
-msgstr "Export záložek ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Tato funkce zruší nastavení hlavního seznamu!<BR>Dojde k obnovení "
-"původních skupin a smazání všech ostatních položek!<BR>Ujistěte se, že "
-"nepřijdete o důležité záložky!<BR>Chcete pokračovat?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid "BibleTime - Reset main index"
-msgstr "BibleTime - Reset hlavního seznamu"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:85
-msgid "Lexicon window"
-msgstr "Slovník"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:88
-msgid "Entry"
-msgstr "Záznam"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:100
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:89
-msgid "Text of entry"
-msgstr "Text záznamu"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:106
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:90
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:95
-msgid "Entry with text"
-msgstr "Záznam s textem"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:100
-#: bibletime/frontend/presenters/cbookpresenter.cpp:98
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:103
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:92
-msgid "Selected text"
-msgstr "Vybraný text"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:109
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:98
-msgid "Entry as plain text"
-msgstr "Záznam jako obyčejný text"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:106
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:110
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:99
-msgid "Entry as HTML"
-msgstr "Záznam jako HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:112
-#: bibletime/frontend/presenters/cbookpresenter.cpp:109
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:113
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:102
-msgid "Lookup selected text in lexicon"
-msgstr "Vyhledat vybraný text ve slovníku"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:114
-#: bibletime/frontend/presenters/cbookpresenter.cpp:111
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:115
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:104
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:270
-msgid "Copy..."
-msgstr "Kopírovat..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:115
-#: bibletime/frontend/presenters/cbookpresenter.cpp:112
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:116
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:105
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:271
-msgid "Add to printing queue..."
-msgstr "Přidat do tiskové fronty..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:116
-#: bibletime/frontend/presenters/cbookpresenter.cpp:113
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:117
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:106
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:272
-msgid "Save..."
-msgstr "Uložit..."
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:259
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:267
-#, fuzzy
-msgid "Next entry"
-msgstr "Text záznamu"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:260
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:270
-#, fuzzy
-msgid "Previous entry"
-msgstr "Předchozí záznam"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:92
-msgid "Bible window"
-msgstr "Bible"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:95
-msgid "Verse"
-msgstr "Verš"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:96
-msgid "Text of verse"
-msgstr "Text verše"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:97
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:103
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:107
-msgid "Verse with text"
-msgstr "Verš s textem"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:98
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:104
-msgid "Chapter"
-msgstr "Kapitolu"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:108
-msgid "Chapter as plain text"
-msgstr "Kapitolu jako obyčejný text"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:109
-msgid "Chapter as HTML"
-msgstr "Kapitolu jako HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:327
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:343
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:413
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:432
-#, fuzzy
-msgid "Next book"
-msgstr "Další kniha"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:328
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:345
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:414
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:434
-#, fuzzy
-msgid "Previous book"
-msgstr "Předchozí kniha"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:330
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:348
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:416
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:437
-#, fuzzy
-msgid "Next chapter"
-msgstr "Další kapitola"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:331
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:350
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:417
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:439
-#, fuzzy
-msgid "Previous chapter"
-msgstr "Předchozí kapitola"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:333
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:353
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:419
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:442
-#, fuzzy
-msgid "Next verse"
-msgstr "Text verše"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:334
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:355
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:420
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:444
-#, fuzzy
-msgid "Previous verse"
-msgstr "Předchozí verš"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:47
-msgid "Select additional modules"
-msgstr "Vybrat další moduly"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:126
-msgid "NONE"
-msgstr "Žádný modul"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:70
-#, fuzzy
-msgid "Display options"
-msgstr "Okno prohlížeče"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:73
-msgid "Use linebreaks"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:74
-#, fuzzy
-msgid "Show versenumbers"
-msgstr "Zobrazit Strongova čísla"
-
-#: bibletime/frontend/coptionsdialog.cpp:663
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:76
-msgid "Show headings"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/frontend/coptionsdialog.cpp:653
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:78
-#: bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr "Zobrazit poznámky"
-
-#: bibletime/frontend/coptionsdialog.cpp:658
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:80
-#, fuzzy
-msgid "Show Strong's Numbers"
-msgstr "Zobrazit Strongova čísla"
-
-#: bibletime/frontend/coptionsdialog.cpp:668
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:83
-msgid "Show morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:673
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:85
-msgid "Show lemmas"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:678
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:87
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:683
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:89
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:688
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:91
-msgid "Show Greek accents"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:93
-msgid "Use alternative textual variant"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:80
-msgid "Synchronize..."
-msgstr "Synchronizace..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-msgid "Edit entry..."
-msgstr "Změna záznamu..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:96
-msgid "Commentary window"
-msgstr "Komentář"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:232
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:392
-msgid "The text was not saved to the module. Save the changes now?"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:422
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:447
-msgid "Toggle synchronize button"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:511
-#, fuzzy
-msgid "Save changes to module?"
-msgstr "Hledání v modulech"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:68
-msgid "Toggle tree..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:90
-#, fuzzy
-msgid "Book window"
-msgstr "Bible"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:200
-#: bibletime/frontend/presenters/cbookpresenter.cpp:208
-#, fuzzy
-msgid "Toggle tree"
-msgstr "Aktuální modul:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr "Moduly:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr "Nalezené záznamy:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:173
-#, fuzzy
-msgid "module not set"
-msgstr "<I>není nastavený modul</I>"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:53
-msgid "Search properties"
-msgstr "Vlastnosti hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:72
-msgid "Multiple Words"
-msgstr "Více slov"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:80
-msgid "Exact Search"
-msgstr "Přesné hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:87
-msgid "Regular Expression"
-msgstr "Regulární výraz"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:100
-msgid "Case Sensitive"
-msgstr "Rozlišovat velikost"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:104
-msgid "Search scope"
-msgstr "Rozsah hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:108
-msgid "Search progress"
-msgstr "Postup hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:113
-msgid "Current module:"
-msgstr "Aktuální modul:"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:114
-msgid "Overall:"
-msgstr "Celkem:"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search Dialog"
-msgstr "Hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search"
-msgstr "Hledat"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Interrupt"
-msgstr "Přerušit"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid "Choose modules"
-msgstr "Volba modulů"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-msgid "Choose the modules for the search"
-msgstr "Zvolte moduly k prohledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Search Text"
-msgstr "Hledaný text"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Enter the text to search for"
-msgstr "Vložte hledaný text"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "Search Result"
-msgstr "Výsledek hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "The result of your search"
-msgstr "Výsledek Vašeho hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Search Analysis"
-msgstr "Analýza hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Graphical analysis of your search result"
-msgstr "Grafická analýza Vašeho hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "HTML files"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-#, fuzzy
-msgid "Save Search Analysis"
-msgstr "Analýza hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:155
-#, fuzzy
-msgid "BibleTime Search Analysis"
-msgstr "Analýza hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:156
-#, fuzzy
-msgid "Search Text :"
-msgstr "Hledaný text"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:157
-#, fuzzy
-msgid "Search Type :"
-msgstr "Hledaný text"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:158
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Rozsah hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:161
-msgid "Book"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:162
-msgid "Total Hits"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:186
-msgid "Created by"
-msgstr ""
-
-#: bibletime/dummy.h:112
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:112
-msgid "No scope"
-msgstr "Bez omezení"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr "Poslední výsledek"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr "Použít rozsah"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:223
-msgid "Choose custom range"
-msgstr "Zvolte požadovaný rozsah"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr "Upravit rozsahy"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr "Stará Smlouva"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr "Mojžíš/Pentateuch/Tóra"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr "Spisy"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr "Proroci"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr "Nová Smlouva"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr "Evangelia"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr "Epištoly/Dopisy"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr "Pavlovy epištoly"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:224
-msgid "Define range text"
-msgstr "Zadejte požadovaný rozsah"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:225
-msgid "Range parsing results"
-msgstr "Výsledek rozboru rozsahu"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Range name"
-msgstr "Jméno rozsahu"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Please enter a name for the new range"
-msgstr "Vložte prosím jméno pro nový rozsah"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr "Moduly"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr "Výsledek hledání"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Search result with text"
-msgstr "Výsledek hledání s textem"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:152
-#, fuzzy
-msgid "Appending keys to the printing queue ..."
-msgstr "Přidat do tiskové fronty..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:166
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:195
-#, fuzzy
-msgid "Copying search result to clipboard..."
-msgstr "Kopírovat do schránky"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:181
-#, fuzzy
-msgid "Saving the search result ..."
-msgstr "Uložit výsledek hledání ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:209
-#, fuzzy
-msgid "Saving the search result..."
-msgstr "Uložit výsledek hledání ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:260
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:267
-msgid "Key"
-msgstr "Odkaz"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:261
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:264
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:268
-msgid "Key with text"
-msgstr "Odkaz s textem"
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.txt | Textové soubory\n"
-" *.* | Všechny soubory (*.*)"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid "Save key ..."
-msgstr "Uložit klíč ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid ""
-"Choose the module you want to use for the search. The tree on the left "
-"contains all available modules, the tree on the right the modules for the "
-"search. Use the two arrow buttons to add or remove modules from the right "
-"tree."
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:79
-msgid "The file does already exist!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:80
-msgid "Do you want to overwrite it?"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:96
-msgid "Sorry! But the file couldn't be saved!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:97
-msgid "Please check permissions etc. !"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-msgid "Save search result ..."
-msgstr "Uložit výsledek hledání ..."
-
-#: bibletime/frontend/coptionsdialog.cpp:68
-msgid "Optionsdialog"
-msgstr "Nastavení"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#: bibletime/frontend/coptionsdialog.cpp:314
-#, fuzzy
-msgid "Create new profile"
-msgstr "Vytvořit novou složku"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#, fuzzy
-msgid "Please enter the name of the new profile"
-msgstr "Vložte prosím jméno složky!"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Rename profile"
-msgstr "Odstranit vybrané položky"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Please enter the new name of the profile"
-msgstr "Vložte prosím jméno složky!"
-
-#: bibletime/frontend/coptionsdialog.cpp:170
-#, fuzzy
-msgid "Startup"
-msgstr "Zobrazovat logo"
-
-#: bibletime/frontend/coptionsdialog.cpp:174
-msgid "Show tip of the day"
-msgstr "Zobrazovat tip dne"
-
-#: bibletime/frontend/coptionsdialog.cpp:184
-msgid "Show startuplogo"
-msgstr "Zobrazovat logo"
-
-#: bibletime/frontend/coptionsdialog.cpp:193
-msgid "Restore windows in workspace area"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-#, fuzzy
-msgid "Choose fonts"
-msgstr "Zvolte písmo"
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid ""
-"The fonts you can choose here are used in the display windows. Use the drop-"
-"down box below to choose the area of application. Then select a font for it. "
-"Make sure the charset \"iso10646-1\" is available for the selected Unicode "
-"font.!"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:225
-#, fuzzy
-msgid "The quick brown fox jumps over the lazy dog"
-msgstr "Žluťoučký kůň úpěl ďábelské ódy"
-
-#: bibletime/frontend/coptionsdialog.cpp:238
-msgid "Colors"
-msgstr "Barvy"
-
-#: bibletime/frontend/coptionsdialog.cpp:245
-#, fuzzy
-msgid "Choose colors"
-msgstr "Volba modulů"
-
-#: bibletime/frontend/coptionsdialog.cpp:246
-msgid ""
-"Choose the colors to change the look of the display windows to your own "
-"preferences. Some options like \"Words of Jesus\" do only apply to texts "
-"which support this special feature."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:252
-msgid "Text"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:257
-msgid "Background"
-msgstr "Pozadí"
-
-#: bibletime/frontend/coptionsdialog.cpp:262
-#, fuzzy
-msgid "Highlighted verse"
-msgstr "Zvýrazněný verš"
-
-#: bibletime/frontend/coptionsdialog.cpp:267
-#, fuzzy
-msgid "Hyperlinks"
-msgstr "Tisknout"
-
-#: bibletime/frontend/coptionsdialog.cpp:277
-msgid "Strong's numbers"
-msgstr "Strongova čísla"
-
-#: bibletime/frontend/coptionsdialog.cpp:282
-msgid "Morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:287
-msgid "Words of Jesus"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:297
-#, fuzzy
-msgid "Profiles"
-msgstr "Změna záznamu..."
-
-#: bibletime/frontend/coptionsdialog.cpp:302
-#, fuzzy
-msgid "Manage your profiles"
-msgstr "Nastavení barev pro BibleTime"
-
-#: bibletime/frontend/coptionsdialog.cpp:303
-msgid ""
-"Profiles define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. Don't forget "
-"that new profiles only work after you've saved something in them."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:318
-#, fuzzy
-msgid "Delete selected profile"
-msgstr "Smazání vybraných položek."
-
-#: bibletime/frontend/coptionsdialog.cpp:322
-#, fuzzy
-msgid "Rename selected profile"
-msgstr "Odstranit vybrané položky"
-
-#: bibletime/frontend/coptionsdialog.cpp:340
-msgid "Accelerators"
-msgstr "Zkratky"
-
-#: bibletime/frontend/coptionsdialog.cpp:345
-msgid "Application wide"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:368
-#, fuzzy
-msgid "Bible windows"
-msgstr "Bible"
-
-#: bibletime/frontend/coptionsdialog.cpp:381
-#, fuzzy
-msgid "Commentary windows"
-msgstr "Komentář"
-
-#: bibletime/frontend/coptionsdialog.cpp:394
-#, fuzzy
-msgid "Lexicon windows"
-msgstr "Slovník"
-
-#: bibletime/frontend/coptionsdialog.cpp:408
-#, fuzzy
-msgid "Book windows"
-msgstr "Bible"
-
-#: bibletime/frontend/coptionsdialog.cpp:422
-msgid "Sword"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:425
-msgid "General"
-msgstr "Obecné"
-
-#: bibletime/frontend/coptionsdialog.cpp:431
-#: bibletime/frontend/coptionsdialog.cpp:439
-msgid "Use key cache for lexicons"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:432
-msgid ""
-"BibleTime can create a key cache for lexicons, which speeds up opening large "
-"lexicon modules a lot. However these files consume some disk space (usually "
-"not much), and reside in $KDEHOME/share/apps/bibletime/cache."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:447
-msgid "Scrolling behaviour"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:448
-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/dummy.h:134 bibletime/frontend/coptionsdialog.cpp:454
-#: bibletime/tooltipdef.h:134
-#, fuzzy
-msgid "Use down arrow to scroll to next verse"
-msgstr "Použít šipku dolů pro skok na další verš"
-
-#: bibletime/frontend/coptionsdialog.cpp:461
-#, fuzzy
-msgid "Specify a language for biblical booknames"
-msgstr "Jazyk pro jména knih"
-
-#: bibletime/frontend/coptionsdialog.cpp:462
-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 "
-"choose. If you want to create a new locale, see http://www.crosswire.org/"
-"sword/develop for details."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:469
-msgid "Language for booknames"
-msgstr "Jazyk pro jména knih"
-
-#: bibletime/frontend/coptionsdialog.cpp:477
-msgid "English"
-msgstr "Angličtina"
-
-#: bibletime/frontend/coptionsdialog.cpp:495
-#: bibletime/frontend/coptionsdialog.cpp:500
-#, fuzzy
-msgid "Default modules"
-msgstr "Použité moduly"
-
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid ""
-"Default modules are used, when no module is specified. This may happen with "
-"references into modules like Bibles or Lexicons."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:505
-msgid "Default Bible"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:513
-#, fuzzy
-msgid "Default Commentary"
-msgstr "Komentáře"
-
-#: bibletime/frontend/coptionsdialog.cpp:522
-#, fuzzy
-msgid "Default Lexicon"
-msgstr "Slovníky"
-
-#: bibletime/frontend/coptionsdialog.cpp:530
-#, fuzzy
-msgid "Default Hebrew Strong's Lexicon"
-msgstr "Slovníky"
-
-#: bibletime/frontend/coptionsdialog.cpp:538
-#, fuzzy
-msgid "Default Greek Strong's Lexicon"
-msgstr "Slovníky"
-
-#: bibletime/frontend/coptionsdialog.cpp:546
-#, fuzzy
-msgid "Default Hebrew Morphological Lexicon"
-msgstr "Slovníky"
-
-#: bibletime/frontend/coptionsdialog.cpp:553
-#, fuzzy
-msgid "Default Greek Morphological Lexicon"
-msgstr "Slovníky"
-
-#: bibletime/frontend/coptionsdialog.cpp:636
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid "Filter settings"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can choose the default settings of the various filter settings. You can "
-"change the settings in each display window, too."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:643
-msgid "Show line break after each verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:648
-#, fuzzy
-msgid "Show verse numbers"
-msgstr "Zobrazit Strongova čísla"
-
-#: bibletime/frontend/coptionsdialog.cpp:693
-msgid "Use textual variants"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Printing..."
-msgstr "Tisk..."
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Abort printing"
-msgstr "Ukončit tisk"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr "&Hlavní seznam"
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr "&Okno"
-
-#: bibletime/tips-dummy.cpp:3
-msgid ""
-"This is <B>BibleTime 1.1</B>!<BR>\n"
-"This version of BibleTime should have reached the state where it could\n"
-"be called stable, useful and user friendly!<BR>\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:9
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:13
-msgid ""
-"BibleTime 1.1 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:18
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:22
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:26
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>! \n"
-"It was written by Bob Harman and is a great help how to study the Bible.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:31
-msgid ""
-"The Bible has the power to \"comfort the afflicted\" and \"afflict the "
-"comfortable\". (Revelation 10:10)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:35
-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:39
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:43
-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:48
-msgid "That the Bible is truth. (John 17:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:52
-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:57
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:61
-msgid ""
-"It's possible to insert the text of bookmarks and references to verses or "
-"lexicon entries into the personal commentary editor by dropping them there.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:65
-msgid ""
-"By studying the Bible you will have no reason to stand ashamed before God. "
-"(2 Timothy 2:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:69
-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 optionsdialog.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:76
-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:80
-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:84
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:88
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the regular expression \"x | y | z\" for searching, which is "
-"equivalent to \"x OR y OR z\", e.g. \"pray | worship | supplicate\".\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:92
-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:96
-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:100
-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"
-"Now double click on it and drag the selected word on the foreign module in "
-"the main index.\n"
-"The search dialog will be opened with the word in the edit line.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:106
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:110
-msgid ""
-"Foreign modules (e.g. greek or hebrew) do often require a special unicode "
-"font to read them.\n"
-"Many of the fonts are available on www.crosswire.org or on the Sword CD.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:115
-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:119
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:123
-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:128
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:132
-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/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr "Vyčištění tiskové fronty"
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr "Otevřít dialog pro tisk"
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr "Ukončit BibleTime"
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr "Hledání v modulech"
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr "Odstranit vybrané položky"
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr "Zobrazit hlavní seznam"
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr "Zobrazit nástrojovou lištu"
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr "Zobrazit Strongova čísla"
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr "Uspořádat okna"
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr "Automaticky uspořádávat okna"
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr "Kaskádovat okna"
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr "Automaticky kaskádovat okna"
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr "Zavřít všechna okna"
-
-#: bibletime/dummy.h:37 bibletime/dummy.h:227 bibletime/tooltipdef.h:37
-#: bibletime/whatsthisdef.h:46
-msgid "Save current profile"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-#, fuzzy
-msgid "Edit profiles"
-msgstr "Změna záznamu..."
-
-#: bibletime/dummy.h:39 bibletime/dummy.h:229 bibletime/tooltipdef.h:39
-#: bibletime/whatsthisdef.h:48
-#, fuzzy
-msgid "Load a new profile"
-msgstr "Vytvořit novou složku"
-
-#: bibletime/dummy.h:40 bibletime/dummy.h:230 bibletime/tooltipdef.h:40
-#: bibletime/whatsthisdef.h:49
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Aktuální modul:"
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Edit toolbar"
-msgstr "Upravit nástrojovou lištu"
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "BibleTime's handbook"
-msgstr "Příručka k BibleTime"
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "BibleTime's installation documentation"
-msgstr ""
-
-#: bibletime/dummy.h:47 bibletime/tooltipdef.h:47
-#, fuzzy
-msgid "BibleTime's Bible study HowTo"
-msgstr "Návod, jak studovat Bibli"
-
-#: bibletime/dummy.h:48 bibletime/tooltipdef.h:48
-msgid "Enter \"What's this?\" mode"
-msgstr "Přepnutí do režimu \"Co je to?\""
-
-#: bibletime/dummy.h:49 bibletime/tooltipdef.h:49
-msgid "Send bugreport"
-msgstr "Poslat chybové hlášení"
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-#, fuzzy
-msgid "Show daily tips at startup"
-msgstr "Zobrazit tip dne"
-
-#: bibletime/dummy.h:51 bibletime/tooltipdef.h:51
-msgid "About BibleTime"
-msgstr "O aplikaci BibleTime"
-
-#: bibletime/dummy.h:52 bibletime/tooltipdef.h:52
-msgid "About KDE"
-msgstr "Informace o prostředí KDE"
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "The main index"
-msgstr "Hlavní seznam"
-
-#: bibletime/dummy.h:62 bibletime/tooltipdef.h:62
-msgid "Add bookmark to printing queue"
-msgstr "Přidat záložku do tiskové fronty"
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "The working area"
-msgstr "Pracovní oblast"
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Show the next entry"
-msgstr "Další záznam"
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Show the previous entry"
-msgstr "Předchozí záznam"
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-#, fuzzy
-msgid "Jump to the next verse"
-msgstr "Další verš"
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-#, fuzzy
-msgid "Jump to the previous verse"
-msgstr "Předchozí verš"
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-#, fuzzy
-msgid "Show the next chapter"
-msgstr "Další kapitola"
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-#, fuzzy
-msgid "Show the previous chapter"
-msgstr "Předchozí kapitola"
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-#, fuzzy
-msgid "Show the next book"
-msgstr "Další kniha"
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-#, fuzzy
-msgid "Show the previous book"
-msgstr "Předchozí kniha"
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of books"
-msgstr "Seznam knih"
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of chapters"
-msgstr "Seznam kapitol"
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "List of verses"
-msgstr "Seznam veršů"
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "List of entries"
-msgstr "Seznam záznamů"
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Scroll through the list"
-msgstr "Listovat seznamem"
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Edit this entry"
-msgstr "Upravit tento záznam"
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Save this comment"
-msgstr "Uložit tento komentář"
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Delete this comment"
-msgstr "Smazat tento komentář"
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Comment up to"
-msgstr "Komentář platí až do"
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set bold"
-msgstr "Tučné"
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set italic"
-msgstr "Skloněné"
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set underlined"
-msgstr "Podtržené"
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set font"
-msgstr "Písmo"
-
-#: bibletime/dummy.h:90 bibletime/tooltipdef.h:90
-msgid "Set the color"
-msgstr "Barva"
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Set the fontsize"
-msgstr "Velikost písma"
-
-#: bibletime/dummy.h:93 bibletime/tooltipdef.h:93
-msgid "Synchronize with Bible windows"
-msgstr "Synchronizovat s Biblickými okny"
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Save as HTML"
-msgstr "Uložit jako HTML"
-
-#: bibletime/dummy.h:98 bibletime/tooltipdef.h:98
-msgid "Copy to clipboard"
-msgstr "Kopírovat do schránky"
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-#, fuzzy
-msgid "Choose the modules to search in"
-msgstr "Zvolte moduly k prohledání"
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "Add the selected module to the list"
-msgstr "Přidat vybraný modul do seznamu"
-
-#: bibletime/dummy.h:103 bibletime/tooltipdef.h:103
-msgid "Remove the selected module from the list"
-msgstr "Odebrat vybraný modul ze seznamu"
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "List of modules used for the search"
-msgstr "Seznam modulů pro hledání"
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-#, fuzzy
-msgid "Search for this text"
-msgstr "Hledaný text"
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search multiple words"
-msgstr "Hledat víceslovný výraz"
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Exact match"
-msgstr "Přesné hledání"
-
-#: bibletime/dummy.h:109 bibletime/tooltipdef.h:109
-msgid "Search with GNU regular expressions"
-msgstr "Hledat pomocí GNU regulárních výrazů"
-
-#: bibletime/dummy.h:110 bibletime/tooltipdef.h:110
-msgid "Search case sensitive"
-msgstr "Rozlišovat VELKÁ a malá písmena"
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Last search result"
-msgstr "Výsledek posledního hledání"
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-#, fuzzy
-msgid "Use custom scope"
-msgstr "Použít vlastní rozsah"
-
-#: bibletime/dummy.h:115 bibletime/tooltipdef.h:115
-msgid "Add a new scope"
-msgstr "Přidat nový rozsah"
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Delete this search scope"
-msgstr "Zrušit tento rozsah hledání"
-
-#: bibletime/dummy.h:117 bibletime/dummy.h:307 bibletime/tooltipdef.h:117
-#: bibletime/whatsthisdef.h:126
-msgid "Edit and define your search scopes"
-msgstr "Úprava nebo vytvoření vlastního rozsahu"
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Choose a search scope from the list"
-msgstr "Vyberte rozsah hledání ze seznamu"
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Enter your own search scope"
-msgstr "Vložte vlastní rozsah hledání"
-
-#: bibletime/dummy.h:120 bibletime/tooltipdef.h:120
-msgid "Parsed result"
-msgstr "Rozbor výsledku"
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Close this dialog"
-msgstr "Zavřít toto dialogové okno"
-
-#: bibletime/dummy.h:123 bibletime/tooltipdef.h:123
-msgid "Used modules"
-msgstr "Použité moduly"
-
-#: bibletime/dummy.h:124 bibletime/tooltipdef.h:124
-msgid "Items found"
-msgstr "Nalezené záznamy"
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Preview"
-msgstr "Náhled"
-
-#: bibletime/dummy.h:127 bibletime/tooltipdef.h:127
-#, fuzzy
-msgid "Graphical Search Analysis"
-msgstr "Grafická analýza"
-
-#: bibletime/dummy.h:131 bibletime/tooltipdef.h:131
-msgid "Show daily tip"
-msgstr "Zobrazit tip dne"
-
-#: bibletime/dummy.h:132 bibletime/tooltipdef.h:132
-msgid "List of languages"
-msgstr "Seznam jazyků"
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-#, fuzzy
-msgid "Show start-up logo"
-msgstr "Zobrazovat logo"
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Restore the windows in the workspace on startup"
-msgstr ""
-
-#: bibletime/dummy.h:137 bibletime/tooltipdef.h:137
-msgid "Use cache files for the lexicon entries"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "The default bible used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:139 bibletime/tooltipdef.h:139
-msgid "The default commentary used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "The default lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "The default Hebrew lexicon used in the workspace are"
-msgstr ""
-
-#: bibletime/dummy.h:142 bibletime/tooltipdef.h:142
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:143 bibletime/tooltipdef.h:143
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Set keyboard accelerators"
-msgstr "Nastavení klávesových zkratek"
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "Choose the area of application"
-msgstr "Zvolte oblast aplikace"
-
-#: bibletime/dummy.h:150 bibletime/dummy.h:337 bibletime/tooltipdef.h:150
-#: bibletime/whatsthisdef.h:156
-msgid "Choose a font"
-msgstr "Zvolte písmo"
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Color of the background"
-msgstr "Barva pozadí"
-
-#: bibletime/dummy.h:153 bibletime/tooltipdef.h:153
-msgid "Color of the highlighted verse"
-msgstr "Barva vybraného verše"
-
-#: bibletime/dummy.h:155 bibletime/tooltipdef.h:155
-#, fuzzy
-msgid "Keyboard accelerators used by all display windows"
-msgstr "Toto je barva pozadí okna prohlížeče."
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Keyboard accelerators used by Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Keyboard accelerators used by commentary windows"
-msgstr ""
-
-#: bibletime/dummy.h:158 bibletime/tooltipdef.h:158
-msgid "Keyboard accelerators used by lexicon windows"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Start printing"
-msgstr "Tisknout"
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-#, fuzzy
-msgid "Preview print job"
-msgstr "Aplikace pro náhled:"
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Open help"
-msgstr "Otevření nápovědy"
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "List of print items"
-msgstr "Seznam tisků"
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Move item up"
-msgstr "Přesunout nahoru"
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Move item down"
-msgstr "Přesunout dolů"
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Delete items"
-msgstr "Smazat položku"
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "Insert a page break"
-msgstr "Vložit zlom strany"
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Page borders"
-msgstr "Okraje stránky"
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Left border"
-msgstr "Levý okraj"
-
-#: bibletime/dummy.h:175 bibletime/tooltipdef.h:175
-msgid "Right border"
-msgstr "Pravý okraj"
-
-#: bibletime/dummy.h:176 bibletime/tooltipdef.h:176
-msgid "Upper border"
-msgstr "Horní okraj"
-
-#: bibletime/dummy.h:177 bibletime/tooltipdef.h:177
-msgid "Lower border"
-msgstr "Dolní okraj"
-
-#: bibletime/dummy.h:178 bibletime/tooltipdef.h:178
-#, fuzzy
-msgid "List of print styles"
-msgstr "Seznam tisků"
-
-#: bibletime/dummy.h:179 bibletime/tooltipdef.h:179
-#, fuzzy
-msgid "Delete the selected style"
-msgstr "Smazání vybraných položek."
-
-#: bibletime/dummy.h:180 bibletime/tooltipdef.h:180
-#, fuzzy
-msgid "Edit the selected style"
-msgstr "Smazání vybraných položek."
-
-#: bibletime/dummy.h:181 bibletime/tooltipdef.h:181
-msgid "Create a new printing style"
-msgstr "Vytvořit nový styl tisku"
-
-#: bibletime/dummy.h:209 bibletime/whatsthisdef.h:28
-#, fuzzy
-msgid ""
-"Clear the print queue of BibleTime. All items will be removed from the list "
-"and the print button will be disabled."
-msgstr ""
-"Vymazání tiskové fronty programu BibleTime. Všechny položky budou odstraněny "
-"ze seznamu, tlačítko tisku bude zablokováno."
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:29
-#, fuzzy
-msgid ""
-"Open the printer dialog of BibleTime.  Here you can edit the print queue and "
-"assign styles to the items."
-msgstr ""
-"Otevření dialogu pro tisk z programu BibleTime, kde můžete upravovat "
-"tiskovou frontu a nastavovat jednotlivým položkám styl tisku."
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr "Ukončení BibleTime a uložení nastavení."
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:32
-#, fuzzy
-msgid "Open the search dialog to search for text in one or more modules."
-msgstr ""
-"Otevření dialogového okna pro hledání textu v jednom nebo více modulech."
-
-#: bibletime/dummy.h:214 bibletime/whatsthisdef.h:33
-#, fuzzy
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder, "
-"the subitems of it will be removed too."
-msgstr ""
-"Odstranit vybranou položku z hlavního seznamu.<BR>Pokud odstraníte složku, "
-"budou zrušen i její obsah."
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:34
-#, fuzzy
-msgid ""
-"Reset the main index.<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-"Reset hlavního seznamu<BR>Všechny záložky a složky budou smazány a budou "
-"obnoveny původní složky."
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:36
-#, fuzzy
-msgid "Toggle the main index view."
-msgstr "Hlavní seznam"
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:37
-msgid "Toggle the main toolbar view."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:38
-msgid "Toggle footnotes in the modules."
-msgstr ""
-
-#: bibletime/dummy.h:220 bibletime/whatsthisdef.h:39
-#, fuzzy
-msgid "Toggle Strong's numbers in the modules."
-msgstr "Přepínač mezi zobrazením nebo skrytím Strongových čísel v modulech."
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:41
-#, fuzzy
-msgid "Tile the open display windows."
-msgstr "Zavře všechna otevřená okna."
-
-#: bibletime/dummy.h:223 bibletime/whatsthisdef.h:42
-#, fuzzy
-msgid "Automatically tile the display windows."
-msgstr "Automaticky uspořádávat okna"
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:43
-#, fuzzy
-msgid "Cascade the open display windows."
-msgstr "Zavře všechna otevřená okna."
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:44
-#, fuzzy
-msgid "Automatically cascade the opened display windows."
-msgstr "Automaticky kaskádovat okna"
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr "Zavře všechna otevřená okna."
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:47
-#, fuzzy
-msgid "Edit profiles..."
-msgstr "Změna záznamu..."
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:52
-msgid "Open the BibleTime tool bar editor."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:53
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr "Otevře dialogové okno, ve kterém můžete měnit většinu nastavení."
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:55
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr "Otevře nápovědu k programu BibleTime."
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:56
-msgid ""
-"Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The "
-"installation instructions explain how to set up BibleTime and the text "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:57
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with the Bible study HowTo included with BibleTime."
-"<BR>This HowTo is an introduction how to study the Bible in an efficient way."
-msgstr "Otevře nápovědu k programu BibleTime."
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:58
-#, fuzzy
-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 ""
-"Přepnutí ukazatele myši do módu <B>\"Co je toto?\"</B>.<BR>Všechny důležité "
-"prvky programu BibleTime nabízejí tuto nápovědu."
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:59
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr "Pošle chybové hlášení vývojářům programu BibleTime!"
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:60
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-"Zobrazení tipu dne.<BR>Tipy obsahují důležité biblické citace a užitečné "
-"tipy pro používání programu BibleTime."
-
-#: bibletime/dummy.h:242 bibletime/whatsthisdef.h:61
-msgid "Show detailed information about BibleTime."
-msgstr "Zobrazí detailní informace o programu BibleTime."
-
-#: bibletime/dummy.h:243 bibletime/whatsthisdef.h:62
-#, fuzzy
-msgid "Show the \"about\" dialog of KDE 2."
-msgstr "Zobrazí obecnou informaci o prostředí KDE 2."
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:66
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-"Toto je hlavní seznam.<BR>Umožňuje spravovat nainstalované moduly, pracovat "
-"se záložkami, otevírat okna prohlížečů apod."
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:67
-#, fuzzy
-msgid ""
-"Create a new folder in the main index.<BR>If you press the right mouse "
-"button on a folder, the new folder will become a sub-folder of it."
-"<BR>Otherwise you will create a toplevel folder."
-msgstr ""
-"Vytvoření nové složky v hlavním seznamu.<BR>Pokud jste pravé tlačítko myši "
-"stiskli nad složkou, bude nová složka její pod-složkou.<BR>Jinak se vytvoří "
-"nová hlavní složka."
-
-#: bibletime/dummy.h:249 bibletime/whatsthisdef.h:68
-msgid "Change the properties of the selected folder."
-msgstr "Změní vlastnosti vybrané složky."
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:69
-msgid "Change the properties of the selected bookmark."
-msgstr "Změní vlastnosti vybrané záložky."
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:70
-#, fuzzy
-msgid "Import bookmarks from a file."
-msgstr "Naimportuje záložky ze souboru."
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:71
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-"Vyexportuje záložky do souboru, takže Vy<BR>nebo jiní uživatelé si je budou "
-"moci později naimportovat."
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:72
-#, fuzzy
-msgid ""
-"Use this to add this bookmark to BibleTime's print queue. The key, the "
-"description, and the text of the key will be used for printing."
-msgstr ""
-"Tímto přidáte tuto záložku do tiskové fronty programu BibleTime. Vytištěn "
-"bude odkaz, popis a text odkazu."
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:73
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr "Otevře malé dialogové okno, ve kterém můžete odemknout vybraný modul."
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:74
-msgid "Open a dialog to show information about the selected module."
-msgstr "Otevře okno s informací o vybraném modulu."
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:77
-#, fuzzy
-msgid ""
-"This area is the main workspace of Bibletime.<BR>All display windows are "
-"opened in this window."
-msgstr ""
-"Tato oblast je pracovní plochou programu BibleTime.<BR>Všechna okna "
-"prohlížečů budou zobrazena na tomto místě."
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:79
-msgid "The next entry of the module will be shown."
-msgstr "Zobrazí se další záznam v modulu."
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:80
-msgid "The previous entry of the module will be shown."
-msgstr "Zobrazí se předchozí záznam v modulu."
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:81
-#, fuzzy
-msgid ""
-"For Bible texts, the next verse will be highlighted.<BR>In commentaries, the "
-"next entry will be shown."
-msgstr ""
-"Pokud prohlížíte text Bible, označí se následující verš.<BR>Při práci s "
-"komentářem se zobrazí další záznam."
-
-#: bibletime/dummy.h:263 bibletime/whatsthisdef.h:82
-#, fuzzy
-msgid ""
-"For Bible texts, the previous verse will be highlighted. In commentaries,  "
-"the previous entry will be shown."
-msgstr ""
-"Pokud prohlížíte text Bible, označí se předchozí verš.<BR>Při práci s "
-"komentářem se zobrazí předchozí záznam."
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:83
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr "Zobrazí následující kapitolu modulu. Bude vybrán první verš."
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:84
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr "Zobrazí předchozí kapitolu modulu. Bude vybrán první verš."
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:85
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr "Zobrazí následující knihu modulu, první kapitolu, první verš."
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:86
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr "Zobrazí předchozí knihu modulu, první kapitolu, první verš."
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:87
-msgid "This list contains the books which are available in this module."
-msgstr "Tento seznam obsahuje knihy dostupné v tomto modulu."
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:88
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr "Tento seznam obsahuje kapitoly dostupné v této knize."
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:89
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr "Tento seznam obsahuje verše dostupné v této kapitole."
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:90
-msgid "This list contains the entries of the current module."
-msgstr "Tento seznam obsahuje záznamy v tomto modulu."
-
-#: bibletime/dummy.h:272 bibletime/whatsthisdef.h:91
-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 ""
-"Toto tlačítko umožnuje jednoduše procházet položkami seznamu. Stiskněte "
-"tlačítko a pohybem myši vyberte požadovanou položku."
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:92
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-"Přepínání mezi módy \"čtení-zápis\" a \"pouze čtení\" u zapisovatelných "
-"modulů."
-
-#: bibletime/dummy.h:274 bibletime/whatsthisdef.h:93
-#, fuzzy
-msgid "Save new personal comments."
-msgstr "Uložení osobního komentáře."
-
-#: bibletime/dummy.h:275 bibletime/whatsthisdef.h:94
-msgid "Clear the text and delete the entry from the module."
-msgstr "Smazání textu a odstranění záznamu z modulu."
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:95
-#, fuzzy
-msgid "Toggle bold formatting of the selected text."
-msgstr "Přepínání mezi tučným a ne-tučným písmem."
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:96
-#, fuzzy
-msgid "Toggle italic formatting of the selected text."
-msgstr "Přepínání mezi kurzívou a ne-kurzívou."
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:97
-#, fuzzy
-msgid "Toggle underlined formatting of the selected text."
-msgstr "Přepínání mezi podtrženým a ne-podtrženým písmem."
-
-#: bibletime/dummy.h:279 bibletime/whatsthisdef.h:98
-msgid "Choose a new font for the selected text."
-msgstr "Nastavení jiného písma pro vybraný text."
-
-#: bibletime/dummy.h:280 bibletime/whatsthisdef.h:99
-msgid "Choose a new color for the selected text."
-msgstr "Nastavení jiné barvy pro vybraný text."
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:100
-msgid "Choose a new fontsize for the selected text."
-msgstr "Nastavení jiné velikosti písma pro vybraný text."
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:102
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-"Synchronizovat zobrazený komentář podle verše v aktivním biblickém okně."
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:105
-#, fuzzy
-msgid "Save the displayed chapter as an HTML file."
-msgstr "Uložit zobrazenou kapitolu jako HTML soubor."
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:106
-msgid "Select all text."
-msgstr "Vybrat celý text."
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:107
-msgid "Copy the displayed text to the clipboard."
-msgstr "Kopírovat zobrazený text do schránky."
-
-#: bibletime/dummy.h:291 bibletime/whatsthisdef.h:110
-#, fuzzy
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two buttons "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-"Zvolte moduly, které chcete prohledat.<BR>Pomocí tlačítek na pravé straně "
-"můžete přidávat/odebírat moduly do/ze seznamu."
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:111
-#, fuzzy
-msgid "Add the selected module to the list on the right."
-msgstr "Přidání vybraného modulu do seznamu."
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:112
-#, fuzzy
-msgid "Remove the selected module from the list on the right side."
-msgstr "Odstranění vybraného modulu ze seznamu."
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:113
-msgid "The list of modules used for the search."
-msgstr "Seznam modulů pro hledání."
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:115
-#, fuzzy
-msgid ""
-"The text entered in this edit box will be searched for in all selected "
-"modules."
-msgstr "Text, který sem napíšete, bude hledán ve všech modulech."
-
-#: bibletime/dummy.h:297 bibletime/whatsthisdef.h:116
-#, fuzzy
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit box above "
-"is searched as a single word."
-msgstr ""
-"Tato volba slouží pro hledání více slov.<BR>Každé zadané slovo bude hledáno "
-"samostatně."
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:117
-#, fuzzy
-msgid ""
-"Select this to search for exactly the same text you entered in the edit box."
-msgstr ""
-"Tato volba slouží pro hledání fráze.<BR>Zadaný text bude hledán jako celek."
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:118
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-"Tato volba slouží pro hledání pomocí standardních GNU regulárních výrazů."
-"<BR>Bližší popis regulárních výrazů naleznete v příručce."
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:119
-#, fuzzy
-msgid "Activate this to use a case sensitive search."
-msgstr "Zapněte, pokud chcete při hledání rozlišovat VELKÁ a malá písmena."
-
-#: bibletime/dummy.h:302 bibletime/whatsthisdef.h:121
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr "Vyberte, pokud chcete hledat v celém modulu (celých modulech)."
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:122
-#, fuzzy
-msgid ""
-"Select this if you want to use the last search result as the search scope."
-msgstr "Vyberte, pokud chcete jako rozsah použít výsledek posledního hledání."
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:123
-msgid "Create a new search scope."
-msgstr "Vytvoření nového rozsahu hledání."
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:124
-#, fuzzy
-msgid ""
-"Use a custom scope for the search.<BR>A standard set of search scopes exists."
-msgstr "Použít vlastní rozsah hledání.<BR>Existuje standardní balíček rozsahů."
-
-#: bibletime/dummy.h:306 bibletime/whatsthisdef.h:125
-msgid "Use this button to delete the chosen search scope."
-msgstr "Tímto tlačítkem smažete vybraný rozsah hledání."
-
-#: bibletime/dummy.h:308 bibletime/whatsthisdef.h:127
-msgid "Choose a search scope from the combo box"
-msgstr "Vyberte rozsah hledání ze seznamu."
-
-#: bibletime/dummy.h:309 bibletime/whatsthisdef.h:128
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-"Zadejte vlastní rozsah hledání.<BR>Pro oddělení čísla kapitoly od čísla "
-"verše použijte dvojtečku \":\", pro oddělení spodní a horní hranice použijte "
-"pomlčku \"-\" (např. Genesis - Exodus 3:4),<BR>pro oddělení několika bloků "
-"použijte středník \";\" (např. Genesis;Matouš)."
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:129
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-"Tento seznam obsahuje výsledek rozboru Vámi zadaného rozsahu. Tento výsledek "
-"bude použit pro hledání."
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:130
-msgid "Close this dialog and save the changes."
-msgstr "Zavření tohoto okna a uložení změn."
-
-#: bibletime/dummy.h:313 bibletime/whatsthisdef.h:132
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-"Seznam prohledávaných modulů.<BR>Kliknutím na modul zobrazíte výsledek "
-"hledání."
-
-#: bibletime/dummy.h:314 bibletime/whatsthisdef.h:133
-msgid "This contains the items found in the selected module."
-msgstr "Zde je seznam veršů nalezených ve vybraném modulu."
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:134
-msgid "This text box shows a preview of the chosen item."
-msgstr "Zde vidíte náhled nalezeného verše."
-
-#: bibletime/dummy.h:317 bibletime/whatsthisdef.h:136
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-"Grafická analýza výsledku hledání.<BR>Sloupce zobrazují počet nalezených "
-"výskytů pro každou knihu nebo komentář."
-
-#: bibletime/dummy.h:320 bibletime/whatsthisdef.h:139
-msgid "Activate this box to see a daily tip on startup."
-msgstr "Zapněte, pokud máte zájem o zobrazení tipu při spuštění BibleTime."
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:140
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr "Jazyky, ve kterých si můžete nechat zobrazovat názvy knih."
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:141
-#, fuzzy
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr "Zapněte, pokud máte zájem o zobrazení tipu při spuštění BibleTime."
-
-#: bibletime/dummy.h:323 bibletime/whatsthisdef.h:142
-#, fuzzy
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr "Vyberte, pokud chcete používat šipku dolů pro skok na další verš."
-
-#: bibletime/dummy.h:324 bibletime/whatsthisdef.h:143
-msgid ""
-"Save the windows in the workspace if BibleTime is closed<BR>and restore them "
-"on the next startup. "
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:145
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This will speed up opening the lexicons a lot, but consume some disk space. "
-"Recommended."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:146
-msgid "The default Bible is used when a hyperlink into a Bible was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:147
-msgid ""
-"The default commentary is used when a hyperlink into a commentary was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:329 bibletime/whatsthisdef.h:148
-msgid "The default lexicon is used when a hyperlink into a lexicon was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:149
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon "
-"was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:150
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon was "
-"clicked"
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:151
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:152
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:154
-#, fuzzy
-msgid "Select an action and change the key binding for the action."
-msgstr "Vyberte akci a změňte pro ni klávesovou zkratku."
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:155
-#, fuzzy
-msgid ""
-"Use this box to select how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-"Zde vyberte, pro jaký účel bude písmo použito a upravte jeho nastavení v "
-"nabídce."
-
-#: bibletime/dummy.h:339 bibletime/whatsthisdef.h:158
-msgid "This is the background color used in display windows."
-msgstr "Toto je barva pozadí okna prohlížeče."
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:159
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr "Toto je barva vybraného verše v okně prohlížeče."
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:161
-#, fuzzy
-msgid "Set the keyboard accelerators used in all display windows"
-msgstr "Toto je barva pozadí okna prohlížeče."
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:162
-#, fuzzy
-msgid "Set keyboard accelerators used in Bible windows"
-msgstr "Nastavení klávesových zkratek"
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:163
-#, fuzzy
-msgid "Set the keyboard accelerators used in commentary windows"
-msgstr "Nastavení klávesových zkratek"
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:164
-#, fuzzy
-msgid "Set the keyboard accelerators used in lexicon windows"
-msgstr "Nastavení klávesových zkratek"
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:168
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-"Spustí tisk.<BR>Položky v seznamu budou vytištěny podle přiřazených stylů."
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:169
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-"Tisk proběhne do dočasného souboru a otevře se prohlížeč postscriptu pro "
-"zobrazení náhledu tisku."
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:170
-#, fuzzy
-msgid "Closes this dialog without doing anything else."
-msgstr "Zavření tohoto okna bez následků pro položky nebo tiskárny."
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:171
-msgid "Open the online help of BibleTime."
-msgstr "Otevření nápovědy pro BibleTime."
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:173
-#, fuzzy
-msgid "This combo box contains the available print styles."
-msgstr "Toto je seznam dostupných tiskových stylů."
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:174
-msgid "This is the list which contains the available print items."
-msgstr "Tento seznam obsahuje tiskové úlohy."
-
-#: bibletime/dummy.h:356 bibletime/whatsthisdef.h:175
-#, fuzzy
-msgid "Move the selected item up one item."
-msgstr "Přesunutí položky o jednu pozici dolů."
-
-#: bibletime/dummy.h:357 bibletime/whatsthisdef.h:176
-#, fuzzy
-msgid "Move the selected item down one item."
-msgstr "Přesunutí položky o jednu pozici nahoru."
-
-#: bibletime/dummy.h:358 bibletime/whatsthisdef.h:177
-msgid "Delete the selected items."
-msgstr "Smazání vybraných položek."
-
-#: bibletime/dummy.h:359 bibletime/whatsthisdef.h:178
-#, fuzzy
-msgid ""
-"Inserts a page break into the list.<BR>The printer will start a new page."
-msgstr ""
-"Vložení tzv. stránkového zlomu.<BR>Tiskárna začne tisknout na další stranu."
-
-#: bibletime/dummy.h:361 bibletime/whatsthisdef.h:180
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr "Tato skupina obsahuje velikosti okrajů papíru (v milimetrech)."
-
-#: bibletime/dummy.h:362 bibletime/whatsthisdef.h:181
-#, fuzzy
-msgid "The size of the border on the left side of the paper."
-msgstr "Velikost levého okraje papíru."
-
-#: bibletime/dummy.h:363 bibletime/whatsthisdef.h:182
-#, fuzzy
-msgid "The size of the border on the right side of the paper."
-msgstr "Velikost pravého okraje papíru."
-
-#: bibletime/dummy.h:364 bibletime/whatsthisdef.h:183
-#, fuzzy
-msgid "The size of the border on the top of the paper."
-msgstr "Velikost horního okraje papíru."
-
-#: bibletime/dummy.h:365 bibletime/whatsthisdef.h:184
-#, fuzzy
-msgid "The size of the border on the bottom of the paper."
-msgstr "Velikost spodního okraje papíru."
-
-#: bibletime/dummy.h:366 bibletime/whatsthisdef.h:185
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-"Seznam dostupných stylů tisku.<BR>Tlačítkem \"Nový styl\" si můžete vytvořit "
-"svůj vlastní styl."
-
-#: bibletime/dummy.h:367 bibletime/whatsthisdef.h:186
-msgid "Remove the selected printing style from the list."
-msgstr "Odstranění vybraného stylu ze seznamu."
-
-#: bibletime/dummy.h:368 bibletime/whatsthisdef.h:187
-msgid "Change the properties of the selected printing style."
-msgstr "Změna vlastností vybraného stylu."
-
-#: bibletime/dummy.h:369 bibletime/whatsthisdef.h:188
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr "Vytvoření nového stylu.<BR>Nový styl bude přidán do seznamu."
-
-#~ msgid "Save verse with text as ..."
-#~ msgstr "Uložit verš s textem jako ..."
-
-#~ msgid "The bible window"
-#~ msgstr "Bible"
-
-#~ msgid "The commentary window"
-#~ msgstr "Komentář"
-
-#~ msgid "The lexicon window"
-#~ msgstr "Slovník"
-
-#~ msgid "The list of printers"
-#~ msgstr "Seznam tiskáren"
-
-#, fuzzy
-#~ msgid "Print to a file"
-#~ msgstr "Tisknout do souboru"
-
-#~ msgid "Browse for the file"
-#~ msgstr "Hledat soubor"
-
-#, fuzzy
-#~ msgid "Number of copies"
-#~ msgstr "&Počet kopií"
-
-#~ msgid "Paper type"
-#~ msgstr "Typ papíru"
-
-#~ msgid "Paper size"
-#~ msgstr "Velikost papíru"
-
-#~ msgid "This is the Bible display window"
-#~ msgstr "Toto je okno prohlížeče Bible."
-
-#~ msgid "This is the commentary display window."
-#~ msgstr "Toto je okno prohlížeče komentáře."
-
-#~ msgid "This is the lexicon display window."
-#~ msgstr "Toto je okno prohlížeče slovníku."
-
-#~ msgid ""
-#~ "This is the list of available printers of your system.<BR>Please select "
-#~ "the printer you want to use for printing."
-#~ msgstr ""
-#~ "Tento seznam obsahuje dostupné tiskárny.<BR>Vyberte tiskárnu, kterou "
-#~ "chcete použít."
-
-#, fuzzy
-#~ msgid "Print to a postscript file on disk."
-#~ msgstr "Vytiskne do souboru ve formátu PostScript."
-
-#, fuzzy
-#~ msgid "Browse for the file you want to print to."
-#~ msgstr "Výběr souboru, do kterého chcete tisknout."
-
-#, fuzzy
-#~ msgid "The number of copies for printing."
-#~ msgstr "Kolik se má vytisknout kopií."
-
-#, fuzzy
-#~ msgid "Choose the orientation of the paper."
-#~ msgstr "Vyberte orientaci tisku."
-
-#, fuzzy
-#~ msgid "Print on the paper using \"Portrait\" orientation."
-#~ msgstr "Tisknout jako \"portrét\"."
-
-#, fuzzy
-#~ msgid "Print on the paper using \"Landscape\" orientation."
-#~ msgstr "Tisknout jako \"krajinu\"."
-
-#~ msgid "The type of the paper which is used for printing."
-#~ msgstr "Typ papíru."
-
-#, fuzzy
-#~ msgid "The size of the paper used."
-#~ msgstr "Velikost papíru."
-
-#~ msgid "Search result for \"%1\" in module \"%2\"\n"
-#~ msgstr "Výsledek hledání \"%1\" v modulu \"%2\"\n"
-
-#~ msgid "Printdialog"
-#~ msgstr "Tisk"
-
-#~ msgid "The general options for printing"
-#~ msgstr "Obecné nastavení pro tisk"
-
-#~ msgid "Available printers:"
-#~ msgstr "Dostupné tiskárny:"
-
-#~ msgid "Host"
-#~ msgstr "Hostitel"
-
-#~ msgid "Comment"
-#~ msgstr "Komentář"
-
-#~ msgid "Print to file:"
-#~ msgstr "Tisk do souboru:"
-
-#~ msgid "&Number of copies"
-#~ msgstr "&Počet kopií"
-
-#~ msgid "Por&trait"
-#~ msgstr "Por&trét"
-
-#~ msgid "L&andscape"
-#~ msgstr "&Krajina"
-
-#~ msgid "Paper t&ype"
-#~ msgstr "&Typ papíru"
-
-#~ msgid "Size: 8888mm x 8888mm"
-#~ msgstr "Velikost: 8888mm x 8888mm"
-
-#~ msgid "Preview application:"
-#~ msgstr "Aplikace pro náhled:"
-
-#~ msgid "*.ps | Postscript files"
-#~ msgstr "*.ps | Postscriptové soubory"
-
-#~ msgid "A4"
-#~ msgstr "A4"
-
-#~ msgid "A5"
-#~ msgstr "A5"
-
-#~ msgid "Letter"
-#~ msgstr "Letter"
-
-#~ msgid "Legal"
-#~ msgstr "Legal"
-
-#~ msgid "Executive"
-#~ msgstr "Executive"
-
-#~ msgid "Layout specific settings"
-#~ msgstr "Zvláštní nastavení"
-
-#~ msgid "Entries"
-#~ msgstr "Záznamy"
-
-#~ msgid "Management of BibleTime's printing queue"
-#~ msgstr "Správa tiskové fronty pro BibleTime"
-
-#~ msgid "Size: %1mm x %2mm"
-#~ msgstr "Velikost: %1mm x %2mm"
-
-#~ msgid "Useful tips for BibleTime"
-#~ msgstr "Užitečné tipy pro BibleTime"
-
-#~ msgid "Run on startup"
-#~ msgstr "Spustit při startu"
-
-#, fuzzy
-#~ msgid "Language:"
-#~ msgstr "Seznam jazyků"
-
-#, fuzzy
-#~ msgid "Foonotes:"
-#~ msgstr "Poznámky"
-
-#~ msgid "Strong's numbers: %1<BR>"
-#~ msgstr "Strongova čísla: %1<BR>"
-
-#~ msgid "Unlock key:"
-#~ msgstr "Odemykací klíč:"
-
-#~ msgid "Version:"
-#~ msgstr "Verze:"
-
-#, fuzzy
-#~ msgid "Not necessary"
-#~ msgstr "<I>Není nutný!</I>"
-
-#~ msgid "Datapath"
-#~ msgstr "Cesta k datům"
-
-#~ msgid ""
-#~ "<qt><B>The file does already exist!</B><BR>Do you want to overwrite it?</"
-#~ "qt>"
-#~ msgstr "<qt><B>Soubor již existuje!</B><BR>Chcete jej přepsat?</qt>"
-
-#~ msgid "BibleTime - Save file as ..."
-#~ msgstr "BibleTime - Uložit soubor jako ..."
-
-#~ msgid "Printing %1"
-#~ msgstr "Tisk %1"
-
-#, fuzzy
-#~ msgid "Startup options"
-#~ msgstr "Tisknout"
-
-#, fuzzy
-#~ msgid "SWORD options"
-#~ msgstr "Tisknout"
-
-#, fuzzy
-#~ msgid "Configure BibleTime's key bindings"
-#~ msgstr "Nastavení klávesových zkratek"
-
-#, fuzzy
-#~ msgid "Display windows"
-#~ msgstr "Okno prohlížeče"
-
-#, fuzzy
-#~ msgid "General settings for display windows"
-#~ msgstr "Zavře všechna otevřená okna."
-
-#, fuzzy
-#~ msgid "Colors used in display windows"
-#~ msgstr "Zavře všechna otevřená okna."
-
-#~ msgid "Choose fonts for BibleTime"
-#~ msgstr "Výběr písem pro BibleTime"
-
-#~ msgid "Choose the area of application and set the font for it"
-#~ msgstr "Zvolte oblast a nastavte pro ni písmo"
-
-#, fuzzy
-#~ msgid "Accelerators used by all windows"
-#~ msgstr "Zavřít všechna okna"
-
-#, fuzzy
-#~ msgid "Accelerators for bible windows"
-#~ msgstr "Bible"
-
-#, fuzzy
-#~ msgid "Accelerators for commentary windows"
-#~ msgstr "Komentář"
-
-#, fuzzy
-#~ msgid "Accelerators for lexicon windows"
-#~ msgstr "Slovník"
-
-#, fuzzy
-#~ msgid "Initializing keyboard accelerators"
-#~ msgstr "Nastavení klávesových zkratek"
-
-#~ msgid "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-#~ msgstr "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-
-#~ msgid "Display window"
-#~ msgstr "Okno prohlížeče"
-
-#, fuzzy
-#~ msgid "Display window Unicode"
-#~ msgstr "Okno prohlížeče"
-
-#, fuzzy
-#~ msgid ""
-#~ "* | Text files\n"
-#~ " *.* | All files (*.*)"
-#~ msgstr ""
-#~ "*.txt | Textové soubory\n"
-#~ " *.* | Všechny soubory (*.*)"
-
-#~ msgid "Show a daily tip"
-#~ msgstr "Zobrazovat tip dne"
-
-#~ msgid "List of modules"
-#~ msgstr "Seznam modulů"
-
-#~ msgid "Show a preview"
-#~ msgstr "Zobrazit náhled"
-
-#~ msgid "Copies"
-#~ msgstr "Kopie"
-
-#~ msgid "List of styles"
-#~ msgstr "Seznam stylů"
-
-#~ msgid "Delete the chosen printing style"
-#~ msgstr "Smazat vybraný styl tisku"
-
-#~ msgid "Edit the chosen printing style"
-#~ msgstr "Upravit vybraný styl tisku"
-
-#~ msgid "Show or hide the main index depending on current state."
-#~ msgstr "Přepínač mezi zobrazením nebo skrytím hlavního seznamu."
-
-#~ msgid "Show or hide the main toolbar depending on current state."
-#~ msgstr "Přepínač mezi zobrazením nebo skrytím hlavní nástrojové lišty."
-
-#~ msgid ""
-#~ "Show or hide the footnotes in the modules deoending on current state."
-#~ msgstr "Přepínač mezi zobrazením nebo skrytím poznámek v modulech."
-
-#~ msgid "Arrange the opened display windows in a tile pattern."
-#~ msgstr "Uspořádá otevřená okna přehledně jako dlaždice."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a tile pattern if "
-#~ "it's necessary."
-#~ msgstr ""
-#~ "Otevřená okna budou automaticky uspořádávána jako dlaždice, pokud je to "
-#~ "potřeba."
-
-#~ msgid "Arrange the open display windows in a cascade pattern."
-#~ msgstr "Uspořádá otevřená okna do kaskády."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a cascade pattern "
-#~ "if it's necessary."
-#~ msgstr ""
-#~ "Otevřená okna budou automaticky uspořádávána do kaskády, pokud je to "
-#~ "potřeba."
-
-#~ msgid "Open a dialog where you can edit the toolbar of BibleTime."
-#~ msgstr "Otevře dialogové okno, ve kterém můžete upravit nástrojovou lištu."
-
-#~ msgid "Activate this to see a startup logo on each startup of BibleTime."
-#~ msgstr "Zapněte, pokud máte zájem o zobrazení loga při spuštění BibleTime."
-
-#~ msgid "This list contains the modules using foreign fonts."
-#~ msgstr "Tento seznam obsahuje moduly používající cizokrajná písma."
-
-#~ msgid "&Show footnotes"
-#~ msgstr "&Poznámky pod čarou"
-
-#~ msgid "S&how Strong's numbers"
-#~ msgstr "&Strongova čísla"
-
-#, fuzzy
-#~ msgid "Frontend"
-#~ msgstr "Písmo:"
-
-#~ msgid "handbook"
-#~ msgstr "příručka"
-
-#~ msgid "Martin Luther startup logo"
-#~ msgstr "Logo Martina Luthera"
-
-#~ msgid "Sponsor of www.bibletime.de"
-#~ msgstr "Sponzor www.bibletime.de"
-
-#~ msgid "backend"
-#~ msgstr "backend"
-
-#~ msgid ""
-#~ "Leader of the SWORD project.\n"
-#~ "Lots of help with the SWORD API!"
-#~ msgstr ""
-#~ "Vedoucí projektu SWORD.\n"
-#~ "Pomoc s API SWORDu!"
-
-#, fuzzy
-#~ msgid "Use down arrow to scroll to next verse."
-#~ msgstr "Použít šipku dolů pro skok na další verš."
-
-#~ msgid "Module fonts"
-#~ msgstr "Písma modulů"
-
-#~ msgid "Configure the fonts used for modules"
-#~ msgstr "Nastavení písem pro moduly"
-
-#~ msgid "Result with text"
-#~ msgstr "Výsledek s textem"
-
-#~ msgid "Left"
-#~ msgstr "Zarovnání vlevo"
-
-#~ msgid "Center"
-#~ msgstr "Zarovnání na střed"
-
-#~ msgid "Right"
-#~ msgstr "Zarovnání vpravo"
-
-#~ msgid "&Bottom"
-#~ msgstr "&Spodní"
-
-#~ msgid "Select all"
-#~ msgstr "Vybrat vše"
-
-#~ msgid "Configure BibleTime's general options"
-#~ msgstr "Obecná nastavení pro BibleTime"
-
-#~ msgid ""
-#~ "<DIV align=\"center\"><B>Missing tips!</B></DIV><BR><BR>Your installation "
-#~ "is missing the daily tips.\t\tPlease make sure all files of BibleTime are"
-#~ "\t\tinstalled and that the permissions of $KDEDIR are correct!<BR><BR>\t"
-#~ "\tIf you can't solve this problem please contact the team of BibleTime at"
-#~ "\t\t<A HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-#~ msgstr ""
-#~ "<DIV align=\"center\"><B>Tipy nenalezeny!</B></DIV><BR><BR>Ve Vaší "
-#~ "instalaci chybějí tipy dne.\t\tPřesvědčte se, že všechny soubory pro "
-#~ "BibleTime jsou\t\tnainstalovány a že práva k adresáři $KDEDIR jsou "
-#~ "správně!<BR><BR>\t\tPokud se Vám nedaří tento problém vyřešit, "
-#~ "kontaktujte nás prosím na adrese\t\t<A HREF=\"mailto:info@bibletime.de"
-#~ "\">info@bibletime.de</A>!"
-
-#~ msgid "Foonotes: %1<BR>"
-#~ msgstr "Poznámky: %1<BR>"
-
-#~ msgid "BibleTime - Help window"
-#~ msgstr "BibleTime - Nápověda"
-
-#~ msgid "Translation into Brazilian Portoguese"
-#~ msgstr "Překlad do brazilské portugalštiny"
diff --git a/bibletime-doc/po/da.po b/bibletime-doc/po/da.po
deleted file mode 100644
index 31e59a5..0000000
--- a/bibletime-doc/po/da.po
+++ /dev/null
@@ -1,2129 +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-06-10 20:57+0200\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=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr ""
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:72
-msgid "Clear printing queue"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:87 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:92
-msgid "Search in module(s)"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:97
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:312
-msgid "Remove selected item(s)"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:102
-msgid "&Show footnotes"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:107
-msgid "S&how Strong's numbers"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:116
-msgid "&Show main index"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:128
-msgid "&Cascade"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:133
-msgid "&Tile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:138
-msgid "&Auto cascade"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:143
-msgid "A&uto Tile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:148
-msgid "&Close all"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:169
-msgid "&Daily tip"
-msgstr ""
-
-#: bibletime/main.cpp:70
-msgid "Enable debug messages."
-msgstr ""
-
-#: bibletime/main.cpp:78
-msgid "Bible study tool for KDE 2"
-msgstr ""
-
-#: bibletime/main.cpp:80
-msgid "(c)1999-2001, The BibleTime Team"
-msgstr ""
-
-#: bibletime/main.cpp:81
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for new developers, translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-
-#: bibletime/main.cpp:87
-msgid "Project coordinator, frontend, backend"
-msgstr ""
-
-#: bibletime/main.cpp:88
-msgid "Frontend, backend, misc things"
-msgstr ""
-
-#: bibletime/main.cpp:91
-msgid "Handbook"
-msgstr ""
-
-#: bibletime/main.cpp:94
-msgid "Translation into Hungarian"
-msgstr ""
-
-#: bibletime/main.cpp:95 bibletime/main.cpp:104
-msgid "Translation into Italian"
-msgstr ""
-
-#: bibletime/main.cpp:96
-msgid "Translation into Polish"
-msgstr ""
-
-#: bibletime/main.cpp:97
-msgid "Translation into Danish"
-msgstr ""
-
-#: bibletime/main.cpp:98
-msgid "Translation into Norwegian"
-msgstr ""
-
-#: bibletime/main.cpp:99
-msgid "Translation into Brazilian Portoguese"
-msgstr ""
-
-#: bibletime/main.cpp:100
-msgid "Translation into Dutch"
-msgstr ""
-
-#: bibletime/main.cpp:101
-msgid "Translation into French"
-msgstr ""
-
-#: bibletime/main.cpp:102
-msgid "Translation into Czech"
-msgstr ""
-
-#: bibletime/main.cpp:103 bibletime/main.cpp:105
-msgid "Translation into Portoguese"
-msgstr ""
-
-#: bibletime/main.cpp:106
-msgid "Translation into Slovak"
-msgstr ""
-
-#: bibletime/main.cpp:109
-msgid "Bible study HowTo"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:56
-#: bibletime/main.cpp:110
-msgid "Optionsdialog"
-msgstr ""
-
-#: bibletime/main.cpp:111
-msgid "handbook"
-msgstr ""
-
-#: bibletime/main.cpp:112
-msgid "Martin Luther startup logo"
-msgstr ""
-
-#: bibletime/main.cpp:113
-msgid "Sponsor of www.bibletime.de"
-msgstr ""
-
-#: bibletime/main.cpp:114
-msgid "backend"
-msgstr ""
-
-#: bibletime/main.cpp:115
-msgid ""
-"Leader of the SWORD project.\n"
-"Lots of help with the SWORD API!"
-msgstr ""
-
-#: bibletime/bibletime.cpp:175 bibletime/bibletime.cpp:190
-#: bibletime/bibletime_slots.cpp:98 bibletime/bibletime_slots.cpp:107
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:95
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:297
-msgid "Display window"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:288
-msgid "Printing..."
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:288
-msgid "Abort printing"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:313
-#, c-format, ycp-format
-msgid "Printing %1"
-msgstr ""
-
-#: bibletime/printing/cstylelist.cpp:46
-msgid "Name:"
-msgstr ""
-
-#: bibletime/printing/cprinter.cpp:310 bibletime/printing/cprinter.cpp:341
-#: bibletime/printing/cprinter.cpp:519 bibletime/printing/cprinter.cpp:527
-#: bibletime/printing/cprinterdialog.cpp:616
-#: bibletime/printing/cstyleeditordialog.cpp:182
-#: bibletime/printing/cstylelist.cpp:130
-msgid "Standard"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:42
-msgid "unknown name"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-#: bibletime/printing/cprintitemlist.cpp:48
-msgid "Module"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:49
-msgid "From"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:50
-msgid "To"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:51
-msgid "Style"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:43
-msgid "style editor"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:67
-msgid "Name of style:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-msgid "Choose the part of the style:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:77
-#: bibletime/printing/cstyleeditordialog.cpp:281
-msgid "Header"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:593
-#: bibletime/printing/cstyleeditordialog.cpp:78
-#: bibletime/printing/cstyleeditordialog.cpp:285
-msgid "Description"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:79
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Module text"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:85
-msgid "Enable this part"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:468
-#: bibletime/printing/cstyleeditordialog.cpp:96
-msgid "Left"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:470
-#: bibletime/printing/cstyleeditordialog.cpp:97
-msgid "Center"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:472
-#: bibletime/printing/cstyleeditordialog.cpp:98
-msgid "Right"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:109
-msgid "Foreground:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:120
-msgid "Background:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:131
-msgid "Choose font"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:134
-msgid "Font preview"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:148
-msgid "Use frame"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:158
-msgid "Line thickness (in point):"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:166
-msgid "Frame color:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:64
-msgid "Printdialog"
-msgstr ""
-
-#: bibletime/dummy.h:123 bibletime/printing/cprinterdialog.cpp:65
-#: bibletime/tooltipdef.h:123
-msgid "Preview"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:166
-#: bibletime/printing/cprinterdialog.cpp:89
-msgid "General"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:89
-msgid "The general options for printing"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:92
-msgid "Available printers:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:97
-msgid "Printer"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:98
-msgid "Host"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:99
-msgid "Comment"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:106
-msgid "Print to file:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-#: bibletime/printing/cprinterdialog.cpp:120
-msgid "Search"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:141
-msgid "&Number of copies"
-msgstr ""
-
-#: bibletime/dummy.h:153 bibletime/printing/cprinterdialog.cpp:149
-#: bibletime/tooltipdef.h:153
-msgid "Orientation"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:153
-msgid "Por&trait"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:157
-msgid "L&andscape"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:173
-msgid "Paper t&ype"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:177
-msgid "Size: 8888mm x 8888mm"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:196
-msgid "Preview application:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:292
-msgid "*.ps | Postscript files"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:335
-msgid "A4"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:336
-msgid "A5"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:337
-msgid "Letter"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:338
-msgid "Legal"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:339
-msgid "Executive"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:370
-msgid "Layout specific settings"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:373
-msgid "Margins (in millimeter)"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:381
-msgid "&Top"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:382
-msgid "&Bottom"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:383
-msgid "&Left"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:384
-msgid "&Right"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:433
-msgid "List of style items:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:471
-msgid "Entries"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:471
-msgid "Management of BibleTime's printing queue"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:481
-msgid "Choose a style"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:493
-msgid "Entries which should be printed:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:540
-#, c-format, ycp-format
-msgid "Size: %1mm x %2mm"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:63
-msgid "Synchronize..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:68
-msgid "Edit entry..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:78
-msgid "Commentary window"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:81
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:66
-msgid "Entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:82
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:67
-msgid "Text of entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:83
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:88
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:68
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:73
-msgid "Entry with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:75
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:70
-msgid "Selected text"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:91
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:76
-msgid "Entry as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:92
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:77
-msgid "Entry as HTML"
-msgstr ""
-
-#: bibletime/dummy.h:95 bibletime/frontend/presenters/cbiblepresenter.cpp:86
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:94
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:79
-#: bibletime/tooltipdef.h:95
-msgid "Select all"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:87
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:95
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:80
-msgid "Lookup selected text in lexicon"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:89
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:97
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:82
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:401
-msgid "Copy..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:90
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:98
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:83
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:402
-msgid "Add to printing queue..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:91
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:403
-msgid "Save..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:67
-msgid "Bible window"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:70
-msgid "Verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:71
-msgid "Text of verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:72
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:78
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:82
-msgid "Verse with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:73
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:79
-msgid "Chapter"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:83
-msgid "Chapter as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:84
-msgid "Chapter as HTML"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:225
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:300
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:300
-msgid "Save verse with text as ..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-msgid "Select additional modules"
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:51
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:121
-msgid "NONE"
-msgstr ""
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:63
-msgid "Lexicon window"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:76
-msgid "Accelerators"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:76
-msgid "Configure BibleTime's key bindings"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:86
-msgid "Choose fonts for BibleTime"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:90
-msgid "Choose the area of application and set the font for it"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:101
-msgid "The quick brown fox jumped over the lazy dog"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:109
-msgid "Module fonts"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:109
-msgid "Configure the fonts used for modules"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:134
-msgid "Colors"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:134
-msgid "Configure BibleTime's colors"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:141
-msgid "Background"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:158
-msgid "Highlighted Verse"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:166
-msgid "Configure BibleTime's general options"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:170
-msgid "Show tip of the day"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:187
-msgid "Language for booknames"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:192
-msgid "English"
-msgstr ""
-
-#: bibletime/dummy.h:130
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:211
-#: bibletime/tooltipdef.h:130
-msgid "Show startuplogo"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:172
-msgid "<I>module not set</I>"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-msgid "Search Dialog"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-msgid "Interrupt"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:94
-msgid "Choose modules"
-msgstr ""
-
-#: bibletime/dummy.h:99 bibletime/frontend/searchdialog/csearchdialog.cpp:94
-#: bibletime/tooltipdef.h:99
-msgid "Choose the modules for the search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:98
-msgid "Search Text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:98
-msgid "Enter the text to search for"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:102
-msgid "Search Result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:102
-msgid "The result of your search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:106
-msgid "Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:106
-msgid "Graphical analysis of your search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialoganalysis.cpp:316
-#, ycp-format
-msgid "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:57
-msgid "Search properties"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:75
-msgid "Multiple Words"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:83
-msgid "Exact Search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:90
-msgid "Regular Expression"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:103
-msgid "Case Sensitive"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:107
-msgid "Search scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:111
-msgid "Search progress"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:116
-msgid "Current module:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:117
-msgid "Overall:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-msgid "Search result with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Result with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:203
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:240
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:273
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:318
-#, ycp-format
-msgid "Search result for \"%1\" in module \"%2\"\n"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:232
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:312
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:549
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:580
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:232
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:312
-msgid "Save search result ..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:391
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:398
-msgid "Key"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:392
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:395
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:399
-msgid "Key with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:549
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:580
-msgid "Save key ..."
-msgstr ""
-
-#: bibletime/dummy.h:110
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:110
-msgid "No scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:216
-msgid "Choose custom range"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:217
-msgid "Define range text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:218
-msgid "Range parsing results"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:282
-msgid "Range name"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:282
-msgid "Please enter a name for the new range"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:68
-msgid "Useful tips for BibleTime"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:100
-msgid "Run on startup"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:120
-msgid ""
-"<DIV align=\"center\"><B>Missing tips!</B></DIV><BR><BR>Your installation is "
-"missing the daily tips.\t\tPlease make sure all files of BibleTime are\t"
-"\tinstalled and that the permissions of $KDEDIR are correct!<BR><BR>\t\tIf "
-"you can't solve this problem please contact the team of BibleTime at\t\t<A "
-"HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:198
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:218
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:218
-msgid "Save text as HTML page ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:225
-msgid "Save text as plain text ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:453
-msgid "Choose a font:"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:457
-msgid "Choose font size"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:461
-msgid "Bold"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:465
-msgid "Underlined"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:474
-msgid "Justify"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:182
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:193
-msgid "unknown"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:220
-msgid "Bookmark to"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-#, ycp-format
-msgid "Foonotes: %1<BR>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:247
-#, ycp-format
-msgid "Strong's numbers: %1<BR>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:249
-msgid "Unlock key:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:249
-msgid "not set"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:251
-msgid "Version:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:253
-msgid "Font:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:170
-msgid "Bibles"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:173
-msgid "Commentaries"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:176
-msgid "Lexicons"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:284
-msgid "Caption"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:292
-msgid "Main index"
-msgstr ""
-
-#: bibletime/dummy.h:51 bibletime/frontend/groupmanager/cgroupmanager.cpp:293
-#: bibletime/tooltipdef.h:51
-msgid "Create a new folder"
-msgstr ""
-
-#: bibletime/dummy.h:52 bibletime/frontend/groupmanager/cgroupmanager.cpp:296
-#: bibletime/tooltipdef.h:52
-msgid "Change this folder"
-msgstr ""
-
-#: bibletime/dummy.h:53 bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-#: bibletime/tooltipdef.h:53
-msgid "Change this bookmark"
-msgstr ""
-
-#: bibletime/dummy.h:54 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:54
-msgid "Import bookmarks"
-msgstr ""
-
-#: bibletime/dummy.h:55 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:55
-msgid "Export bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:309
-msgid "Print bookmark"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:315
-msgid "Search in selected module(s)"
-msgstr ""
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:318
-#: bibletime/tooltipdef.h:57
-msgid "Unlock this module"
-msgstr ""
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:321
-#: bibletime/tooltipdef.h:58
-msgid "About this module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:377
-msgid "Bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:377
-msgid "Please enter here the description:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:415
-msgid "Change bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:415
-msgid "Please change the description of the item!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:426
-msgid "Change folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:426
-msgid "Please change the name of the group!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:563
-msgid "<I>Not necessary!</I>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:575
-msgid "Datapath"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:577
-msgid "Version"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:579
-msgid "Unlock key"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:581
-msgid "Writable"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:589
-msgid "Footnotes"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:591
-msgid "Strong's numbers"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:937
-msgid "Enter name of folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:937
-msgid "Please enter the name of the folder!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1021
-msgid "BibleTime - Unlock module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1021
-msgid "Enter the key to unlock the module!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1178
-msgid "Import bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1186
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1189
-msgid "Import of bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1203
-msgid "Export bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1553
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1553
-msgid "BibleTime - Reset main index"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:78
-msgid ""
-"<qt><B>The file does already exist!</B><BR>Do you want to overwrite it?</qt>"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:78
-msgid "BibleTime - Save file as ..."
-msgstr ""
-
-#: bibletime/frontend/chtmldialog.cpp:35 bibletime/frontend/chtmldialog.cpp:43
-msgid "BibleTime - Help window"
-msgstr ""
-
-#: bibletime/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr ""
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr ""
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr ""
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr ""
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr ""
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr ""
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr ""
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-msgid "Edit toolbar"
-msgstr ""
-
-#: bibletime/dummy.h:41 bibletime/tooltipdef.h:41
-msgid "BibleTime's handbook"
-msgstr ""
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Enter \"What's this?\" mode"
-msgstr ""
-
-#: bibletime/dummy.h:43 bibletime/tooltipdef.h:43
-msgid "Send bugreport"
-msgstr ""
-
-#: bibletime/dummy.h:44 bibletime/tooltipdef.h:44
-msgid "Show a daily tip"
-msgstr ""
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "About BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "About KDE"
-msgstr ""
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-msgid "The main index"
-msgstr ""
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "Add bookmark to printing queue"
-msgstr ""
-
-#: bibletime/dummy.h:61 bibletime/tooltipdef.h:61
-msgid "The working area"
-msgstr ""
-
-#: bibletime/dummy.h:63 bibletime/tooltipdef.h:63
-msgid "The bible window"
-msgstr ""
-
-#: bibletime/dummy.h:64 bibletime/tooltipdef.h:64
-msgid "The commentary window"
-msgstr ""
-
-#: bibletime/dummy.h:65 bibletime/tooltipdef.h:65
-msgid "The lexicon window"
-msgstr ""
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "Show the next entry"
-msgstr ""
-
-#: bibletime/dummy.h:68 bibletime/tooltipdef.h:68
-msgid "Show the previous entry"
-msgstr ""
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Jump to next verse"
-msgstr ""
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Jump to previous verse"
-msgstr ""
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-msgid "Show next chapter"
-msgstr ""
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-msgid "Show previous chapter"
-msgstr ""
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-msgid "Show next book"
-msgstr ""
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-msgid "Show previous book"
-msgstr ""
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-msgid "List of books"
-msgstr ""
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-msgid "List of chapters"
-msgstr ""
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of verses"
-msgstr ""
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of entries"
-msgstr ""
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "Scroll through the list"
-msgstr ""
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "Edit this entry"
-msgstr ""
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Save this comment"
-msgstr ""
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Delete this comment"
-msgstr ""
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Comment up to"
-msgstr ""
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Set bold"
-msgstr ""
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Set italic"
-msgstr ""
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set underlined"
-msgstr ""
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set font"
-msgstr ""
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set the color"
-msgstr ""
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set the fontsize"
-msgstr ""
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Synchronize with Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:94 bibletime/tooltipdef.h:94
-msgid "Save as HTML"
-msgstr ""
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Copy to clipboard"
-msgstr ""
-
-#: bibletime/dummy.h:100 bibletime/tooltipdef.h:100
-msgid "Add the selected module to the list"
-msgstr ""
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-msgid "Remove the selected module from the list"
-msgstr ""
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "List of modules used for the search"
-msgstr ""
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "Search this text"
-msgstr ""
-
-#: bibletime/dummy.h:105 bibletime/tooltipdef.h:105
-msgid "Search multiple words"
-msgstr ""
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-msgid "Exact match"
-msgstr ""
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search with GNU regular expressions"
-msgstr ""
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Search case sensitive"
-msgstr ""
-
-#: bibletime/dummy.h:111 bibletime/tooltipdef.h:111
-msgid "Last search result"
-msgstr ""
-
-#: bibletime/dummy.h:112 bibletime/tooltipdef.h:112
-msgid "Use own scope"
-msgstr ""
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Add a new scope"
-msgstr ""
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-msgid "Delete this search scope"
-msgstr ""
-
-#: bibletime/dummy.h:115 bibletime/dummy.h:297 bibletime/tooltipdef.h:115
-#: bibletime/whatsthisdef.h:123
-msgid "Edit and define your search scopes"
-msgstr ""
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Choose a search scope from the list"
-msgstr ""
-
-#: bibletime/dummy.h:117 bibletime/tooltipdef.h:117
-msgid "Enter your own search scope"
-msgstr ""
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Parsed result"
-msgstr ""
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Close this dialog"
-msgstr ""
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Used modules"
-msgstr ""
-
-#: bibletime/dummy.h:122 bibletime/tooltipdef.h:122
-msgid "Items found"
-msgstr ""
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Graphical analysis"
-msgstr ""
-
-#: bibletime/dummy.h:128 bibletime/tooltipdef.h:128
-msgid "Show daily tip"
-msgstr ""
-
-#: bibletime/dummy.h:129 bibletime/tooltipdef.h:129
-msgid "List of languages"
-msgstr ""
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-msgid "Set keyboard accelerators"
-msgstr ""
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Choose the area of application"
-msgstr ""
-
-#: bibletime/dummy.h:136 bibletime/dummy.h:317 bibletime/tooltipdef.h:136
-#: bibletime/whatsthisdef.h:143
-msgid "Choose a font"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "List of modules"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "Color of the background"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "Color of the highlighted verse"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid "Start printing"
-msgstr ""
-
-#: bibletime/dummy.h:145 bibletime/tooltipdef.h:145
-msgid "Show a preview"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Open help"
-msgstr ""
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "The list of printers"
-msgstr ""
-
-#: bibletime/dummy.h:150 bibletime/tooltipdef.h:150
-msgid "Print into a file"
-msgstr ""
-
-#: bibletime/dummy.h:151 bibletime/tooltipdef.h:151
-msgid "Browse for the file"
-msgstr ""
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Copies"
-msgstr ""
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Paper type"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Paper size"
-msgstr ""
-
-#: bibletime/dummy.h:159 bibletime/tooltipdef.h:159
-msgid "Styles"
-msgstr ""
-
-#: bibletime/dummy.h:160 bibletime/tooltipdef.h:160
-msgid "List of print items"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Move item up"
-msgstr ""
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-msgid "Move item down"
-msgstr ""
-
-#: bibletime/dummy.h:163 bibletime/tooltipdef.h:163
-msgid "Delete items"
-msgstr ""
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Insert a page break"
-msgstr ""
-
-#: bibletime/dummy.h:166 bibletime/tooltipdef.h:166
-msgid "Page borders"
-msgstr ""
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "Left border"
-msgstr ""
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Right border"
-msgstr ""
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Upper border"
-msgstr ""
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Lower border"
-msgstr ""
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "List of styles"
-msgstr ""
-
-#: bibletime/dummy.h:172 bibletime/tooltipdef.h:172
-msgid "Delete the chosen printing style"
-msgstr ""
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Edit the chosen printing style"
-msgstr ""
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Create a new printing style"
-msgstr ""
-
-#: bibletime/dummy.h:202 bibletime/whatsthisdef.h:28
-msgid ""
-"Clear the printing queue of BibleTime. All items will be removed from the "
-"list, the print button will be disabled."
-msgstr ""
-
-#: bibletime/dummy.h:203 bibletime/whatsthisdef.h:29
-msgid ""
-"Open the printerdialog of BibleTime where you can edit the printing queue "
-"and assign styles to the items."
-msgstr ""
-
-#: bibletime/dummy.h:204 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr ""
-
-#: bibletime/dummy.h:206 bibletime/whatsthisdef.h:32
-msgid "Open the search dialog to search text in one or more modules."
-msgstr ""
-
-#: bibletime/dummy.h:207 bibletime/whatsthisdef.h:33
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder the "
-"subitems of it will be removed, too."
-msgstr ""
-
-#: bibletime/dummy.h:208 bibletime/whatsthisdef.h:34
-msgid ""
-"Reset the main index<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:36
-msgid "Show or hide the main index depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:37
-msgid "Show or hide the main toolbar depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:212 bibletime/whatsthisdef.h:38
-msgid "Show or hide the footnotes in the modules deoending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:39
-msgid ""
-"Show or hide Strong's numbers in the modules depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:41
-msgid "Arrange the opened display windows in a tile pattern."
-msgstr ""
-
-#: bibletime/dummy.h:216 bibletime/whatsthisdef.h:42
-msgid ""
-"The open display windows will automatically arranged in a tile pattern if "
-"it's necessary."
-msgstr ""
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:43
-msgid "Arrange the open display windows in a cascade pattern."
-msgstr ""
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:44
-msgid ""
-"The open display windows will automatically arranged in a cascade pattern if "
-"it's necessary."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr ""
-
-#: bibletime/dummy.h:221 bibletime/whatsthisdef.h:47
-msgid "Open a dialog where you can edit the toolbar of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:48
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:50
-msgid "Open KDE's helpbrowser with BibleTime's handbook."
-msgstr ""
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:51
-msgid ""
-"Switch into the <B>\"What's this?\"</B> mode.<BR>All important elements of "
-"BibleTime's GUI offer a \"What's this?\" help."
-msgstr ""
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:52
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr ""
-
-#: bibletime/dummy.h:227 bibletime/whatsthisdef.h:53
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:54
-msgid "Show detailed information about BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:229 bibletime/whatsthisdef.h:55
-msgid "Show the general about dialog of KDE 2."
-msgstr ""
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:59
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:60
-msgid ""
-"Create a new folder in the main index.<BR>If you pressed the right mouse "
-"button on a folder the new folder will be a sub-item of it.<BR>Otherwise you "
-"will create a toplevel folder."
-msgstr ""
-
-#: bibletime/dummy.h:235 bibletime/whatsthisdef.h:61
-msgid "Change the properties of the selected folder."
-msgstr ""
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:62
-msgid "Change the properties of the selected bookmark."
-msgstr ""
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:63
-msgid "Import bookmark from a file."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:64
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:65
-msgid ""
-"Use this to add this bookmark to BibleTime's printing queue. The key, the "
-"description and the text of the key will be used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:66
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:67
-msgid "Open a dialog to show information about the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:244 bibletime/whatsthisdef.h:70
-msgid ""
-"This area contains is the working place of Bibletime.<BR>All display windows "
-"are opened in this place."
-msgstr ""
-
-#: bibletime/dummy.h:246 bibletime/whatsthisdef.h:72
-msgid "This is the Bible display window"
-msgstr ""
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:73
-msgid "This is the commentary display window."
-msgstr ""
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:74
-msgid "This is the lexicon display window."
-msgstr ""
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:76
-msgid "The next entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:77
-msgid "The previous entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:78
-msgid ""
-"If you view the text of a Bible the next verse will be highlighted.<BR>If "
-"you read a commentary the next entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:79
-msgid ""
-"If you view the text of a Bible the previous verse will be highlighted. If "
-"you read a commentary the next entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:80
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:81
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-
-#: bibletime/dummy.h:256 bibletime/whatsthisdef.h:82
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:257 bibletime/whatsthisdef.h:83
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:84
-msgid "This list contains the books which are available in this module."
-msgstr ""
-
-#: bibletime/dummy.h:259 bibletime/whatsthisdef.h:85
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr ""
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:86
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:87
-msgid "This list contains the entries of the current module."
-msgstr ""
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:88
-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/dummy.h:263 bibletime/whatsthisdef.h:89
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:90
-msgid "Save the personal comment."
-msgstr ""
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:91
-msgid "Clear the text and delete the entry from the module."
-msgstr ""
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:92
-msgid "Switch between bold and non-bold formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:93
-msgid "Switch between italic and non-italic formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:94
-msgid ""
-"Switch between underlined and non-undelined formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:95
-msgid "Choose a new font for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:96
-msgid "Choose a new color for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:97
-msgid "Choose a new fontsize for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:99
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:102
-msgid "Save the displayed chapter as a HTML file."
-msgstr ""
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:103
-msgid "Select all text."
-msgstr ""
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:104
-msgid "Copy the displayed text to the clipboard."
-msgstr ""
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:107
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two button "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-
-#: bibletime/dummy.h:282 bibletime/whatsthisdef.h:108
-msgid "Add the selected module to the list on the left."
-msgstr ""
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:109
-msgid "Remove the selected module from the list on the left side."
-msgstr ""
-
-#: bibletime/dummy.h:284 bibletime/whatsthisdef.h:110
-msgid "The list of modules used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:112
-msgid "The text entered in this edit box will be searched in all modules."
-msgstr ""
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:113
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit line is "
-"searched as a single word."
-msgstr ""
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:114
-msgid ""
-"Select this to search for exactly the same text you entered in the edit line."
-msgstr ""
-
-#: bibletime/dummy.h:289 bibletime/whatsthisdef.h:115
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-
-#: bibletime/dummy.h:290 bibletime/whatsthisdef.h:116
-msgid "Activate this to use case sensitive search."
-msgstr ""
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:118
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr ""
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:119
-msgid ""
-"Select this if you want to use the last search result of each module as "
-"search scope."
-msgstr ""
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:120
-msgid "Create a new search scope."
-msgstr ""
-
-#: bibletime/dummy.h:295 bibletime/whatsthisdef.h:121
-msgid ""
-"Use an own scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:122
-msgid "Use this button to delete the chosen search scope."
-msgstr ""
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:124
-msgid "Choose a search scope from the combo box"
-msgstr ""
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:125
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:126
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:301 bibletime/whatsthisdef.h:127
-msgid "Close this dialog and save the changes."
-msgstr ""
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:129
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:130
-msgid "This contains the items found in the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:131
-msgid "This text box shows a preview of the chosen item."
-msgstr ""
-
-#: bibletime/dummy.h:307 bibletime/whatsthisdef.h:133
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:136
-msgid "Activate this box to see a daily tip on startup."
-msgstr ""
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:137
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-
-#: bibletime/dummy.h:312 bibletime/whatsthisdef.h:138
-msgid "Activate this to see a startup logo on each startup of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:141
-msgid "Select a action and change the key binding for the action."
-msgstr ""
-
-#: bibletime/dummy.h:316 bibletime/whatsthisdef.h:142
-msgid ""
-"Select in this box how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-
-#: bibletime/dummy.h:319 bibletime/whatsthisdef.h:145
-msgid "This list contains the modules using foreign fonts."
-msgstr ""
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:147
-msgid "This is the background color used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:148
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:325 bibletime/whatsthisdef.h:151
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:152
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:153
-msgid ""
-"Closes this dialog without doing anything with the items or the printer."
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:154
-msgid "Open the online help of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:156
-msgid ""
-"This is the list of available printers of your system.<BR>Please select the "
-"printer you want to use for printing."
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:157
-msgid "Print into a postscript file on disk."
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:158
-msgid "Browse for the file you want to print into."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:159
-msgid "The number of copies used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:334 bibletime/whatsthisdef.h:160
-msgid "Choose the orientation of the used paper."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:161
-msgid "Print on the paper using \"Portrait\" as orientation."
-msgstr ""
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:162
-msgid "Print on the paper using \"Landscape\" as orientation."
-msgstr ""
-
-#: bibletime/dummy.h:337 bibletime/whatsthisdef.h:163
-msgid "The type of the paper which is used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:338 bibletime/whatsthisdef.h:164
-msgid "The size of the used paper."
-msgstr ""
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:166
-msgid "This combo box contains the available printing styles."
-msgstr ""
-
-#: bibletime/dummy.h:341 bibletime/whatsthisdef.h:167
-msgid "This is the list which contains the available print items."
-msgstr ""
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:168
-msgid "Move the selected item one item above."
-msgstr ""
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:169
-msgid "Move the selected item one item below."
-msgstr ""
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:170
-msgid "Delete the selected items."
-msgstr ""
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:171
-msgid "Inserts a page break into the list.<BR>The printer will start new page."
-msgstr ""
-
-#: bibletime/dummy.h:347 bibletime/whatsthisdef.h:173
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr ""
-
-#: bibletime/dummy.h:348 bibletime/whatsthisdef.h:174
-msgid "The size of the border on the left side of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:175
-msgid "The size of the border on the right side of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:176
-msgid "The size of the border on the top of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:177
-msgid "The size of the border on the bottom of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:178
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-
-#: bibletime/dummy.h:353 bibletime/whatsthisdef.h:179
-msgid "Remove the selected printing style from the list."
-msgstr ""
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:180
-msgid "Change the properties of the selected printing style."
-msgstr ""
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:181
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr ""
diff --git a/bibletime-doc/po/de.gmo b/bibletime-doc/po/de.gmo
deleted file mode 100644
index afdcb5a..0000000
--- a/bibletime-doc/po/de.gmo
+++ /dev/null
diff --git a/bibletime-doc/po/de.po b/bibletime-doc/po/de.po
deleted file mode 100644
index 816058e..0000000
--- a/bibletime-doc/po/de.po
+++ /dev/null
@@ -1,2974 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: BibleTime 1.0\n"
-"POT-Creation-Date: 2002-04-07 01:40+0200\n"
-"PO-Revision-Date: 2002-04-05 14:17GMT\n"
-"Last-Translator: Martin Gruner <mg.pub@gmx.net>\n"
-"Language-Team: Deutsch <info@bibletime.de>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
-
-#: bibletime/backend/cswordbackend.cpp:313
-#: bibletime/frontend/coptionsdialog.cpp:272
-msgid "Footnotes"
-msgstr "Fußnoten"
-
-#: bibletime/backend/cswordbackend.cpp:315
-msgid "Strong's Numbers"
-msgstr "Strongnummern"
-
-#: bibletime/backend/cswordbackend.cpp:317
-msgid "Headings"
-msgstr "Überschriften"
-
-#: bibletime/backend/cswordbackend.cpp:319
-msgid "Morphological Tags"
-msgstr "Morphologische Tags"
-
-#: bibletime/backend/cswordbackend.cpp:321
-msgid "Lemmas"
-msgstr "Wurzeln"
-
-#: bibletime/backend/cswordbackend.cpp:323
-msgid "Hebrew Vowel Points"
-msgstr "Hebräische Vokalzeichen"
-
-#: bibletime/backend/cswordbackend.cpp:325
-msgid "Hebrew Cantillation"
-msgstr "Hebräische Kantillationszeichen"
-
-#: bibletime/backend/cswordbackend.cpp:327
-msgid "Greek Accents"
-msgstr "Griechische Akzente"
-
-#: bibletime/backend/cswordbackend.cpp:329
-msgid "Textual Variants"
-msgstr "Textvarianten"
-
-#: bibletime/main.cpp:110
-msgid "Enable debug messages"
-msgstr "Fehlermeldungen aktivieren"
-
-#: bibletime/main.cpp:111
-msgid "Ignore the startup profile saved after the last BibleTime execution."
-msgstr ""
-"Ignoriere das Startprofil, das nach dem letzten Start von BibleTime "
-"gespeichert wurde."
-
-#: bibletime/main.cpp:119
-msgid "Bible study tool for KDE 2"
-msgstr "Bibelstudien Werkzeug für KDE 2"
-
-#: bibletime/main.cpp:121
-msgid "(c)1999-2002, The BibleTime Team"
-msgstr "(c)1999-2002, Das BibleTime Team"
-
-#: bibletime/main.cpp:122
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-"BibleTime ist ein einfach zu benutzendes und gleichzeitig mächtiges  "
-"Bibelstudien Werkzeug für KDE 2.\n"
-"\n"
-"Wir suchen nach Übersetzern und Handbuch Autoren.\n"
-"Wenn Sie uns helfen möchten schicken Sie eine eMail an info@bibletime.de."
-
-#: bibletime/main.cpp:130
-msgid "Project coordinator"
-msgstr "Projekt Koordinator"
-
-#: bibletime/main.cpp:131
-msgid "Frontend, backend"
-msgstr "Oberfläche, Backend"
-
-#: bibletime/main.cpp:132
-msgid "Searchdialog"
-msgstr "Suchdialog"
-
-#: bibletime/main.cpp:138
-msgid "Icons, startlogo, banners"
-msgstr "Icons, Startlogo, Banner"
-
-#: bibletime/main.cpp:141
-msgid "Handbook"
-msgstr "Handbuch"
-
-#: bibletime/main.cpp:144
-msgid "Translation into Czech"
-msgstr "Übersetzung ins Tschechische"
-
-#: bibletime/main.cpp:145
-msgid "Translation into Danish"
-msgstr "Übersetzung ins Dänische"
-
-#: bibletime/main.cpp:146
-msgid "Translation into Dutch"
-msgstr "Übersetzung ins Holländische"
-
-#: bibletime/main.cpp:148
-msgid "Translation into French"
-msgstr "Übersetzung ins Französische"
-
-#: bibletime/main.cpp:149
-msgid "Translation into Hungarian"
-msgstr "Übersetzung ins Ungarische"
-
-#: bibletime/main.cpp:150 bibletime/main.cpp:151
-msgid "Translation into Italian"
-msgstr "Übersetzung ins Italienische"
-
-#: bibletime/main.cpp:152
-msgid "Translation into Norwegian"
-msgstr "Übersetzung ins Norwegische"
-
-#: bibletime/main.cpp:153
-msgid "Translation into Polish"
-msgstr "Übersetzung ins Polnische"
-
-#: bibletime/main.cpp:154
-msgid "Translation into Portoguese"
-msgstr "Übersetzung ins Portugiesische"
-
-#: bibletime/main.cpp:155
-msgid "Translation into Russian"
-msgstr "Übersetzung ins Russische"
-
-#: bibletime/main.cpp:156
-msgid "Translation into Slovak"
-msgstr "Übersetzung ins Slovakische"
-
-#: bibletime/main.cpp:157
-msgid "Translation into Spanish"
-msgstr "Übersetzung ins Spanische"
-
-#: bibletime/main.cpp:160
-msgid "Bible study HowTo"
-msgstr "Anleitung zum Bibelstudium"
-
-#: bibletime/main.cpp:185
-msgid "Starting BibleTime"
-msgstr "BibleTime startet"
-
-#: bibletime/bibletime_init.cpp:59
-msgid "Creating BibleTime's GUI"
-msgstr "Erstelle BibleTimes Oberfläche"
-
-#: bibletime/bibletime_init.cpp:77
-msgid "Initializing menu- and toolbars"
-msgstr "Initialisiere Menü- und Werkzeugleisten"
-
-#: bibletime/bibletime_init.cpp:81
-msgid "Clear printing queue"
-msgstr "Leere die Druckschlange"
-
-#: bibletime/bibletime_init.cpp:99 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr "Hauptgruppe zurücksetzen"
-
-#: bibletime/bibletime_init.cpp:105
-msgid "Search in module(s)"
-msgstr "Suche in Modul(en)"
-
-#: bibletime/bibletime_init.cpp:111
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:297
-msgid "Remove selected item(s)"
-msgstr "Entferne ausgewählte Einträge"
-
-#: bibletime/bibletime_init.cpp:122
-msgid "&Show main index"
-msgstr "&Zeige Hauptgruppe"
-
-#: bibletime/bibletime_init.cpp:137
-msgid "&Cascade"
-msgstr "&Staffeln"
-
-#: bibletime/bibletime_init.cpp:143
-msgid "&Tile"
-msgstr "&Kacheln"
-
-#: bibletime/bibletime_init.cpp:149
-msgid "&Auto cascade"
-msgstr "&Automatisch Staffeln"
-
-#: bibletime/bibletime_init.cpp:155
-msgid "A&uto Tile"
-msgstr "A&utomatisch Kacheln"
-
-#: bibletime/bibletime_init.cpp:161
-msgid "&Close all"
-msgstr "&Schließe alle"
-
-#: bibletime/bibletime_init.cpp:167
-msgid "&Save profile"
-msgstr "Profil &speichern"
-
-#: bibletime/bibletime_init.cpp:172
-msgid "&Load profile"
-msgstr "Profil &laden"
-
-#: bibletime/bibletime_init.cpp:177
-msgid "&Configure profiles"
-msgstr "P&rofile verwalten"
-
-#: bibletime/bibletime_init.cpp:183
-msgid "&Fullscreen mode"
-msgstr "&Vollbildmodus"
-
-#: bibletime/bibletime_init.cpp:202
-msgid "&Handbook"
-msgstr "&Handbuch"
-
-#: bibletime/bibletime_init.cpp:208
-msgid "&Installation"
-msgstr "&Installation"
-
-#: bibletime/bibletime_init.cpp:214
-msgid "&Bible Study Howto"
-msgstr "&Anleitung zum Bibelstudium"
-
-#: bibletime/bibletime_init.cpp:229
-msgid "&Daily tip"
-msgstr "&Täglicher Tipp"
-
-#: bibletime/bibletime_init.cpp:294
-msgid "Initializing Sword"
-msgstr "Initialisiere Sword"
-
-#: bibletime/bibletime_init.cpp:341
-msgid "Initializing printing system"
-msgstr "Initialisiere Drucksystem"
-
-#: bibletime/printing/cstyleeditordialog.cpp:40
-msgid "style editor"
-msgstr "Stileditor"
-
-#: bibletime/printing/cstyleeditordialog.cpp:63
-msgid "Name of style:"
-msgstr "Name des Stiles:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose the part of the style:"
-msgstr "Wählen sie einen Teil des Stils:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:73
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Header"
-msgstr "Kopf"
-
-#: bibletime/printing/cstyleeditordialog.cpp:74
-#: bibletime/printing/cstyleeditordialog.cpp:293
-msgid "Description"
-msgstr "Beschreibung"
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-#: bibletime/printing/cstyleeditordialog.cpp:297
-msgid "Module text"
-msgstr "Modultext"
-
-#: bibletime/printing/cstyleeditordialog.cpp:81
-msgid "Enable this part"
-msgstr "Diesen Teil aktivieren"
-
-#: bibletime/printing/cstyleeditordialog.cpp:104
-msgid "Foreground:"
-msgstr "Vordergrund:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:115
-msgid "Background:"
-msgstr "Hintergrund:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:126
-msgid "Choose font"
-msgstr "Schrift wählen"
-
-#: bibletime/printing/cstyleeditordialog.cpp:129
-msgid "Font preview"
-msgstr "Schriftvorschau"
-
-#: bibletime/printing/cstyleeditordialog.cpp:143
-msgid "Use frame"
-msgstr "Rahmen benutzen"
-
-#: bibletime/printing/cstyleeditordialog.cpp:154
-msgid "Line thickness (in point):"
-msgstr "Liniendicke (in Punkten):"
-
-#: bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr "Rahmenfarbe:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:170
-msgid "Line style:"
-msgstr "Linienstil:"
-
-#: bibletime/frontend/coptionsdialog.cpp:218
-#: bibletime/frontend/coptionsdialog.cpp:735
-#: bibletime/printing/cprintdialogpages.cpp:176
-#: bibletime/printing/cprinter.cpp:307 bibletime/printing/cprinter.cpp:316
-#: bibletime/printing/cstyle.cpp:180
-#: bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr "Standard"
-
-#: bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr "Name:"
-
-#: bibletime/printing/cstyle.cpp:181
-msgid "Colored style for larger test portions"
-msgstr "Farbiger Stil für größere Textabschnitte"
-
-#: bibletime/printing/cstyle.cpp:182
-msgid "Black&White for larger test portions"
-msgstr "Schwarz-Weiß Stil für größere Textabschnitte"
-
-#: bibletime/printing/cstyle.cpp:187
-msgid "unknown name"
-msgstr "Unbekannter Name"
-
-#: bibletime/dummy.h:166 bibletime/printing/cprintdialogpages.cpp:43
-#: bibletime/tooltipdef.h:166
-msgid "Styles"
-msgstr "Stile"
-
-#: bibletime/printing/cprintdialogpages.cpp:48
-msgid "Margins (in millimeter)"
-msgstr "Ränder (in Millimetern)"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Top"
-msgstr "&Oben"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Left"
-msgstr "&Links"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Right"
-msgstr "&Rechts"
-
-#: bibletime/printing/cprintdialogpages.cpp:104
-msgid "List of style items:"
-msgstr "Liste der Stile:"
-
-#: bibletime/printing/cprintdialogpages.cpp:192
-msgid "Print queue"
-msgstr "Druckschlange"
-
-#: bibletime/printing/cprintdialogpages.cpp:203
-msgid "Choose a style"
-msgstr "Wählen Sie einen Stil"
-
-#: bibletime/printing/cprintdialogpages.cpp:215
-msgid "Entries which should be printed:"
-msgstr "Einträge die gedruckt werden sollen:"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:239
-#: bibletime/printing/cprintitemlist.cpp:44
-msgid "Module"
-msgstr "Modul"
-
-#: bibletime/printing/cprintitemlist.cpp:45
-msgid "From"
-msgstr "Von"
-
-#: bibletime/printing/cprintitemlist.cpp:46
-msgid "To"
-msgstr "Bis"
-
-#: bibletime/printing/cprintitemlist.cpp:47
-msgid "Style"
-msgstr "Stil"
-
-#: bibletime/frontend/chtmldialog.cpp:84
-msgid "Backward"
-msgstr "Rückwärts"
-
-#: bibletime/frontend/chtmldialog.cpp:102
-msgid "Forward"
-msgstr "Vorwärts"
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr "Ok"
-
-#: bibletime/frontend/chtmlwidget.cpp:264
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr "Konnte die Seite %1 nicht finden!"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.html *.htm *.shtml *.shtm | HTML Dateien\n"
-"*.* | Alle Dateien (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid "Save text as HTML page ..."
-msgstr "Text als HTML abspeichern ..."
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-"*.txt | Text Datei (*.txt)\n"
-"*.* | Alle Dateien (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid "Save text as plain text ..."
-msgstr "Als reinen Text abspeichern ..."
-
-#: bibletime/frontend/chtmlwidget.cpp:501
-msgid "Choose a font:"
-msgstr "Wählen Sie eine Schriftart:"
-
-#: bibletime/frontend/chtmlwidget.cpp:505
-msgid "Choose font size"
-msgstr "Schriftgröße wählen"
-
-#: bibletime/frontend/chtmlwidget.cpp:509
-msgid "Bold"
-msgstr "Fett"
-
-#: bibletime/frontend/chtmlwidget.cpp:513
-msgid "Underlined"
-msgstr "Unterstrichen"
-
-#: bibletime/frontend/chtmlwidget.cpp:522
-msgid "Justify"
-msgstr "Blocksatz"
-
-#: bibletime/frontend/cprofile.cpp:33
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:178
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:189
-msgid "unknown"
-msgstr "Unbekannt"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:214
-msgid "Bookmark to"
-msgstr "Lesezeichen zu"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:539
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:241
-msgid "Language"
-msgstr "Sprache"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:549
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:243
-msgid "Unlock key"
-msgstr "Schlüssel"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-msgid "not set"
-msgstr "nicht gesetzt"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:532
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-msgid "Version"
-msgstr "Version"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:149
-msgid "Bibles"
-msgstr "Bibeln"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:150
-msgid "Books"
-msgstr "Bücher"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:151
-msgid "Commentaries"
-msgstr "Kommentare"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:152
-msgid "Lexicons"
-msgstr "Lexika"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:269
-msgid "Caption"
-msgstr "Titel"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:277
-msgid "Main index"
-msgstr "Hauptgruppe"
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:278
-#: bibletime/tooltipdef.h:57
-msgid "Create a new folder"
-msgstr "Erzeuge einen neuen Ordner"
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:281
-#: bibletime/tooltipdef.h:58
-msgid "Change this folder"
-msgstr "Ändere diesen Ordner"
-
-#: bibletime/dummy.h:59 bibletime/frontend/groupmanager/cgroupmanager.cpp:285
-#: bibletime/tooltipdef.h:59
-msgid "Change this bookmark"
-msgstr "Ändere dieses Lesezeichen"
-
-#: bibletime/dummy.h:60 bibletime/frontend/groupmanager/cgroupmanager.cpp:288
-#: bibletime/tooltipdef.h:60
-msgid "Import bookmarks"
-msgstr "Importiere Lesezeichen"
-
-#: bibletime/dummy.h:61 bibletime/frontend/groupmanager/cgroupmanager.cpp:291
-#: bibletime/tooltipdef.h:61
-msgid "Export bookmarks"
-msgstr "Exportiere Lesezeichen"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:294
-msgid "Print bookmark"
-msgstr "Drucke Lesezeichen"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-msgid "Search in selected module(s)"
-msgstr "Durchsuche gewählte Module"
-
-#: bibletime/dummy.h:63 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:63
-msgid "Unlock this module"
-msgstr "Dieses Modul entschlüsseln"
-
-#: bibletime/dummy.h:64 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:64
-msgid "About this module"
-msgstr "Über dieses Modul"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Bookmark description - BibleTime"
-msgstr "Lesezeichenbeschreibung - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Please enter here the description:"
-msgstr "Bitte geben Sie hier die Beschreibung ein:"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Change bookmark description - BibleTime"
-msgstr "Ändern der Lesezeichenbeschreibung - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Please change the description of the item!"
-msgstr "Bitte ändern Sie die Beschreibung des Eintrags!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Change folder - BibleTime"
-msgstr "Ordner Ändern - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Please change the name of the group!"
-msgstr "Bitte ändern Sie den Namen der Gruppe!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:536
-msgid "Location"
-msgstr "Ort"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:544
-msgid "Writable"
-msgstr "Schreibbar"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:545
-msgid "yes"
-msgstr "Ja"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Encoding"
-msgstr "Kodierung"
-
-#: bibletime/frontend/coptionsdialog.cpp:219
-#: bibletime/frontend/coptionsdialog.cpp:738
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Unicode"
-msgstr "Unicode"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "iso8859-1"
-msgstr "iso8859-1"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:564
-msgid "Features"
-msgstr "Eigenschaften"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Enter name of folder - BibleTime"
-msgstr "Ordnernamen eingeben - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Please enter the name of the folder!"
-msgstr "Bitte geben Sie den Namen des Ordners ein!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "BibleTime - Unlock module"
-msgstr "BibleTime - Modul freischalten"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "Enter the key to unlock the module!"
-msgstr "Geben Sie den Schlüssel ein, um das Modul freizuschalten!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1148
-msgid "Import bookmarks ..."
-msgstr "Importiere Lesezeichen ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1156
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Ein Problem trat während dem Import der Lesezeichen auf!<BR>Das "
-"Lesezeichenformat der importierten Datei ist neuer als die Formatversion "
-"dieser Version von BibleTime!<BR><B>Das Importieren der Lesezeichen könnte "
-"nicht ordnungsgemäß funktionieren!</B><BR>Möchten Sie fortfahren?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1159
-msgid "Import of bookmarks"
-msgstr "Import von Lesezeichen"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1173
-msgid "Export bookmarks ..."
-msgstr "Exportiere Lesezeichen ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Diese Funktion setzt die Hauptgruppe zurück!<BR>Dies erzeugt die "
-"ursprünglichen Ordner erneut und löscht alle anderen Einträge!<BR>Stellen "
-"Sie sicher,dass keine wichtigen Lesezeichen gelöscht werden!<BR>Möchten Sie "
-"fortfahren?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid "BibleTime - Reset main index"
-msgstr "BibleTime - Hauptgruppe zurücksetzen"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:85
-msgid "Lexicon window"
-msgstr "Lexikonfenster"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:88
-msgid "Entry"
-msgstr "Eintrag"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:100
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:89
-msgid "Text of entry"
-msgstr "Text des Eintrages"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:106
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:90
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:95
-msgid "Entry with text"
-msgstr "Eintrag mit Text"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:100
-#: bibletime/frontend/presenters/cbookpresenter.cpp:98
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:103
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:92
-msgid "Selected text"
-msgstr "Ausgewählter Text"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:109
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:98
-msgid "Entry as plain text"
-msgstr "Eintrag als normalen Text"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:106
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:110
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:99
-msgid "Entry as HTML"
-msgstr "Eintrag als HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:112
-#: bibletime/frontend/presenters/cbookpresenter.cpp:109
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:113
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:102
-msgid "Lookup selected text in lexicon"
-msgstr "Gewählten Text in Lexikon nachschlagen"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:114
-#: bibletime/frontend/presenters/cbookpresenter.cpp:111
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:115
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:104
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:270
-msgid "Copy..."
-msgstr "Kopiere..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:115
-#: bibletime/frontend/presenters/cbookpresenter.cpp:112
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:116
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:105
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:271
-msgid "Add to printing queue..."
-msgstr "Füge zur Druckschlange hinzu..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:116
-#: bibletime/frontend/presenters/cbookpresenter.cpp:113
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:117
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:106
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:272
-msgid "Save..."
-msgstr "Speichern..."
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:259
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:267
-msgid "Next entry"
-msgstr "Nächster Eintrag"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:260
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:270
-msgid "Previous entry"
-msgstr "Vorheriger Eintrag"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:92
-msgid "Bible window"
-msgstr "Bibelfenster"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:95
-msgid "Verse"
-msgstr "Vers"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:96
-msgid "Text of verse"
-msgstr "Text des Verses"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:97
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:103
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:107
-msgid "Verse with text"
-msgstr "Vers mit Text"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:98
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:104
-msgid "Chapter"
-msgstr "Kapitel"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:108
-msgid "Chapter as plain text"
-msgstr "Kapitel als normalen Text"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:109
-msgid "Chapter as HTML"
-msgstr "Kapitel als HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:327
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:343
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:413
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:432
-msgid "Next book"
-msgstr "Nächtes Buch"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:328
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:345
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:414
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:434
-msgid "Previous book"
-msgstr "Vorheriges Buch"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:330
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:348
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:416
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:437
-msgid "Next chapter"
-msgstr "Nächstes Kapitel"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:331
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:350
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:417
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:439
-msgid "Previous chapter"
-msgstr "Vorheriges Kapitel"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:333
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:353
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:419
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:442
-msgid "Next verse"
-msgstr "Nächster Vers"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:334
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:355
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:420
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:444
-msgid "Previous verse"
-msgstr "Vorheriger Vers"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:47
-msgid "Select additional modules"
-msgstr "Wähle zusätzliche Module aus"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:126
-msgid "NONE"
-msgstr "NICHTS"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:70
-msgid "Display options"
-msgstr "Anzeigeeinstellungen"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:73
-msgid "Use linebreaks"
-msgstr "Zeilenumbrüche benutzen"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:74
-msgid "Show versenumbers"
-msgstr "Versnummern anzeigen"
-
-#: bibletime/frontend/coptionsdialog.cpp:663
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:76
-msgid "Show headings"
-msgstr "Überschriften anzeigen"
-
-#: bibletime/dummy.h:29 bibletime/frontend/coptionsdialog.cpp:653
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:78
-#: bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr "Fußnoten anzeigen"
-
-#: bibletime/frontend/coptionsdialog.cpp:658
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:80
-msgid "Show Strong's Numbers"
-msgstr "Strongs Nummern anzeigen"
-
-#: bibletime/frontend/coptionsdialog.cpp:668
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:83
-msgid "Show morphologic tags"
-msgstr "Morphologische Tags anzeigen"
-
-#: bibletime/frontend/coptionsdialog.cpp:673
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:85
-msgid "Show lemmas"
-msgstr "Wurzeln anzeigen"
-
-#: bibletime/frontend/coptionsdialog.cpp:678
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:87
-msgid "Show Hebrew vowel points"
-msgstr "Hebräische Vokalzeichen anzeigen"
-
-#: bibletime/frontend/coptionsdialog.cpp:683
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:89
-msgid "Show Hebrew cantillation marks"
-msgstr "Hebräische Kantillationszeichen anzeigen"
-
-#: bibletime/frontend/coptionsdialog.cpp:688
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:91
-msgid "Show Greek accents"
-msgstr "Griechische Akzente anzeigen"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:93
-msgid "Use alternative textual variant"
-msgstr "Benutze alternative Textvarianten"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:80
-msgid "Synchronize..."
-msgstr "Synchronisieren..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-msgid "Edit entry..."
-msgstr "Eintrag bearbeiten..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:96
-msgid "Commentary window"
-msgstr "Kommentarfenster"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:232
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:392
-msgid "The text was not saved to the module. Save the changes now?"
-msgstr ""
-"Der Text wurde noch nicht im Modul gesichert. Solle die Änderungen nun "
-"gesichert werden?"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:422
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:447
-msgid "Toggle synchronize button"
-msgstr "Synchronisation umschalten"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:511
-msgid "Save changes to module?"
-msgstr "Änderungen im Modul abspeichern?"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:68
-msgid "Toggle tree..."
-msgstr "Baumstruktur umschalten..."
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:90
-msgid "Book window"
-msgstr "Buchfenster"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:200
-#: bibletime/frontend/presenters/cbookpresenter.cpp:208
-msgid "Toggle tree"
-msgstr "Baumstruktur umschalten"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr "Module:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr "Gefundene Einträge:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:173
-msgid "module not set"
-msgstr "Modul nicht gesetzt"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:53
-msgid "Search properties"
-msgstr "Sucheinstellungen"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:72
-msgid "Multiple Words"
-msgstr "Mehere Wörter"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:80
-msgid "Exact Search"
-msgstr "Genaue Suche"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:87
-msgid "Regular Expression"
-msgstr "Regulärer Ausdruck"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:100
-msgid "Case Sensitive"
-msgstr "Unterscheidung von GROß / klein"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:104
-msgid "Search scope"
-msgstr "Suchbereich"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:108
-msgid "Search progress"
-msgstr "Suchfortschritt"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:113
-msgid "Current module:"
-msgstr "Aktuelles Modul:"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:114
-msgid "Overall:"
-msgstr "Insgesamt:"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search Dialog"
-msgstr "Suchdialog"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search"
-msgstr "Suche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Interrupt"
-msgstr "Abbrechen"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid "Choose modules"
-msgstr "Module auswählen"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-msgid "Choose the modules for the search"
-msgstr "Wählen Sie die Module für die Suche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Search Text"
-msgstr "Suche Text"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Enter the text to search for"
-msgstr "Geben sie den zu suchenden Text ein"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "Search Result"
-msgstr "Suchergebnis"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "The result of your search"
-msgstr "Das Ergebnis ihrer Suche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Search Analysis"
-msgstr "Suchanalyse"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Graphical analysis of your search result"
-msgstr "Grafische Analyse ihrer Suche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "HTML files"
-msgstr "HTML Dateien"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "Save Search Analysis"
-msgstr "Suchanalyse speichern"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:155
-msgid "BibleTime Search Analysis"
-msgstr "BibleTimes Suchanalyse"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:156
-msgid "Search Text :"
-msgstr "Suche Text::"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:157
-msgid "Search Type :"
-msgstr "Art der Suche:"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:158
-msgid "Search Scope:"
-msgstr "Suchbereich:"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:161
-msgid "Book"
-msgstr "Buch"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:162
-msgid "Total Hits"
-msgstr "Gesamte Treffer"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:186
-msgid "Created by"
-msgstr "Erzeugt von"
-
-#: bibletime/dummy.h:112
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:112
-msgid "No scope"
-msgstr "Kein Suchbereich"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr "Letztes Suchergebnis"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr "Suchbereich benutzen"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:223
-msgid "Choose custom range"
-msgstr "Eigenen Suchbereich auswählen"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr "Bereich bearbeiten"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr "Altes Testament"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr "Mose/Pentateuch/Torah"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr "Geschichte"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr "Propheten"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr "Neues Testament"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr "Evangelien"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr "Briefe/Episteln"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr "Paulus' Briefe"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:224
-msgid "Define range text"
-msgstr "Bereichsbezeichnung wählen"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:225
-msgid "Range parsing results"
-msgstr "Bereichsergebnis"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Range name"
-msgstr "Bereichsname"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Please enter a name for the new range"
-msgstr "Bitte geben Sie den Namen des neuen Bereiches ein"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr "Module"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr "Suchergebnis"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Search result with text"
-msgstr "Suchergebnis mit Text"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:152
-msgid "Appending keys to the printing queue ..."
-msgstr "Füge Stellen zur Druckschlange hinzu ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:166
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:195
-msgid "Copying search result to clipboard..."
-msgstr "Kopiere Suchergebnis in die Zwischenablage..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:181
-msgid "Saving the search result ..."
-msgstr "Speichern des Suchergebnisses ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:209
-msgid "Saving the search result..."
-msgstr "Speichern des Suchergebnisses..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:260
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:267
-msgid "Key"
-msgstr "Schlüssel"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:261
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:264
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:268
-msgid "Key with text"
-msgstr "Schlüssel mit Text"
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.txt | Textdateien\n"
-" *.* | Alle Dateien (*.*)"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid "Save key ..."
-msgstr "Speichere Schlüssel ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid ""
-"Choose the module you want to use for the search. The tree on the left "
-"contains all available modules, the tree on the right the modules for the "
-"search. Use the two arrow buttons to add or remove modules from the right "
-"tree."
-msgstr ""
-"Wählen Sie die Module, die für die Suche benutzt werden sollen. Der Baum auf "
-"der linken Seite enthält alle verfügbaren Module, der Baum auf der rechten "
-"die für die Suche benutzten Module. Benutzen Sie die beiden Knöpfe mit den "
-"Pfeilen, um Module von der rechten Seite zu entfernen oder dort hinzuzufügen."
-
-#: bibletime/frontend/ctoolclass.cpp:79
-msgid "The file does already exist!"
-msgstr "Die Datei existiert bereits!"
-
-#: bibletime/frontend/ctoolclass.cpp:80
-msgid "Do you want to overwrite it?"
-msgstr "Möchten Sie die Datei überschreiben?"
-
-#: bibletime/frontend/ctoolclass.cpp:96
-msgid "Sorry! But the file couldn't be saved!"
-msgstr "Die Datei konnte leider nicht gesichert werden!"
-
-#: bibletime/frontend/ctoolclass.cpp:97
-msgid "Please check permissions etc. !"
-msgstr "Bitte überprüfen Sie die Rechte usw.!"
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-msgid "Save search result ..."
-msgstr "Speichere Suchergebnis ..."
-
-#: bibletime/frontend/coptionsdialog.cpp:68
-msgid "Optionsdialog"
-msgstr "Optionendialog"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#: bibletime/frontend/coptionsdialog.cpp:314
-msgid "Create new profile"
-msgstr "Neues Profil anlegen"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-msgid "Please enter the name of the new profile"
-msgstr "Bitte geben Sie den Namen des neuen Profils ein"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-msgid "Rename profile"
-msgstr "Profil umbenennen"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-msgid "Please enter the new name of the profile"
-msgstr "Bitte geben Sie den neuen Namen des Profils ein"
-
-#: bibletime/frontend/coptionsdialog.cpp:170
-msgid "Startup"
-msgstr "Start"
-
-#: bibletime/frontend/coptionsdialog.cpp:174
-msgid "Show tip of the day"
-msgstr "Zeige Tipp des Tages"
-
-#: bibletime/frontend/coptionsdialog.cpp:184
-msgid "Show startuplogo"
-msgstr "Zeige Startlogo"
-
-#: bibletime/frontend/coptionsdialog.cpp:193
-msgid "Restore windows in workspace area"
-msgstr "Stelle Fenster im Arbeitsbereich wieder her"
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid "Choose fonts"
-msgstr "Schriften wählen"
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid ""
-"The fonts you can choose here are used in the display windows. Use the drop-"
-"down box below to choose the area of application. Then select a font for it. "
-"Make sure the charset \"iso10646-1\" is available for the selected Unicode "
-"font.!"
-msgstr ""
-"Die Schriften, die Sie hier auswählen können werden für die Anzeigefenster "
-"benutzt. Benutzen Sie die Aufklapliste weiter unten, um den "
-"Anwendungsbereich auszuwählen. Anschließend wählen Sie eine Schriftart aus. "
-"Bitte stellen Sie sicher, dass der Zeichensatz \"iso10646-1\" in der "
-"ausgewählten Unicode-Schriftart zur Verfügung steht!"
-
-#: bibletime/frontend/coptionsdialog.cpp:225
-msgid "The quick brown fox jumps over the lazy dog"
-msgstr "Franz jagt im komplett verwahrlosten Taxi quer durch Bayern"
-
-#: bibletime/frontend/coptionsdialog.cpp:238
-msgid "Colors"
-msgstr "Farben"
-
-#: bibletime/frontend/coptionsdialog.cpp:245
-msgid "Choose colors"
-msgstr "Farben wählen"
-
-#: bibletime/frontend/coptionsdialog.cpp:246
-msgid ""
-"Choose the colors to change the look of the display windows to your own "
-"preferences. Some options like \"Words of Jesus\" do only apply to texts "
-"which support this special feature."
-msgstr ""
-"Wählen Sie Farben, um das Aussehen der Anzeigefenster ihren eigenen "
-"Vorstellungen anzupassen. Einige Einstellungen wie \"Worte Jesu\" werden nur "
-"auf Texte angewendet, die dies unterstützen."
-
-#: bibletime/frontend/coptionsdialog.cpp:252
-msgid "Text"
-msgstr "Text"
-
-#: bibletime/frontend/coptionsdialog.cpp:257
-msgid "Background"
-msgstr "Hintergrund"
-
-#: bibletime/frontend/coptionsdialog.cpp:262
-msgid "Highlighted verse"
-msgstr "Hervorgehobener Vers"
-
-#: bibletime/frontend/coptionsdialog.cpp:267
-msgid "Hyperlinks"
-msgstr "Querverweise"
-
-#: bibletime/frontend/coptionsdialog.cpp:277
-msgid "Strong's numbers"
-msgstr "Strongs Nummern"
-
-#: bibletime/frontend/coptionsdialog.cpp:282
-msgid "Morphologic tags"
-msgstr "Morphologische Tags"
-
-#: bibletime/frontend/coptionsdialog.cpp:287
-msgid "Words of Jesus"
-msgstr "Worte Jesu"
-
-#: bibletime/frontend/coptionsdialog.cpp:297
-msgid "Profiles"
-msgstr "Profile"
-
-#: bibletime/frontend/coptionsdialog.cpp:302
-msgid "Manage your profiles"
-msgstr "Verwalten Sie ihre Profile"
-
-#: bibletime/frontend/coptionsdialog.cpp:303
-msgid ""
-"Profiles define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. Don't forget "
-"that new profiles only work after you've saved something in them."
-msgstr ""
-"Profile definieren das Aussehen des Arbeitsbereiches, zum Beispiel welche "
-"Fenster offen sind und welche Texte in diesen angezeigt werden sollen. "
-"Vergessen Sie nicht, dass neue Profile nur funktionieren, wenn etwas in "
-"ihnen gespeichert wurde."
-
-#: bibletime/frontend/coptionsdialog.cpp:318
-msgid "Delete selected profile"
-msgstr "Gewähltes Profil löschen"
-
-#: bibletime/frontend/coptionsdialog.cpp:322
-msgid "Rename selected profile"
-msgstr "Gewähltes Profil umbenennen"
-
-#: bibletime/frontend/coptionsdialog.cpp:340
-msgid "Accelerators"
-msgstr "Tastenkombinationen"
-
-#: bibletime/frontend/coptionsdialog.cpp:345
-msgid "Application wide"
-msgstr "Anwendungsweit"
-
-#: bibletime/frontend/coptionsdialog.cpp:368
-msgid "Bible windows"
-msgstr "Bibelfenster"
-
-#: bibletime/frontend/coptionsdialog.cpp:381
-msgid "Commentary windows"
-msgstr "Kommentarfenster"
-
-#: bibletime/frontend/coptionsdialog.cpp:394
-msgid "Lexicon windows"
-msgstr "Lexikonfenster"
-
-#: bibletime/frontend/coptionsdialog.cpp:408
-msgid "Book windows"
-msgstr "Buchfenster"
-
-#: bibletime/frontend/coptionsdialog.cpp:422
-msgid "Sword"
-msgstr "Sword"
-
-#: bibletime/frontend/coptionsdialog.cpp:425
-msgid "General"
-msgstr "Allgemein"
-
-#: bibletime/frontend/coptionsdialog.cpp:431
-#: bibletime/frontend/coptionsdialog.cpp:439
-msgid "Use key cache for lexicons"
-msgstr "Benutzen von Cachedateien für Lexikoneinträge"
-
-#: bibletime/frontend/coptionsdialog.cpp:432
-msgid ""
-"BibleTime can create a key cache for lexicons, which speeds up opening large "
-"lexicon modules a lot. However these files consume some disk space (usually "
-"not much), and reside in $KDEHOME/share/apps/bibletime/cache."
-msgstr ""
-"BibleTime kann einen Eintragscache für Lexika anlegen, was das Öffnen großer "
-"Lexikonmodule sehr beschleunigt. Diese Dateien können jedoch etwas "
-"Plattenplatz verbrauchen (normalerweise nicht viel), sie liegen in $KDEHOME/"
-"share/apps/bibletime/cache."
-
-#: bibletime/frontend/coptionsdialog.cpp:447
-msgid "Scrolling behaviour"
-msgstr "Scrollverhalten"
-
-#: bibletime/frontend/coptionsdialog.cpp:448
-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 ""
-"Die nach unten gerichteten Pfeile springt normalerweise zum <i>nächsten</i> "
-"Vers. Schalten Sie diese Box aus, wenn Sie zum <i>vorherigen</i> Eintrag "
-"springen möchten."
-
-#: bibletime/dummy.h:134 bibletime/frontend/coptionsdialog.cpp:454
-#: bibletime/tooltipdef.h:134
-msgid "Use down arrow to scroll to next verse"
-msgstr "Benutzen des nach-unten Pfeils für den nächsten Vers"
-
-#: bibletime/frontend/coptionsdialog.cpp:461
-msgid "Specify a language for biblical booknames"
-msgstr "Geben Sie eine Sprache für die Buchnamen der Bibel an"
-
-#: bibletime/frontend/coptionsdialog.cpp:462
-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 "
-"choose. If you want to create a new locale, see http://www.crosswire.org/"
-"sword/develop for details."
-msgstr ""
-"Sword hat eine Anzahl von Übersetzungen verfügbar, die zur "
-"Internationalisierung der Buchnamen benutzt werden können. Sie können die zu "
-"benutzende Übersetzung auswählen. Falls Sie eine neue Übersetzung anlegen "
-"möchten, schauen Sie auf http://www.crosswire.org/sword/develop nach "
-"Einzelheiten."
-
-#: bibletime/frontend/coptionsdialog.cpp:469
-msgid "Language for booknames"
-msgstr "Sprache für Buchnamen"
-
-#: bibletime/frontend/coptionsdialog.cpp:477
-msgid "English"
-msgstr "Englisch"
-
-#: bibletime/frontend/coptionsdialog.cpp:495
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid "Default modules"
-msgstr "Standardmodule"
-
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid ""
-"Default modules are used, when no module is specified. This may happen with "
-"references into modules like Bibles or Lexicons."
-msgstr ""
-"Standardmodule werden benutzt, wenn kein Modul angegeben wurde. Dies kann z."
-"B. mit Querverweisen in Bibeln oder Lexika auftreten."
-
-#: bibletime/frontend/coptionsdialog.cpp:505
-msgid "Default Bible"
-msgstr "Standard-Bibel"
-
-#: bibletime/frontend/coptionsdialog.cpp:513
-msgid "Default Commentary"
-msgstr "Standard-Kommentar"
-
-#: bibletime/frontend/coptionsdialog.cpp:522
-msgid "Default Lexicon"
-msgstr "Standard-Lexikon"
-
-#: bibletime/frontend/coptionsdialog.cpp:530
-msgid "Default Hebrew Strong's Lexicon"
-msgstr "Standardlexikon für hebräische Strongnummern"
-
-#: bibletime/frontend/coptionsdialog.cpp:538
-msgid "Default Greek Strong's Lexicon"
-msgstr "Standardlexikon für griechische Strongnummern"
-
-#: bibletime/frontend/coptionsdialog.cpp:546
-msgid "Default Hebrew Morphological Lexicon"
-msgstr "Standardlexikon für hebräische Morphologie"
-
-#: bibletime/frontend/coptionsdialog.cpp:553
-msgid "Default Greek Morphological Lexicon"
-msgstr "Standardlexikon für griechische Morphologie"
-
-#: bibletime/frontend/coptionsdialog.cpp:636
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid "Filter settings"
-msgstr "Filtereinstellungen"
-
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can choose the default settings of the various filter settings. You can "
-"change the settings in each display window, too."
-msgstr ""
-"Filter beeinflussen die Textanzeige in den Anzeigefenstern. Hier können Sie "
-"Standardeinstellungen für verschiedene Filter festlegen. Sie können die "
-"Einstellungen auch in den Anzeigefenstern verändern."
-
-#: bibletime/frontend/coptionsdialog.cpp:643
-msgid "Show line break after each verse"
-msgstr "Zeilenumbruch nach jedem Vers"
-
-#: bibletime/frontend/coptionsdialog.cpp:648
-msgid "Show verse numbers"
-msgstr "Zeige Versnummern"
-
-#: bibletime/frontend/coptionsdialog.cpp:693
-msgid "Use textual variants"
-msgstr "Benutze Textvarianten"
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Printing..."
-msgstr "Drucke..."
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Abort printing"
-msgstr "Drucken abbrechen"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr "&Hauptgruppe"
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr "&Fenster"
-
-#: bibletime/tips-dummy.cpp:3
-msgid ""
-"This is <B>BibleTime 1.1</B>!<BR>\n"
-"This version of BibleTime should have reached the state where it could\n"
-"be called stable, useful and user friendly!<BR>\n"
-msgstr ""
-"Das ist <B>BibleTime 1.1</B>!<BR>\n"
-"Diese Version von BibleTime sollte einen Status erreicht haben, in dem man "
-"es als stabil, nützlich und benutzerfreundlich ansehen kann!\n"
-
-#: bibletime/tips-dummy.cpp:9
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-"Die Bibel wurde geschrieben, damit wir an Jesus glauben. (Johannes 20,31)\n"
-
-#: bibletime/tips-dummy.cpp:13
-msgid ""
-"BibleTime 1.1 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 1.1 enthält ein wirklich nützliches Handbuch, dass von Fred "
-"Saalbach geschrieben wurde.\n"
-"Um es zu lesen, wählen Sie den Eintrag \"Handbuch\" aus dem \"Hilfe\" Menü "
-"von BibleTime aus.\n"
-
-#: bibletime/tips-dummy.cpp:18
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18)\n"
-msgstr ""
-"Es ist niemandem von Gott erlaubt, etwas zum Wort hinzuzufügen oder etwas "
-"davon wegzunehmen. (Offenbarung 22,18)\n"
-
-#: bibletime/tips-dummy.cpp:22
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr "Die Bibel ist wie ein Spiegel. (Jakobus 1,23)\n"
-
-#: bibletime/tips-dummy.cpp:26
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>! \n"
-"It was written by Bob Harman and is a great help how to study the Bible.\n"
-msgstr ""
-"BibleTime enthält eine <B>Anleitung zum Bibelstudium</B>!\n"
-"Sie wurde von Bob Harman geschrieben und ist eine große Hilfe um zu lernen "
-"die Bibel zu studieren.\n"
-
-#: bibletime/tips-dummy.cpp:31
-msgid ""
-"The Bible has the power to \"comfort the afflicted\" and \"afflict the "
-"comfortable\". (Revelation 10:10)\n"
-msgstr ""
-"Die Bibel kann die Bequemen plagen und die Geplagten trösten. (Offenbarung "
-"10,10)\n"
-
-#: bibletime/tips-dummy.cpp:35
-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 ""
-"Sie können ein komplettes Suchergebnis abspeichern, drucken oder kopieren, "
-"indem Sie mit der rechten Maustaste auf das Symbol des durchsuchten Modules "
-"im Suchdialog klicken.\n"
-
-#: bibletime/tips-dummy.cpp:39
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr "Die Bibel ist unsere einzige geistliche Waffe. (Epheser 6,17)\n"
-
-#: bibletime/tips-dummy.cpp:43
-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 ""
-"Um die Anzahl der Verse in der Bibel zu bekommen suchen sie nach einem "
-"Leerzeichen in dem Modul.\n"
-"Die Suchanalyse zeigt ihnen die Anzahl der Verse in jedem Buch.\n"
-
-#: bibletime/tips-dummy.cpp:48
-msgid "That the Bible is truth. (John 17:17)\n"
-msgstr "Die Bibel ist Wahrheit. (Johannes 17,17)\n"
-
-#: bibletime/tips-dummy.cpp:52
-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 ""
-"Wenn Sie Lesezeichen zu einem bestimmten Thema anlegen möchten mit "
-"Kommentaren über das, was der Herr ihnen gesagt hat, dann \n"
-"erzeugen Sie am besten Lesezeichen von ihrem persönlichen Kommentar.\n"
-
-#: bibletime/tips-dummy.cpp:57
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-"Die Heilige Schrift schenkt uns Weisheit, die zur Errettung führt. (2 "
-"Timotheus 3,15)\n"
-
-#: bibletime/tips-dummy.cpp:61
-msgid ""
-"It's possible to insert the text of bookmarks and references to verses or "
-"lexicon entries into the personal commentary editor by dropping them there.\n"
-msgstr ""
-"Es ist möglich den Text von Lesezeichen oder von Versreferenzen in den "
-"persönlichen Kommentar einzufügen, indem man sie in den Editor zieht.\n"
-
-#: bibletime/tips-dummy.cpp:65
-msgid ""
-"By studying the Bible you will have no reason to stand ashamed before God. "
-"(2 Timothy 2:15)\n"
-msgstr ""
-"Aufgrund des Bibelstudiums werden Sie vor Gott nicht beschämt dastehen "
-"müssen. (2 Timotheus 2,15)\n"
-
-#: bibletime/tips-dummy.cpp:69
-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 optionsdialog.\n"
-msgstr ""
-"Um die Bedeutung eines ursprünglich hebräischen oder griechischen Wortes in "
-"einer Bibel mit Strongnummern nachzuschlagen, schalten Sie einfach die "
-"Strongnummern an, und klicken sie darauf.\n"
-"Jetzt wird ein Fenster mit der Erklärung zu dieser Strongnummer angezeigt.\n"
-"Wenn Ihre Lieblingsübersetzung keine Strongnummern hat,dann benutzen Sie "
-"bitte eine andere Übersetzung, um die Nummer für das entsprechende Wort "
-"herauszufinden.\n"
-"Stellen Sie sicher, dass Sie die Standardmodule im Optionendialog "
-"eingestellt haben.\n"
-
-#: bibletime/tips-dummy.cpp:76
-msgid ""
-"If you want to use a commentary as a topical reference, search it for terms "
-"your topic is about.\n"
-msgstr ""
-"Wenn Sie einen Kommentar als theamtische Referenz benutzen möchten, "
-"durchsuchen Sie ihn nach Begriffen, von denen ihr Thema handelt.\n"
-
-#: bibletime/tips-dummy.cpp:80
-msgid ""
-"In the beginning was the Word, the Word was with God, and the Word was God. "
-"(John 1:1)\n"
-msgstr ""
-"Im Anfang war das Wort, und das Wort war bei Gott, und Gott war das Wort. "
-"(Johannes 1,1)\n"
-
-#: bibletime/tips-dummy.cpp:84
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-"Wir werden am letzten Tag durch die Worte, die Jesu gesprochen hat, "
-"gerichtet. (Johannes 12,48)\n"
-
-#: bibletime/tips-dummy.cpp:88
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the regular expression \"x | y | z\" for searching, which is "
-"equivalent to \"x OR y OR z\", e.g. \"pray | worship | supplicate\".\n"
-msgstr ""
-"Wenn Sie alle Verse oder Einträge über ein bestimmtes Themengebiet finden "
-"möchten, dann sollten sie den regulären Ausdruck \"x | y | z\" zum Suchen "
-"benutzen. Dieser ist identisch zu \"x ODER y ODER z\", also z.B. \"beten | "
-"preisen | flehen\".\n"
-
-#: bibletime/tips-dummy.cpp:92
-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 ""
-"Wenn Sie einen Vers suchen, den sie nur ungenau oder in einer anderen "
-"Sprache kennen, dann suchen Sie nach den Schlüsselbegriffen in mehreren "
-"Bibelübersetzungen zur selben Zeit.\n"
-
-#: bibletime/tips-dummy.cpp:96
-msgid ""
-"God's Word can be a lamp to your feet and a light to your path. (Psalm "
-"119:105)\n"
-msgstr ""
-"Dein Wort ist eine Leuchte für mein Leben, es gibt mir Licht für jeden "
-"nächsten Schritt.. (Psalm 119,105)\n"
-
-#: bibletime/tips-dummy.cpp:100
-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"
-"Now double click on it and drag the selected word on the foreign module in "
-"the main index.\n"
-"The search dialog will be opened with the word in the edit line.\n"
-msgstr ""
-"Wenn Sie ein Wort in einem ausländischen Modul (z.B. griechisch oder "
-"hebräisch) suchen möchten, öffnen Sie ein Anzeigefenster und wählen Sie ein "
-"Kapitel oder einen Eintrag, in welchem das Wort enthalten ist.\n"
-"Nun klicken Sie doppelt auf das Wort und ziehen Sie das ausgewählte Wort auf "
-"das gewünschte Modul in der Hauptgruppe.\n"
-"Der Suchdialog wird nun mit dem Wort in der Eingabezeile geöffnet.\n"
-
-#: bibletime/tips-dummy.cpp:106
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-"Das Wort Gottes wird nicht unverrichteter Dinge zu ihm zurückkehren, sondern "
-"es bewirkt, wozu Gott es gesandt hat. (Jesaja 55,11)\n"
-
-#: bibletime/tips-dummy.cpp:110
-msgid ""
-"Foreign modules (e.g. greek or hebrew) do often require a special unicode "
-"font to read them.\n"
-"Many of the fonts are available on www.crosswire.org or on the Sword CD.\n"
-msgstr ""
-"Ausländische Module (z.B. griechisch oder hebräisch) erfordern oftmals eine "
-"speziellen Unicode-Schriftart um sie zu lesen.\n"
-"Viele der Schriften sind verfügbar auf www.crosswire.org oder auf der Sword "
-"CD.\n"
-
-#: bibletime/tips-dummy.cpp:115
-msgid ""
-"Did you know that the first book ever printed on a printing press was the "
-"Bible. (by Johann Gutenberg, in 1492)\n"
-msgstr ""
-"Wussten Sie, dass das erste in einer Druckerpresse gedruckte Buch die Bibel "
-"war? (von Johannes Gutenberg im Jahre 1492)\n"
-
-#: bibletime/tips-dummy.cpp:119
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-"Gott in seiner Macht hat uns alles geschenkt, was wir zu einem Leben in "
-"wahrer Frömmigkeit brauchen. (1 Petrus 1,3)\n"
-
-#: bibletime/tips-dummy.cpp:123
-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 ""
-"Alle wichtigen Elemente von BibleTimes Benutzerschnittstelle haben einen "
-"Tooltip und eine \"What's this?\" Hilfe.<BR>\n"
-"Um die \"What's this?\" Hilfe zu lesen, drücken Sie die Tasten Umschalt+F1 "
-"und klicken auf den gewünschten Teil.\n"
-
-#: bibletime/tips-dummy.cpp:128
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-"Das Wort Gottes ist lebendig, wirksam und schärfer als das schärfste "
-"beidseitig geschliffene Schwert. (Hebräer 4,12)\n"
-
-#: bibletime/tips-dummy.cpp:132
-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 ""
-"Sie benutzen ein Programm, welches zur Ehre Gottes geschrieben wurde."
-"<BR>Möge Er Sie segnen, wenn Sie sein Wort studieren!\n"
-
-#: bibletime/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr "Druckschlange leeren"
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr "Den Druckdialog öffnen"
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr "BibleTime schließen"
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr "Suche in Modulen"
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr "Entferne ausgewählte Einträge"
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr "Hauptgruppe zeigen"
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr "Werkzeugleiste zeigen"
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr "Strongs Nummern anzeigen"
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr "Fenster kacheln"
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr "Fenster automatisch kacheln"
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr "Fenster staffeln"
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr "Fenster automatisch staffeln"
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr "Alle Fenster schließen"
-
-#: bibletime/dummy.h:37 bibletime/dummy.h:227 bibletime/tooltipdef.h:37
-#: bibletime/whatsthisdef.h:46
-msgid "Save current profile"
-msgstr "Aktuelles Profil speichern"
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-msgid "Edit profiles"
-msgstr "Profile bearbeiten"
-
-#: bibletime/dummy.h:39 bibletime/dummy.h:229 bibletime/tooltipdef.h:39
-#: bibletime/whatsthisdef.h:48
-msgid "Load a new profile"
-msgstr "Ein neues Profil laden"
-
-#: bibletime/dummy.h:40 bibletime/dummy.h:230 bibletime/tooltipdef.h:40
-#: bibletime/whatsthisdef.h:49
-msgid "Toggle fullscreen mode"
-msgstr "Vollbildmodus umschalten"
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Edit toolbar"
-msgstr "Werkzeugleiste bearbeiten"
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "BibleTime's handbook"
-msgstr "BibleTimes Handbuch"
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "BibleTime's installation documentation"
-msgstr "BibleTimes Installationsdokumentation"
-
-#: bibletime/dummy.h:47 bibletime/tooltipdef.h:47
-msgid "BibleTime's Bible study HowTo"
-msgstr "BibleTimes Anleitung zum Bibelstudium"
-
-#: bibletime/dummy.h:48 bibletime/tooltipdef.h:48
-msgid "Enter \"What's this?\" mode"
-msgstr "In den \"Was ist das?\" Modus wechseln"
-
-#: bibletime/dummy.h:49 bibletime/tooltipdef.h:49
-msgid "Send bugreport"
-msgstr "Fehlerbericht schicken"
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-msgid "Show daily tips at startup"
-msgstr "Zeige täglichen Tipp beim Start"
-
-#: bibletime/dummy.h:51 bibletime/tooltipdef.h:51
-msgid "About BibleTime"
-msgstr "Über BibleTime"
-
-#: bibletime/dummy.h:52 bibletime/tooltipdef.h:52
-msgid "About KDE"
-msgstr "Über KDE"
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "The main index"
-msgstr "Die Hauptgruppe"
-
-#: bibletime/dummy.h:62 bibletime/tooltipdef.h:62
-msgid "Add bookmark to printing queue"
-msgstr "Lesezeichen zur Druckschlange hinzufügen"
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "The working area"
-msgstr "Der Arbeitsbereich"
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Show the next entry"
-msgstr "Zeige den nächsten Eintrag"
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Show the previous entry"
-msgstr "Zeige den vorherigen Eintrag"
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-msgid "Jump to the next verse"
-msgstr "Zum nächsten Vers springen"
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-msgid "Jump to the previous verse"
-msgstr "Zum vorherigen Vers springen"
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-msgid "Show the next chapter"
-msgstr "Nächstes Kapitel anzeigen"
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-msgid "Show the previous chapter"
-msgstr "Vorheriges Kapitel anzeigen"
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-msgid "Show the next book"
-msgstr "Nächstes Buch anzeigen"
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-msgid "Show the previous book"
-msgstr "Vorheriges Buch anzeigen"
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of books"
-msgstr "Liste der Bücher"
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of chapters"
-msgstr "Liste der Kapitel"
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "List of verses"
-msgstr "Liste der Verse"
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "List of entries"
-msgstr "Liste der Einträge"
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Scroll through the list"
-msgstr "Durch die Liste bewegen"
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Edit this entry"
-msgstr "Bearbeite diesen Eintrag"
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Save this comment"
-msgstr "Diesen Kommentar speichern"
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Delete this comment"
-msgstr "Diesen Kommentar löschen"
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Comment up to"
-msgstr "Kommentieren bis zu"
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set bold"
-msgstr "Fett"
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set italic"
-msgstr "Kursiv"
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set underlined"
-msgstr "Unterstrichen"
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set font"
-msgstr "Setze Schriftart"
-
-#: bibletime/dummy.h:90 bibletime/tooltipdef.h:90
-msgid "Set the color"
-msgstr "Farbe setzen"
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Set the fontsize"
-msgstr "Schriftgröße setzen"
-
-#: bibletime/dummy.h:93 bibletime/tooltipdef.h:93
-msgid "Synchronize with Bible windows"
-msgstr "Synchronisiere mit Bibelfenstern"
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Save as HTML"
-msgstr "Als HTML speichern"
-
-#: bibletime/dummy.h:98 bibletime/tooltipdef.h:98
-msgid "Copy to clipboard"
-msgstr "In Zwischenablage kopieren"
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-msgid "Choose the modules to search in"
-msgstr "Wählen Sie die Module für die Suche"
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "Add the selected module to the list"
-msgstr "Füge das gewählte Modul zur Liste hinzu"
-
-#: bibletime/dummy.h:103 bibletime/tooltipdef.h:103
-msgid "Remove the selected module from the list"
-msgstr "Entferne das gewählte Modul von der Liste"
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "List of modules used for the search"
-msgstr "Liste der für die Suche verwendeten Module"
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-msgid "Search for this text"
-msgstr "Nach diesem Text suchen"
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search multiple words"
-msgstr "Suche mehrere Wörter"
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Exact match"
-msgstr "Genaue Suche"
-
-#: bibletime/dummy.h:109 bibletime/tooltipdef.h:109
-msgid "Search with GNU regular expressions"
-msgstr "Suche mit GNU Regulären Ausdrücken"
-
-#: bibletime/dummy.h:110 bibletime/tooltipdef.h:110
-msgid "Search case sensitive"
-msgstr "Suche mit GROß / klein Unterscheidung"
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Last search result"
-msgstr "Letztes Suchergebnis"
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-msgid "Use custom scope"
-msgstr "Eigenen Bereich benutzen"
-
-#: bibletime/dummy.h:115 bibletime/tooltipdef.h:115
-msgid "Add a new scope"
-msgstr "Füge einen neuen Bereich hinzu"
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Delete this search scope"
-msgstr "Lösche diesen Suchbereich"
-
-#: bibletime/dummy.h:117 bibletime/dummy.h:307 bibletime/tooltipdef.h:117
-#: bibletime/whatsthisdef.h:126
-msgid "Edit and define your search scopes"
-msgstr "Bearbeiten und definieren Sie ihre Suchbereiche"
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Choose a search scope from the list"
-msgstr "Wählen Sie einen Suchbereich aus der Liste"
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Enter your own search scope"
-msgstr "Geben Sie ihren eigenen Suchbereich ein"
-
-#: bibletime/dummy.h:120 bibletime/tooltipdef.h:120
-msgid "Parsed result"
-msgstr "Aufgelöstes Ergebnis"
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Close this dialog"
-msgstr "Schließe diesen Dialog"
-
-#: bibletime/dummy.h:123 bibletime/tooltipdef.h:123
-msgid "Used modules"
-msgstr "Benutzte Module"
-
-#: bibletime/dummy.h:124 bibletime/tooltipdef.h:124
-msgid "Items found"
-msgstr "Gefundene Einträge"
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Preview"
-msgstr "Vorschau"
-
-#: bibletime/dummy.h:127 bibletime/tooltipdef.h:127
-msgid "Graphical Search Analysis"
-msgstr "Grafische Suchanalyse"
-
-#: bibletime/dummy.h:131 bibletime/tooltipdef.h:131
-msgid "Show daily tip"
-msgstr "Zeige täglichen Tipp"
-
-#: bibletime/dummy.h:132 bibletime/tooltipdef.h:132
-msgid "List of languages"
-msgstr "Liste der Sprachen"
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-msgid "Show start-up logo"
-msgstr "Startlogo anzeigen"
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Restore the windows in the workspace on startup"
-msgstr "Stelle die Fenster des Arbeitsbereiches beim Start wieder her"
-
-#: bibletime/dummy.h:137 bibletime/tooltipdef.h:137
-msgid "Use cache files for the lexicon entries"
-msgstr "Benutzen von Cachedateien für Lexikoneinträge"
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "The default bible used in the workspace area"
-msgstr "Die Standardbibel, die im Arbeitsbereich verwendet wird."
-
-#: bibletime/dummy.h:139 bibletime/tooltipdef.h:139
-msgid "The default commentary used in the workspace area"
-msgstr "Der Standardkommentar, der im Arbeitsbereich verwendet wird."
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "The default lexicon used in the workspace area"
-msgstr "Das Standardlexikon, das im Arbeitsbereich verwendet wird."
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "The default Hebrew lexicon used in the workspace are"
-msgstr ""
-"Das Standardlexikon für Hebräisch, das im Arbeitsbereich verwendet wird."
-
-#: bibletime/dummy.h:142 bibletime/tooltipdef.h:142
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-"Das Standardlexikon für Griechisch, das im Arbeitsbereich verwendet wird."
-
-#: bibletime/dummy.h:143 bibletime/tooltipdef.h:143
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-"Das Standardlexikon für hebräische Morphologie, das im Arbeitsbereich "
-"verwendet wird."
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-"Das Standardlexikon für griechische Morphologie, das im Arbeitsbereich "
-"verwendet wird."
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Set keyboard accelerators"
-msgstr "Tastenkombinationen setzen"
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "Choose the area of application"
-msgstr "Wählen Sie den Anwendungsbereich"
-
-#: bibletime/dummy.h:150 bibletime/dummy.h:337 bibletime/tooltipdef.h:150
-#: bibletime/whatsthisdef.h:156
-msgid "Choose a font"
-msgstr "Wählen Sie eine Schriftart"
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Color of the background"
-msgstr "Farbe des Hintergrundes"
-
-#: bibletime/dummy.h:153 bibletime/tooltipdef.h:153
-msgid "Color of the highlighted verse"
-msgstr "Farbe des hervorgehobenen Verses"
-
-#: bibletime/dummy.h:155 bibletime/tooltipdef.h:155
-msgid "Keyboard accelerators used by all display windows"
-msgstr "Tastenkombinationen, die von allen Anzeigefenstern benutzt werden"
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Keyboard accelerators used by Bible windows"
-msgstr "Tastenkombinationen, die von Bibelfenstern benutzt werden"
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Keyboard accelerators used by commentary windows"
-msgstr "Tastenkombinationen, die von Kommentarfenstern benutzt werden"
-
-#: bibletime/dummy.h:158 bibletime/tooltipdef.h:158
-msgid "Keyboard accelerators used by lexicon windows"
-msgstr "Tastenkombinationen, die von Lexikonfenstern benutzt werden"
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Start printing"
-msgstr "Drucken starten"
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-msgid "Preview print job"
-msgstr "Druckvorschau anzeigen"
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Open help"
-msgstr "Hilfe öffnen"
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "List of print items"
-msgstr "Liste der Druckeinträge"
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Move item up"
-msgstr "Eintrag nach oben bewegen"
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Move item down"
-msgstr "Eintrag nach unten bewegen"
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Delete items"
-msgstr "Einträge löschen"
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "Insert a page break"
-msgstr "Einen Seitenumbruch einfügen"
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Page borders"
-msgstr "Seitenränder"
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Left border"
-msgstr "Linker Rand"
-
-#: bibletime/dummy.h:175 bibletime/tooltipdef.h:175
-msgid "Right border"
-msgstr "Rechter Rand"
-
-#: bibletime/dummy.h:176 bibletime/tooltipdef.h:176
-msgid "Upper border"
-msgstr "Oberer Rand"
-
-#: bibletime/dummy.h:177 bibletime/tooltipdef.h:177
-msgid "Lower border"
-msgstr "Unterer Rand"
-
-#: bibletime/dummy.h:178 bibletime/tooltipdef.h:178
-msgid "List of print styles"
-msgstr "Liste der Druckstile"
-
-#: bibletime/dummy.h:179 bibletime/tooltipdef.h:179
-msgid "Delete the selected style"
-msgstr "Lösche den gewählten Stil"
-
-#: bibletime/dummy.h:180 bibletime/tooltipdef.h:180
-msgid "Edit the selected style"
-msgstr "Bearbeite den gewählten Stil"
-
-#: bibletime/dummy.h:181 bibletime/tooltipdef.h:181
-msgid "Create a new printing style"
-msgstr "Erzeuge einen neuen Druckstil"
-
-#: bibletime/dummy.h:209 bibletime/whatsthisdef.h:28
-msgid ""
-"Clear the print queue of BibleTime. All items will be removed from the list "
-"and the print button will be disabled."
-msgstr ""
-"Leere die Druckschlange von BibleTime. Alle Einträge werden aus der Liste "
-"entfernt und der Drucken Knopf wird deaktiviert."
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:29
-msgid ""
-"Open the printer dialog of BibleTime.  Here you can edit the print queue and "
-"assign styles to the items."
-msgstr ""
-"Öffne den Druckdialog von BibleTime. Hier können Sie die Druckschlange "
-"bearbeiten und Sie können den Einträgen Stile zuweisen."
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr "Schließe BibleTime und speichere die Einstellungen."
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:32
-msgid "Open the search dialog to search for text in one or more modules."
-msgstr ""
-"Öffne den Suchdialog von BibleTime, um in einem oder mehreren Modulen zu "
-"suchen."
-
-#: bibletime/dummy.h:214 bibletime/whatsthisdef.h:33
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder, "
-"the subitems of it will be removed too."
-msgstr ""
-"Die ausgewählten Einträge aus dem Hauptindex löschen. <BR> Wenn Sie einen "
-"Ordner löschen, werden Untereinträge ebenfalls gelöscht."
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:34
-msgid ""
-"Reset the main index.<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-"Setze die Hauptgruppe zurück.<BR>Alle Lesezeichen und Ordner werden gelöscht "
-"und die anfänglichen Ordner werden wiederhergestellt."
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:36
-msgid "Toggle the main index view."
-msgstr "Zeige/Verstecke die Hauptgruppe."
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:37
-msgid "Toggle the main toolbar view."
-msgstr "Ansicht der Werkzeugleiste umschalten."
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:38
-msgid "Toggle footnotes in the modules."
-msgstr "Fußnoten in den Modulen umschalten."
-
-#: bibletime/dummy.h:220 bibletime/whatsthisdef.h:39
-msgid "Toggle Strong's numbers in the modules."
-msgstr "Strongs Nummern in den Modulen umschalten."
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:41
-msgid "Tile the open display windows."
-msgstr "Kacheln der geöffneten Anzeigefenster."
-
-#: bibletime/dummy.h:223 bibletime/whatsthisdef.h:42
-msgid "Automatically tile the display windows."
-msgstr "Anzeigefenster automatisch kacheln."
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:43
-msgid "Cascade the open display windows."
-msgstr "Staffeln der offenen Anzeigefenster."
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:44
-msgid "Automatically cascade the opened display windows."
-msgstr "Geöffnete Anzeigefenster automatisch staffeln."
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr "Schließe alle geöffneten Anzeigefenster."
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:47
-msgid "Edit profiles..."
-msgstr "Profile bearbeiten..."
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:52
-msgid "Open the BibleTime tool bar editor."
-msgstr "Öffnet BibleTimes Werkzeugleisteneditor."
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:53
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-"Öffnet BibleTimes Optionendialog, in dem Sie die meisten Einstellungen "
-"setzen können."
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:55
-msgid ""
-"Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr ""
-"Dies öffnet BibleTimes Handbuch im KDE Hilfeprogramm.<BR>Das Handbuch "
-"erklärt, wie man BibleTime am besten benutzt."
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:56
-msgid ""
-"Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The "
-"installation instructions explain how to set up BibleTime and the text "
-"modules."
-msgstr ""
-"Öffne BibleTimes Installationsanweisungen im KDE Hilfeprogramm.<BR>Die "
-"Installationsanweisungen erläutern, wie man BibleTime und die Textmodule "
-"richtig installiert."
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:57
-msgid ""
-"Open KDE's helpbrowser with the Bible study HowTo included with BibleTime."
-"<BR>This HowTo is an introduction how to study the Bible in an efficient way."
-msgstr ""
-"Öffne die mit BibleTime mitgelieferte Anleitung zum Biblestudium im "
-"Hilfeprogramm von KDE. <BR>Dieses HowTo ist eine Einführung in effektives "
-"Bibelstudium."
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:58
-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 ""
-"Wechsle in den \"Was ist das?\" Modus.<BR>Alle wichtigen Elemente der "
-"Oberfläche von BibleTime bieten eine \"Was ist das?\" Hilfe an."
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:59
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr "Schicke einen Problembericht an die Entwickler von BibleTime!"
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:60
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-"Zeige einen täglichen Tipp.<BR>Die Tipps enthalten wichtige Biblezitate und "
-"hilfreiche Benutzungshinweise für BibleTime."
-
-#: bibletime/dummy.h:242 bibletime/whatsthisdef.h:61
-msgid "Show detailed information about BibleTime."
-msgstr "Zeige detailierte Informationen über BibleTime an."
-
-#: bibletime/dummy.h:243 bibletime/whatsthisdef.h:62
-msgid "Show the \"about\" dialog of KDE 2."
-msgstr "Zeige den \"Über\" Dialog von KDE 2."
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:66
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-"Dies ist die Hauptgruppe von BibleTime.<BR>Benutzen Sie sie, um die "
-"installierten Module zu verwalten, um mit Lesezeichen zu arbeiten, um "
-"Anzeigefenster zu öffnen usw."
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:67
-msgid ""
-"Create a new folder in the main index.<BR>If you press the right mouse "
-"button on a folder, the new folder will become a sub-folder of it."
-"<BR>Otherwise you will create a toplevel folder."
-msgstr ""
-"Erzeuge einen neuen Ordner in der Hauptgruppe.<BR>Wenn Sie die rechte "
-"Maustaste über einem Ordner gedrückt haben wird der neue Ordner dessen "
-"Untereintrag.<BR>Ansonsten erzeugen Sie einen Ordner auf oberster Ebene."
-
-#: bibletime/dummy.h:249 bibletime/whatsthisdef.h:68
-msgid "Change the properties of the selected folder."
-msgstr "Ändern Sie die Eigenschaften des gewählten Ordners."
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:69
-msgid "Change the properties of the selected bookmark."
-msgstr "Ändern Sie die Eigenschaften des gewählten Lesezeichens."
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:70
-msgid "Import bookmarks from a file."
-msgstr "Importiere Lesezeichen aus einer Datei."
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:71
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-"Exportiere Lesezeichen,<BR>damit Sie oder andere Benutzer diese später "
-"importieren können."
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:72
-msgid ""
-"Use this to add this bookmark to BibleTime's print queue. The key, the "
-"description, and the text of the key will be used for printing."
-msgstr ""
-"Benutzen Sie dies, um dieses Lesezeichen zu BibleTimes Druckschlange "
-"hinzuzufügen. Der Schlüssel, die Beschreibung und der Text des Schlüssels "
-"werden zum Drucken benutzt."
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:73
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr ""
-"Öffnet einen Dialog in dem Sie das gewählte Modul entschlüsseln können."
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:74
-msgid "Open a dialog to show information about the selected module."
-msgstr "Öffnet einen Dialog der Informationen über das gewählte Modul anzeigt."
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:77
-msgid ""
-"This area is the main workspace of Bibletime.<BR>All display windows are "
-"opened in this window."
-msgstr ""
-"Dieser Bereich ist der Arbeitsplatz in BibleTime.<BR>Alle Anzeigefenster "
-"werden in diesem Bereich geöffnet."
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:79
-msgid "The next entry of the module will be shown."
-msgstr "Der nächste Eintrag des Modules wird angezeigt."
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:80
-msgid "The previous entry of the module will be shown."
-msgstr "Der vorherige Eintrag des Moduls wird angezeigt."
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:81
-msgid ""
-"For Bible texts, the next verse will be highlighted.<BR>In commentaries, the "
-"next entry will be shown."
-msgstr ""
-"In Bibeln wird der nächste Vers hervorgehoben.<BR>In Kommentaren wird der "
-"nächste Eintrag angezeigt."
-
-#: bibletime/dummy.h:263 bibletime/whatsthisdef.h:82
-msgid ""
-"For Bible texts, the previous verse will be highlighted. In commentaries,  "
-"the previous entry will be shown."
-msgstr ""
-"In Bibeln wird der vorherige Eintrag angezeigt. In Kommentaren wird der "
-"vorherige Antrag angezeigt."
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:83
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-"Zeige das nächste Kapitel des Modules an. Der Vers wird auf \"1\" gesetzt."
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:84
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-"Zeige das voherige Kapitel des Modules an. Der Vers wird auf \"1\" gesetzt."
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:85
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-"Zeige das nächste Buch des Modules. Das Kapitel und der Vers werden auf \"1"
-"\" gesetzt."
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:86
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-"Zeige das vorherige Buch des  Modules. Das Kapitel und der Vers werden auf "
-"\"1\" gesetzt."
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:87
-msgid "This list contains the books which are available in this module."
-msgstr "Diese Liste enthält die Bücher, die in diesem Modul vorhanden sind."
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:88
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr "Diese Liste enthält die Kapitel, die im aktuellen Buch vorhanden sind."
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:89
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-"Diese Liste enthält die Verse, die im aktuellen Kapitel vorhanden sind."
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:90
-msgid "This list contains the entries of the current module."
-msgstr "Diese Liste enthält die Einträge des aktuellen Modules."
-
-#: bibletime/dummy.h:272 bibletime/whatsthisdef.h:91
-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 ""
-"Dieser Knopf ist nützlich, um sich durch die Einträge der Liste zu bewegen. "
-"Drücken Sie den Knopf und bewegen Sie die Maus um den Eintrag zu erhöhen "
-"oder zu erniedrigen."
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:92
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-"Wechsle zwischen dem Lesen-Schreiben und dem Nur-Lesen Modus schreibbarer "
-"Module hin und her."
-
-#: bibletime/dummy.h:274 bibletime/whatsthisdef.h:93
-msgid "Save new personal comments."
-msgstr "Sichere den Persönlichen Kommentar."
-
-#: bibletime/dummy.h:275 bibletime/whatsthisdef.h:94
-msgid "Clear the text and delete the entry from the module."
-msgstr "Lösche den Text und entferne den Eintrag aus dem Modul."
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:95
-msgid "Toggle bold formatting of the selected text."
-msgstr ""
-"Wechsle zwischen fetter und nicht-fetter Formatierung des gewählten Textes."
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:96
-msgid "Toggle italic formatting of the selected text."
-msgstr ""
-"Wechsle zwischen kursiver und nicht-kursiver Formatierung des gewählten "
-"Textes."
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:97
-msgid "Toggle underlined formatting of the selected text."
-msgstr ""
-"Wechsle zwischen unterstrichener und nicht-unterstrichener Formatierung des "
-"gewählten Textes."
-
-#: bibletime/dummy.h:279 bibletime/whatsthisdef.h:98
-msgid "Choose a new font for the selected text."
-msgstr "Wähle eine neue Schriftart für den gewählten Text."
-
-#: bibletime/dummy.h:280 bibletime/whatsthisdef.h:99
-msgid "Choose a new color for the selected text."
-msgstr "Wählen Sie eine neue Farbe für den gewählten Text."
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:100
-msgid "Choose a new fontsize for the selected text."
-msgstr "Wähle eine neue Schriftgröße für den gewählten Text."
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:102
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-"Synchronisiere den angezeigten Vers dieses Moduls mit dem aktiven "
-"Bibelfenster."
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:105
-msgid "Save the displayed chapter as an HTML file."
-msgstr "Sichere das angezeigte Kapitel als HTML Datei."
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:106
-msgid "Select all text."
-msgstr "Den gesamten Text auswählen."
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:107
-msgid "Copy the displayed text to the clipboard."
-msgstr "Kopiere den angezeigten Text in die Zwischenablage."
-
-#: bibletime/dummy.h:291 bibletime/whatsthisdef.h:110
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two buttons "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-"Wählen Sie die Module, die für die Suche benutzt werden.<BR>Benutzen Sie die "
-"beiden Knöpfe auf der rechten Seite, um die Module zur Liste der benutzten "
-"hinzuzufügen oder daraus zu entfernen."
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:111
-msgid "Add the selected module to the list on the right."
-msgstr "Füge das gewählte Modul zur Liste auf der rechten Seite hinzu."
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:112
-msgid "Remove the selected module from the list on the right side."
-msgstr "Entferne das gewählte Modul von der Liste auf der rechten Seite."
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:113
-msgid "The list of modules used for the search."
-msgstr "Die Liste der für die Suche benutzten Module."
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:115
-msgid ""
-"The text entered in this edit box will be searched for in all selected "
-"modules."
-msgstr ""
-"Der in dieser Eingabebox eingegebene Text wird in allen Modulen gesucht."
-
-#: bibletime/dummy.h:297 bibletime/whatsthisdef.h:116
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit box above "
-"is searched as a single word."
-msgstr ""
-"Wählen Sie dies aus um nach mehreren Wörtern zu suchen.<BR> Jedes Wort in "
-"der Eingabezeile wird als ein einzelnes Wort gesucht."
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:117
-msgid ""
-"Select this to search for exactly the same text you entered in the edit box."
-msgstr ""
-"Wählen Sie dies aus um nach genau dem Text zu suchen, den Sie in der "
-"Eingabezeile eingegeben haben."
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:118
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-"Wählen Sie dies aus um unter Benutzung von GNU regulären Ausdrücken zu "
-"suchen.<BR>Lesen Sie das Handbuch für eine Erklärung wie sie zu benutzen "
-"sind."
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:119
-msgid "Activate this to use a case sensitive search."
-msgstr ""
-"Aktivieren Sie dies, um mit Unterscheidung zwischen GROß und klein zu suchen."
-
-#: bibletime/dummy.h:302 bibletime/whatsthisdef.h:121
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr ""
-"Wählen Sie dies aus, wenn Sie in allen Bereiche der gewählten Module suchen "
-"möchten."
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:122
-msgid ""
-"Select this if you want to use the last search result as the search scope."
-msgstr ""
-"Wählen Sie dies aus, um das letzte Suchergebniss jedes Moduls als "
-"Suchbereich zu benutzen."
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:123
-msgid "Create a new search scope."
-msgstr "Erzeuge einen neuen Suchbereich."
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:124
-msgid ""
-"Use a custom scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-"Benutze einen eigenen Suchbereich für die Suche.<BR>Es existieren bereits "
-"Standard-Suchbereiche."
-
-#: bibletime/dummy.h:306 bibletime/whatsthisdef.h:125
-msgid "Use this button to delete the chosen search scope."
-msgstr "Benutzen Sie diesen Knopf um den gewählten Suchbereich zu löschen."
-
-#: bibletime/dummy.h:308 bibletime/whatsthisdef.h:127
-msgid "Choose a search scope from the combo box"
-msgstr "Wählen Sie einen Suchbereich aus der Auswahlbox."
-
-#: bibletime/dummy.h:309 bibletime/whatsthisdef.h:128
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-"Geben Sie ihren eigenen Suchbereich ein.<BR>Um einen Bereich zu definieren "
-"benutzen sie \"-\" (z.B. 1. Mose-2. Mose),<BR>um verschiedene Bereiche zu "
-"trennen benutzen Sie das Semikolon (z.B. 1. Mose;Matthäus)."
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:129
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-"Diese Liste enthält die aufgelösten Suchbereiche ihres eingegeben Bereiches. "
-"Dieses Ergebnis wird für die Suche benutzt."
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:130
-msgid "Close this dialog and save the changes."
-msgstr "Schließe diesen Dialog und sichere die Änderungen."
-
-#: bibletime/dummy.h:313 bibletime/whatsthisdef.h:132
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-"Liste der für die Suche benutzten Module.<BR>Klicken Sie auf ein Modul um "
-"das Suchergebnis auf der rechten Seite zu sehen."
-
-#: bibletime/dummy.h:314 bibletime/whatsthisdef.h:133
-msgid "This contains the items found in the selected module."
-msgstr "Dies enthält die innerhalb des gewählten Moduls gefundenen Einträge."
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:134
-msgid "This text box shows a preview of the chosen item."
-msgstr "Diese Textbox zeigt eine Vorschau des gewählten Eintrags."
-
-#: bibletime/dummy.h:317 bibletime/whatsthisdef.h:136
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-"Grafische Analyse ihres Suchergebnisses.<BR>Die Balken zeigen die Anzahl von "
-"gefundenen Einträgen innerhalb jedes Buches einer Bibel oder eines "
-"Kommentars."
-
-#: bibletime/dummy.h:320 bibletime/whatsthisdef.h:139
-msgid "Activate this box to see a daily tip on startup."
-msgstr "Aktivieren Sie diese Box um einen täglichen Tipp beim Start zu sehen."
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:140
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-"Enthält die Sprachen, die für die Internationalen Buchnamen benutzt werden "
-"können."
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:141
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr "Aktivieren Sie dies, um das BibleTime Logo beim Start zu sehen."
-
-#: bibletime/dummy.h:323 bibletime/whatsthisdef.h:142
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr ""
-"Benutzen Sie dies, um den nach-unten Knopf zu benutzen um zum nächsten Vers "
-"zu springen"
-
-#: bibletime/dummy.h:324 bibletime/whatsthisdef.h:143
-msgid ""
-"Save the windows in the workspace if BibleTime is closed<BR>and restore them "
-"on the next startup. "
-msgstr ""
-"Sichere die Fenster des Arbeitsbereiches wenn BibleTime geschloßen "
-"wird<BR>und stelle diese beim nächsten Start wieder her."
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:145
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This will speed up opening the lexicons a lot, but consume some disk space. "
-"Recommended."
-msgstr ""
-"Aktivieren Sie dies, um BibleTime die Indexdateien für die Lexikoneinträge "
-"anlegen zu lassen. Dies beschleunigt das öffnen von Lexika ziemlich, aber es "
-"verbraucht mehr Speicherplatz. Empfohlen."
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:146
-msgid "The default Bible is used when a hyperlink into a Bible was clicked"
-msgstr ""
-"Die voreingestelle Bibel wird benutzt, wenn ein  Verweis auf eine "
-"Bibelstelle geklickt wurde."
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:147
-msgid ""
-"The default commentary is used when a hyperlink into a commentary was clicked"
-msgstr ""
-"Der voreingestelle Kommentar wird benutzt, wenn ein Verweis auf einen "
-"Kommentar angeklickt wurde."
-
-#: bibletime/dummy.h:329 bibletime/whatsthisdef.h:148
-msgid "The default lexicon is used when a hyperlink into a lexicon was clicked"
-msgstr ""
-"Das voreingestelle Lexikon wird benutzt, wenn ein Verweis auf ein Lexikon "
-"angeklickt wurde."
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:149
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon "
-"was clicked"
-msgstr ""
-"Das voreingestellte Lexikon für Hebräisch wird benutzt, wenn ein Verweis auf "
-"ein Hebräisch-Lexikon angeklickt wurde."
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:150
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon was "
-"clicked"
-msgstr ""
-"Das voreingestellte Lexikon für Griechisch wird benutzt, wenn ein Verweis "
-"auf ein Griechisch-Lexikon angeklickt wurde."
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:151
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text was clicked."
-msgstr ""
-"Das voreingestellte Lexikon für hebräische Morphologie wird benutzt, wenn "
-"ein Verweis auf ein morphologisches Tag in Hebräisch angeklickt wurde."
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:152
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text was clicked."
-msgstr ""
-"Das voreingestellte Lexikon für griechische Morphologie wird benutzt, wenn "
-"ein Verweis auf ein morphologisches Tag in Griechisch angeklickt wurde."
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:154
-msgid "Select an action and change the key binding for the action."
-msgstr "Wählen Sie eine Aktion aus und ändern Sie die Tastenkombination dafür."
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:155
-msgid ""
-"Use this box to select how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-"Wählen Sie in dieser Box wie die Schrift benutzt wird, und ändern Sie die "
-"Schrift in der Schriftauswahl."
-
-#: bibletime/dummy.h:339 bibletime/whatsthisdef.h:158
-msgid "This is the background color used in display windows."
-msgstr ""
-"Dies ist die Hintergrundfarbe, die in den Anzeigefenstern benutzt wird."
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:159
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr "Dies ist die Farbe des hervorgehobenen Textes in den Anzeigefenstern."
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:161
-msgid "Set the keyboard accelerators used in all display windows"
-msgstr ""
-"Setzen Sie die Tastenkombinationen, die von allen Anzeigefenstern benutzt "
-"werden."
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:162
-msgid "Set keyboard accelerators used in Bible windows"
-msgstr ""
-"Setzen Sie die Tastenkombinationen, die von Bibelfenstern benutzt werden."
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:163
-msgid "Set the keyboard accelerators used in commentary windows"
-msgstr ""
-"Setzen Sie die Tastenkombinationen, die von Kommentarfenstern benutzt werden."
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:164
-msgid "Set the keyboard accelerators used in lexicon windows"
-msgstr ""
-"Setzen Sie die Tastenkombinationen, die von Lexikonfenstern benutzt werden."
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:168
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-"Starte den Druckprozeß.<BR>Die Eintäge der Liste werden unter Benutzung der "
-"Druckstile gedruckt."
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:169
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-"Drucke in eine temporäre Datei und öffne einen Postscriptbetrachter um das "
-"Druckergebnis im Vorraus zu betrachten."
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:170
-msgid "Closes this dialog without doing anything else."
-msgstr "Schließe den Dialog ohne irgendetwas zu tun."
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:171
-msgid "Open the online help of BibleTime."
-msgstr "Öffne die Hilfe von BibleTime."
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:173
-msgid "This combo box contains the available print styles."
-msgstr "Diese Auswahlbox enthält die vorhandenen Druckstile."
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:174
-msgid "This is the list which contains the available print items."
-msgstr "Dies ist die Liste, die die vorhanden Druckeinträge enthält."
-
-#: bibletime/dummy.h:356 bibletime/whatsthisdef.h:175
-msgid "Move the selected item up one item."
-msgstr "Bewege den ausgewählten Eintrag eine Position höher."
-
-#: bibletime/dummy.h:357 bibletime/whatsthisdef.h:176
-msgid "Move the selected item down one item."
-msgstr "Bewege den ausgewählten Eintrag eine Position niedriger."
-
-#: bibletime/dummy.h:358 bibletime/whatsthisdef.h:177
-msgid "Delete the selected items."
-msgstr "Lösche den ausgewählten Eintrag."
-
-#: bibletime/dummy.h:359 bibletime/whatsthisdef.h:178
-msgid ""
-"Inserts a page break into the list.<BR>The printer will start a new page."
-msgstr ""
-"Füge einen Seitenumbruch in die Liste ein.<BR>Der Drucker wird an dieser "
-"Stelle eine neue Seite beginnen."
-
-#: bibletime/dummy.h:361 bibletime/whatsthisdef.h:180
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr ""
-"Diese Gruppe enthält die Seitenränder der Seite gemessen in Millimeter."
-
-#: bibletime/dummy.h:362 bibletime/whatsthisdef.h:181
-msgid "The size of the border on the left side of the paper."
-msgstr "Die Größe des linken Seitemrandes."
-
-#: bibletime/dummy.h:363 bibletime/whatsthisdef.h:182
-msgid "The size of the border on the right side of the paper."
-msgstr "Die Größe des rechten Seitenrandes."
-
-#: bibletime/dummy.h:364 bibletime/whatsthisdef.h:183
-msgid "The size of the border on the top of the paper."
-msgstr "Die Größe des oberen Seitenrandes."
-
-#: bibletime/dummy.h:365 bibletime/whatsthisdef.h:184
-msgid "The size of the border on the bottom of the paper."
-msgstr "Die Größe des unteren Seitenrandes."
-
-#: bibletime/dummy.h:366 bibletime/whatsthisdef.h:185
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-"Diese Liste enthält die vorhandenen Druckstile.<BR>Erzeugen Sie ihren "
-"eigenen unter Benutzung des \"Neuer Stil\" Knopfes."
-
-#: bibletime/dummy.h:367 bibletime/whatsthisdef.h:186
-msgid "Remove the selected printing style from the list."
-msgstr "Entferne den gewählten Druckstil aus der Liste."
-
-#: bibletime/dummy.h:368 bibletime/whatsthisdef.h:187
-msgid "Change the properties of the selected printing style."
-msgstr "Ändere die Einstellungen des gewählten Druckstiles."
-
-#: bibletime/dummy.h:369 bibletime/whatsthisdef.h:188
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr ""
-"Erstelle einen neuen Druckstil.<BR>Der neue Stil wird zur Liste hinzugefügt."
diff --git a/bibletime-doc/po/fr.gmo b/bibletime-doc/po/fr.gmo
deleted file mode 100644
index c22bc6a..0000000
--- a/bibletime-doc/po/fr.gmo
+++ /dev/null
diff --git a/bibletime-doc/po/fr.po b/bibletime-doc/po/fr.po
deleted file mode 100644
index be77113..0000000
--- a/bibletime-doc/po/fr.po
+++ /dev/null
@@ -1,3271 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-07 01:40+0200\n"
-"PO-Revision-Date: 2002-03-29 14:17GMT\n"
-"Last-Translator: Mathias BAVAY <Mathias.bavay@free.fr>\n"
-"Language-Team: français <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
-
-#: bibletime/backend/cswordbackend.cpp:313
-#: bibletime/frontend/coptionsdialog.cpp:272
-msgid "Footnotes"
-msgstr "notes"
-
-#: bibletime/backend/cswordbackend.cpp:315
-#, fuzzy
-msgid "Strong's Numbers"
-msgstr "numéros de strong"
-
-#: bibletime/backend/cswordbackend.cpp:317
-msgid "Headings"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:319
-msgid "Morphological Tags"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:321
-msgid "Lemmas"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:323
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:325
-#, fuzzy
-msgid "Hebrew Cantillation"
-msgstr "Orientation"
-
-#: bibletime/backend/cswordbackend.cpp:327
-msgid "Greek Accents"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:329
-msgid "Textual Variants"
-msgstr ""
-
-#: bibletime/main.cpp:110
-#, fuzzy
-msgid "Enable debug messages"
-msgstr "Messages de debuguage"
-
-#: bibletime/main.cpp:111
-msgid "Ignore the startup profile saved after the last BibleTime execution."
-msgstr ""
-
-#: bibletime/main.cpp:119
-msgid "Bible study tool for KDE 2"
-msgstr "Outil d'étude de la Bible pour KDE 2"
-
-#: bibletime/main.cpp:121
-#, fuzzy
-msgid "(c)1999-2002, The BibleTime Team"
-msgstr "(c)1999-2001, l'équipe BibleTime"
-
-#: bibletime/main.cpp:122
-#, fuzzy
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-"BibleTime est un outil convivial mais puissant d'étude de la Bible pour KDE "
-"2 \n"
-"\n"
-"Nous recherchons des développeurs, traducteurs et rédacteurs de "
-"documentation.\n"
-"Si vous voulez vous joindre à nous, envoyer un courrier électronique à "
-"info@bibletime.de."
-
-#: bibletime/main.cpp:130
-#, fuzzy
-msgid "Project coordinator"
-msgstr "Coordinateur du projet, frontend, backend"
-
-#: bibletime/main.cpp:131
-#, fuzzy
-msgid "Frontend, backend"
-msgstr "Frontend, backend, choses diverses"
-
-#: bibletime/main.cpp:132
-#, fuzzy
-msgid "Searchdialog"
-msgstr "Dialogue de recherche"
-
-#: bibletime/main.cpp:138
-msgid "Icons, startlogo, banners"
-msgstr ""
-
-#: bibletime/main.cpp:141
-msgid "Handbook"
-msgstr "Manuel"
-
-#: bibletime/main.cpp:144
-msgid "Translation into Czech"
-msgstr "Traduction en tchèque"
-
-#: bibletime/main.cpp:145
-msgid "Translation into Danish"
-msgstr "Traduction en danois"
-
-#: bibletime/main.cpp:146
-msgid "Translation into Dutch"
-msgstr "Traduction en néerlandais"
-
-#: bibletime/main.cpp:148
-msgid "Translation into French"
-msgstr "Traduction en français"
-
-#: bibletime/main.cpp:149
-msgid "Translation into Hungarian"
-msgstr "Traduction en hongrois"
-
-#: bibletime/main.cpp:150 bibletime/main.cpp:151
-msgid "Translation into Italian"
-msgstr "Traduction en italien"
-
-#: bibletime/main.cpp:152
-msgid "Translation into Norwegian"
-msgstr "Traduction en norvégien"
-
-#: bibletime/main.cpp:153
-msgid "Translation into Polish"
-msgstr "Traduction en polonais"
-
-#: bibletime/main.cpp:154
-msgid "Translation into Portoguese"
-msgstr "Traduction en portugais"
-
-#: bibletime/main.cpp:155
-#, fuzzy
-msgid "Translation into Russian"
-msgstr "Traduction en hongrois"
-
-#: bibletime/main.cpp:156
-msgid "Translation into Slovak"
-msgstr "Traduction en slovaque"
-
-#: bibletime/main.cpp:157
-#, fuzzy
-msgid "Translation into Spanish"
-msgstr "Traduction en danois"
-
-#: bibletime/main.cpp:160
-msgid "Bible study HowTo"
-msgstr "Bible study HowTo"
-
-#: bibletime/main.cpp:185
-#, fuzzy
-msgid "Starting BibleTime"
-msgstr "À propos de BibleTime"
-
-#: bibletime/bibletime_init.cpp:59
-#, fuzzy
-msgid "Creating BibleTime's GUI"
-msgstr "Configurer les couleurs de BibleTime"
-
-#: bibletime/bibletime_init.cpp:77
-msgid "Initializing menu- and toolbars"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:81
-msgid "Clear printing queue"
-msgstr "Vider la file d'impression"
-
-#: bibletime/bibletime_init.cpp:99 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr "Réinitialiser l'index principal"
-
-#: bibletime/bibletime_init.cpp:105
-msgid "Search in module(s)"
-msgstr "Recherche dans le(s) module(s)"
-
-#: bibletime/bibletime_init.cpp:111
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:297
-msgid "Remove selected item(s)"
-msgstr "Supprimer items sélectionnés"
-
-#: bibletime/bibletime_init.cpp:122
-msgid "&Show main index"
-msgstr "Afficher index &principal"
-
-#: bibletime/bibletime_init.cpp:137
-msgid "&Cascade"
-msgstr "C&ascade"
-
-#: bibletime/bibletime_init.cpp:143
-msgid "&Tile"
-msgstr "Mosaïque"
-
-#: bibletime/bibletime_init.cpp:149
-msgid "&Auto cascade"
-msgstr "&Auto cascade"
-
-#: bibletime/bibletime_init.cpp:155
-msgid "A&uto Tile"
-msgstr "A&uto mosaïque"
-
-#: bibletime/bibletime_init.cpp:161
-msgid "&Close all"
-msgstr "Tout fermer"
-
-#: bibletime/bibletime_init.cpp:167
-msgid "&Save profile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:172
-msgid "&Load profile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:177
-msgid "&Configure profiles"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:183
-msgid "&Fullscreen mode"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:202
-#, fuzzy
-msgid "&Handbook"
-msgstr "Manuel"
-
-#: bibletime/bibletime_init.cpp:208
-msgid "&Installation"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:214
-#, fuzzy
-msgid "&Bible Study Howto"
-msgstr "Bible study HowTo"
-
-#: bibletime/bibletime_init.cpp:229
-msgid "&Daily tip"
-msgstr "Astuce &journalière"
-
-#: bibletime/bibletime_init.cpp:294
-msgid "Initializing Sword"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:341
-msgid "Initializing printing system"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:40
-msgid "style editor"
-msgstr "éditeur de style"
-
-#: bibletime/printing/cstyleeditordialog.cpp:63
-msgid "Name of style:"
-msgstr "Nom du style"
-
-#: bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose the part of the style:"
-msgstr "Choisir la partie couverte par le style"
-
-#: bibletime/printing/cstyleeditordialog.cpp:73
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Header"
-msgstr "En-tête"
-
-#: bibletime/printing/cstyleeditordialog.cpp:74
-#: bibletime/printing/cstyleeditordialog.cpp:293
-msgid "Description"
-msgstr "Description"
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-#: bibletime/printing/cstyleeditordialog.cpp:297
-msgid "Module text"
-msgstr "Texte du module"
-
-#: bibletime/printing/cstyleeditordialog.cpp:81
-msgid "Enable this part"
-msgstr "Activer cette partie"
-
-#: bibletime/printing/cstyleeditordialog.cpp:104
-msgid "Foreground:"
-msgstr "Premier plan :"
-
-#: bibletime/printing/cstyleeditordialog.cpp:115
-msgid "Background:"
-msgstr "Arrière plan :"
-
-#: bibletime/printing/cstyleeditordialog.cpp:126
-msgid "Choose font"
-msgstr "Choisir la police"
-
-#: bibletime/printing/cstyleeditordialog.cpp:129
-msgid "Font preview"
-msgstr "Visualisation de la police"
-
-#: bibletime/printing/cstyleeditordialog.cpp:143
-msgid "Use frame"
-msgstr "Utiliser les cadres"
-
-#: bibletime/printing/cstyleeditordialog.cpp:154
-msgid "Line thickness (in point):"
-msgstr "Épaisseur de la ligne (en point) :"
-
-#: bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr "Couleur du cadre"
-
-#: bibletime/printing/cstyleeditordialog.cpp:170
-#, fuzzy
-msgid "Line style:"
-msgstr "Nom du style"
-
-#: bibletime/frontend/coptionsdialog.cpp:218
-#: bibletime/frontend/coptionsdialog.cpp:735
-#: bibletime/printing/cprintdialogpages.cpp:176
-#: bibletime/printing/cprinter.cpp:307 bibletime/printing/cprinter.cpp:316
-#: bibletime/printing/cstyle.cpp:180
-#: bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr "Standard"
-
-#: bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr "Nom :"
-
-#: bibletime/printing/cstyle.cpp:181
-msgid "Colored style for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:182
-msgid "Black&White for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:187
-msgid "unknown name"
-msgstr "inconnu"
-
-#: bibletime/dummy.h:166 bibletime/printing/cprintdialogpages.cpp:43
-#: bibletime/tooltipdef.h:166
-msgid "Styles"
-msgstr "Styles"
-
-#: bibletime/printing/cprintdialogpages.cpp:48
-msgid "Margins (in millimeter)"
-msgstr "Marges (en millimètres)"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Top"
-msgstr "&Haut"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Left"
-msgstr "&Gauche"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Right"
-msgstr "&Droite"
-
-#: bibletime/printing/cprintdialogpages.cpp:104
-msgid "List of style items:"
-msgstr "Liste des styles d'items :"
-
-#: bibletime/printing/cprintdialogpages.cpp:192
-#, fuzzy
-msgid "Print queue"
-msgstr "Imprimante"
-
-#: bibletime/printing/cprintdialogpages.cpp:203
-msgid "Choose a style"
-msgstr "Choisir un style"
-
-#: bibletime/printing/cprintdialogpages.cpp:215
-msgid "Entries which should be printed:"
-msgstr "Entrées à imprimer :"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:239
-#: bibletime/printing/cprintitemlist.cpp:44
-msgid "Module"
-msgstr "Module"
-
-#: bibletime/printing/cprintitemlist.cpp:45
-msgid "From"
-msgstr "De"
-
-#: bibletime/printing/cprintitemlist.cpp:46
-msgid "To"
-msgstr "À"
-
-#: bibletime/printing/cprintitemlist.cpp:47
-msgid "Style"
-msgstr "Style"
-
-#: bibletime/frontend/chtmldialog.cpp:84
-#, fuzzy
-msgid "Backward"
-msgstr "Arrière plan"
-
-#: bibletime/frontend/chtmldialog.cpp:102
-msgid "Forward"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr "Ok"
-
-#: bibletime/frontend/chtmlwidget.cpp:264
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr "Page %1 introuvable !"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.html *.htm *.shtml *.shtm | fichiers HTML\n"
-" *.* | tous les fichiers (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid "Save text as HTML page ..."
-msgstr "Enregistrer le texte en tant que page HTML ..."
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-"*.txt | fichier texte (*.txt)\n"
-"*.* | tous les fichiers (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid "Save text as plain text ..."
-msgstr "Enregistrer le texte en tant que texte seul ..."
-
-#: bibletime/frontend/chtmlwidget.cpp:501
-msgid "Choose a font:"
-msgstr "Choisir une police :"
-
-#: bibletime/frontend/chtmlwidget.cpp:505
-msgid "Choose font size"
-msgstr "Choisir une taille de police"
-
-#: bibletime/frontend/chtmlwidget.cpp:509
-msgid "Bold"
-msgstr "Gras"
-
-#: bibletime/frontend/chtmlwidget.cpp:513
-msgid "Underlined"
-msgstr "Souligné"
-
-#: bibletime/frontend/chtmlwidget.cpp:522
-msgid "Justify"
-msgstr "Justifié"
-
-#: bibletime/frontend/cprofile.cpp:33
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:178
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:189
-msgid "unknown"
-msgstr "inconnu"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:214
-msgid "Bookmark to"
-msgstr "Signet : "
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:539
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:241
-#, fuzzy
-msgid "Language"
-msgstr "Liste des langues"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:549
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:243
-msgid "Unlock key"
-msgstr "Clef de déverrouillage"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-msgid "not set"
-msgstr "non activé"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:532
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-msgid "Version"
-msgstr "Version"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:149
-msgid "Bibles"
-msgstr "Bibles"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:150
-msgid "Books"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:151
-msgid "Commentaries"
-msgstr "Commentaires"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:152
-msgid "Lexicons"
-msgstr "Lexiques"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:269
-msgid "Caption"
-msgstr "Titres"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:277
-msgid "Main index"
-msgstr "Index principal"
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:278
-#: bibletime/tooltipdef.h:57
-msgid "Create a new folder"
-msgstr "Créer un nouveau dossier"
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:281
-#: bibletime/tooltipdef.h:58
-msgid "Change this folder"
-msgstr "Renommer ce dossier"
-
-#: bibletime/dummy.h:59 bibletime/frontend/groupmanager/cgroupmanager.cpp:285
-#: bibletime/tooltipdef.h:59
-msgid "Change this bookmark"
-msgstr "Renommer ce signet"
-
-#: bibletime/dummy.h:60 bibletime/frontend/groupmanager/cgroupmanager.cpp:288
-#: bibletime/tooltipdef.h:60
-msgid "Import bookmarks"
-msgstr "Importer des signets"
-
-#: bibletime/dummy.h:61 bibletime/frontend/groupmanager/cgroupmanager.cpp:291
-#: bibletime/tooltipdef.h:61
-msgid "Export bookmarks"
-msgstr "Exporter les signets"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:294
-msgid "Print bookmark"
-msgstr "Imprimer les signets"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-msgid "Search in selected module(s)"
-msgstr "Rechercher dans les modules sélectionnés"
-
-#: bibletime/dummy.h:63 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:63
-msgid "Unlock this module"
-msgstr "Déverrouiller ce module"
-
-#: bibletime/dummy.h:64 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:64
-msgid "About this module"
-msgstr "À propos de ce module"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Bookmark description - BibleTime"
-msgstr "Description des signets - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Please enter here the description:"
-msgstr "Entrer ici la description :"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Change bookmark description - BibleTime"
-msgstr "Changer la description du signet - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Please change the description of the item!"
-msgstr "Changer la description de l'item !"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Change folder - BibleTime"
-msgstr "Renommer le dossier - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Please change the name of the group!"
-msgstr "Changer le nom du groupe !"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:536
-#, fuzzy
-msgid "Location"
-msgstr "Titres"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:544
-msgid "Writable"
-msgstr "Modifiable"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:545
-#, fuzzy
-msgid "yes"
-msgstr "Styles"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Encoding"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:219
-#: bibletime/frontend/coptionsdialog.cpp:738
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Unicode"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "iso8859-1"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:564
-msgid "Features"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Enter name of folder - BibleTime"
-msgstr "Entrer le nom du dossier - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Please enter the name of the folder!"
-msgstr "Entrer le nom du dossier !"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "BibleTime - Unlock module"
-msgstr "BibleTime - déverrouiller le module"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "Enter the key to unlock the module!"
-msgstr "Entrer la clef pour déverrouiller le module !"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1148
-msgid "Import bookmarks ..."
-msgstr "Import des signets ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1156
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Un problème est survenu lors de l'import des signets !<BR>Le format des "
-"signets importés est plus récent que <BR>celui des signets de cette version "
-"de BibleTime !<BR><B>L'import des signets pourrait ne pas fonctionner "
-"correctement !</B><BR>Voulez-vous poursuivre ?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1159
-msgid "Import of bookmarks"
-msgstr "Import des signets"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1173
-msgid "Export bookmarks ..."
-msgstr "Export des signets ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Cette fonction va réinitialiser l'index principal !<BR>Ceci va recréer "
-"lesgroupes d'origine et supprimer tout les autres items !<BR>Assurez vous "
-"que des signets importants ne vont pas être supprimés !<BR>Voulez-vous "
-"poursuivre ?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid "BibleTime - Reset main index"
-msgstr "BibleTime - réinitialisation de l'index principal"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:85
-msgid "Lexicon window"
-msgstr "Fenêtre du lexique"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:88
-msgid "Entry"
-msgstr "Entrée"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:100
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:89
-msgid "Text of entry"
-msgstr "Texte de l'entrée"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:106
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:90
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:95
-msgid "Entry with text"
-msgstr "Entrée avec du texte"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:100
-#: bibletime/frontend/presenters/cbookpresenter.cpp:98
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:103
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:92
-msgid "Selected text"
-msgstr "Sélectionner du texte"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:109
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:98
-msgid "Entry as plain text"
-msgstr "Entrée en tant que texte seul"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:106
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:110
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:99
-msgid "Entry as HTML"
-msgstr "Entrée en tant qu'HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:112
-#: bibletime/frontend/presenters/cbookpresenter.cpp:109
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:113
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:102
-msgid "Lookup selected text in lexicon"
-msgstr "Rechercher la sélection dans le lexique"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:114
-#: bibletime/frontend/presenters/cbookpresenter.cpp:111
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:115
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:104
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:270
-msgid "Copy..."
-msgstr "Copie..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:115
-#: bibletime/frontend/presenters/cbookpresenter.cpp:112
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:116
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:105
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:271
-msgid "Add to printing queue..."
-msgstr "Ajouter à la file d'impression..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:116
-#: bibletime/frontend/presenters/cbookpresenter.cpp:113
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:117
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:106
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:272
-msgid "Save..."
-msgstr "Sauvegarde..."
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:259
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:267
-#, fuzzy
-msgid "Next entry"
-msgstr "Texte de l'entrée"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:260
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:270
-#, fuzzy
-msgid "Previous entry"
-msgstr "Afficher l'entrée précédente"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:92
-msgid "Bible window"
-msgstr "Fenêtre de Bible"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:95
-msgid "Verse"
-msgstr "Verset"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:96
-msgid "Text of verse"
-msgstr "Texte du verset"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:97
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:103
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:107
-msgid "Verse with text"
-msgstr "Verset avec du texte"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:98
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:104
-msgid "Chapter"
-msgstr "Chapitre"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:108
-msgid "Chapter as plain text"
-msgstr "Chapitre en tant que texte seul"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:109
-msgid "Chapter as HTML"
-msgstr "Chapitre en tant qu'HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:327
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:343
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:413
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:432
-#, fuzzy
-msgid "Next book"
-msgstr "Afficher le livre suivant"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:328
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:345
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:414
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:434
-#, fuzzy
-msgid "Previous book"
-msgstr "Afficher le livre précédent"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:330
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:348
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:416
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:437
-#, fuzzy
-msgid "Next chapter"
-msgstr "Afficher le chapitre suivant"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:331
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:350
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:417
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:439
-#, fuzzy
-msgid "Previous chapter"
-msgstr "Afficher le chapitre précédent"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:333
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:353
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:419
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:442
-#, fuzzy
-msgid "Next verse"
-msgstr "Texte du verset"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:334
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:355
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:420
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:444
-#, fuzzy
-msgid "Previous verse"
-msgstr "Aller au verset précédent"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:47
-msgid "Select additional modules"
-msgstr "Sélectionner des modules additionnels"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:126
-msgid "NONE"
-msgstr "RIEN"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:70
-#, fuzzy
-msgid "Display options"
-msgstr "Fenêtre d'affichage"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:73
-msgid "Use linebreaks"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:74
-#, fuzzy
-msgid "Show versenumbers"
-msgstr "Afficher les numéros de strong"
-
-#: bibletime/frontend/coptionsdialog.cpp:663
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:76
-msgid "Show headings"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/frontend/coptionsdialog.cpp:653
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:78
-#: bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr "Afficher les notes"
-
-#: bibletime/frontend/coptionsdialog.cpp:658
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:80
-#, fuzzy
-msgid "Show Strong's Numbers"
-msgstr "Afficher les numéros de strong"
-
-#: bibletime/frontend/coptionsdialog.cpp:668
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:83
-msgid "Show morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:673
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:85
-msgid "Show lemmas"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:678
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:87
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:683
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:89
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:688
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:91
-msgid "Show Greek accents"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:93
-msgid "Use alternative textual variant"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:80
-msgid "Synchronize..."
-msgstr "Synchronisation..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-msgid "Edit entry..."
-msgstr "Éditer l'entrée..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:96
-msgid "Commentary window"
-msgstr "Fenêtre de commentaires"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:232
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:392
-msgid "The text was not saved to the module. Save the changes now?"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:422
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:447
-msgid "Toggle synchronize button"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:511
-#, fuzzy
-msgid "Save changes to module?"
-msgstr "Rechercher dans les modules"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:68
-msgid "Toggle tree..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:90
-#, fuzzy
-msgid "Book window"
-msgstr "Fenêtre de Bible"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:200
-#: bibletime/frontend/presenters/cbookpresenter.cpp:208
-msgid "Toggle tree"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr "Modules :"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr "Entrées trouvées"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:173
-#, fuzzy
-msgid "module not set"
-msgstr "<I>module non activé</I>"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:53
-msgid "Search properties"
-msgstr "Propriétés de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:72
-msgid "Multiple Words"
-msgstr "Mots multiples"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:80
-msgid "Exact Search"
-msgstr "Recherche exacte"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:87
-msgid "Regular Expression"
-msgstr "Expression régulière"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:100
-msgid "Case Sensitive"
-msgstr "Préserver la case"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:104
-msgid "Search scope"
-msgstr "Étendue de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:108
-msgid "Search progress"
-msgstr "Progression de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:113
-msgid "Current module:"
-msgstr "Module courant :"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:114
-msgid "Overall:"
-msgstr "Totalité :"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search Dialog"
-msgstr "Dialogue de recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search"
-msgstr "Rechercher"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Interrupt"
-msgstr "Interrompre"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid "Choose modules"
-msgstr "Choisir les modules"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-msgid "Choose the modules for the search"
-msgstr "Choisir les modules pour la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Search Text"
-msgstr "Rechercher le texte"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Enter the text to search for"
-msgstr "Entrer le texte à rechercher"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "Search Result"
-msgstr "Résultats de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "The result of your search"
-msgstr "Le résultat de votre recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Search Analysis"
-msgstr "Analyse de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Graphical analysis of your search result"
-msgstr "Analyse graphique de vos résultats de recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "HTML files"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-#, fuzzy
-msgid "Save Search Analysis"
-msgstr "Analyse de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:155
-#, fuzzy
-msgid "BibleTime Search Analysis"
-msgstr "Analyse de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:156
-#, fuzzy
-msgid "Search Text :"
-msgstr "Rechercher le texte"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:157
-#, fuzzy
-msgid "Search Type :"
-msgstr "Rechercher le texte"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:158
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Étendue de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:161
-msgid "Book"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:162
-msgid "Total Hits"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:186
-msgid "Created by"
-msgstr ""
-
-#: bibletime/dummy.h:112
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:112
-msgid "No scope"
-msgstr "Pas de limites"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr "Dernier résultat"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr "Limiter l'étendue"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:223
-msgid "Choose custom range"
-msgstr "Choisir une plage personnalisée"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr "Éditer les plages"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr "Ancien Testament"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr "Histoire"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr "Prophètes"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr "Nouveau Testament"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr "Cantiques"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr "Lettres/épîtres"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr "Épîtres de Paul"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:224
-msgid "Define range text"
-msgstr "Définir l'étendue de la plage"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:225
-msgid "Range parsing results"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Range name"
-msgstr "Nom de la plage"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Please enter a name for the new range"
-msgstr "Entrer un nom pour cette nouvelle plage de recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr "Modules"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr "Résultats de la recherche"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Search result with text"
-msgstr "Résultats de la recherche avec texte"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:152
-#, fuzzy
-msgid "Appending keys to the printing queue ..."
-msgstr "Ajouter à la file d'impression..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:166
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:195
-#, fuzzy
-msgid "Copying search result to clipboard..."
-msgstr "Copier dans le presse-papier"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:181
-#, fuzzy
-msgid "Saving the search result ..."
-msgstr "Enregistrer le résultat de la recherche ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:209
-#, fuzzy
-msgid "Saving the search result..."
-msgstr "Enregistrer le résultat de la recherche ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:260
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:267
-msgid "Key"
-msgstr "Clef"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:261
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:264
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:268
-msgid "Key with text"
-msgstr "Clef avec texte"
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.txt | fichiers texte\n"
-" *.* | tous les fichiers (*.*)"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid "Save key ..."
-msgstr "Enregistrer la clef ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid ""
-"Choose the module you want to use for the search. The tree on the left "
-"contains all available modules, the tree on the right the modules for the "
-"search. Use the two arrow buttons to add or remove modules from the right "
-"tree."
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:79
-msgid "The file does already exist!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:80
-msgid "Do you want to overwrite it?"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:96
-msgid "Sorry! But the file couldn't be saved!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:97
-msgid "Please check permissions etc. !"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-msgid "Save search result ..."
-msgstr "Enregistrer le résultat de la recherche ..."
-
-#: bibletime/frontend/coptionsdialog.cpp:68
-msgid "Optionsdialog"
-msgstr "Dialogue d'options"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#: bibletime/frontend/coptionsdialog.cpp:314
-#, fuzzy
-msgid "Create new profile"
-msgstr "Créer un nouveau dossier"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#, fuzzy
-msgid "Please enter the name of the new profile"
-msgstr "Entrer le nom du dossier !"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-msgid "Rename profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Please enter the new name of the profile"
-msgstr "Entrer le nom du dossier !"
-
-#: bibletime/frontend/coptionsdialog.cpp:170
-#, fuzzy
-msgid "Startup"
-msgstr "Afficher le logo au démarrage"
-
-#: bibletime/frontend/coptionsdialog.cpp:174
-msgid "Show tip of the day"
-msgstr "Afficher l'astuce du jour"
-
-#: bibletime/frontend/coptionsdialog.cpp:184
-msgid "Show startuplogo"
-msgstr "Afficher le logo au démarrage"
-
-#: bibletime/frontend/coptionsdialog.cpp:193
-msgid "Restore windows in workspace area"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-#, fuzzy
-msgid "Choose fonts"
-msgstr "Choisir la police"
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid ""
-"The fonts you can choose here are used in the display windows. Use the drop-"
-"down box below to choose the area of application. Then select a font for it. "
-"Make sure the charset \"iso10646-1\" is available for the selected Unicode "
-"font.!"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:225
-#, fuzzy
-msgid "The quick brown fox jumps over the lazy dog"
-msgstr "Une bibliothèque, c'est le carrefour de tous les rêves de l'humanité."
-
-#: bibletime/frontend/coptionsdialog.cpp:238
-msgid "Colors"
-msgstr "Couleurs"
-
-#: bibletime/frontend/coptionsdialog.cpp:245
-#, fuzzy
-msgid "Choose colors"
-msgstr "Choisir les modules"
-
-#: bibletime/frontend/coptionsdialog.cpp:246
-msgid ""
-"Choose the colors to change the look of the display windows to your own "
-"preferences. Some options like \"Words of Jesus\" do only apply to texts "
-"which support this special feature."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:252
-msgid "Text"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:257
-msgid "Background"
-msgstr "Arrière plan"
-
-#: bibletime/frontend/coptionsdialog.cpp:262
-#, fuzzy
-msgid "Highlighted verse"
-msgstr "Verset surligné"
-
-#: bibletime/frontend/coptionsdialog.cpp:267
-msgid "Hyperlinks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:277
-msgid "Strong's numbers"
-msgstr "numéros de strong"
-
-#: bibletime/frontend/coptionsdialog.cpp:282
-msgid "Morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:287
-msgid "Words of Jesus"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:297
-#, fuzzy
-msgid "Profiles"
-msgstr "Impression dans le fichier :"
-
-#: bibletime/frontend/coptionsdialog.cpp:302
-msgid "Manage your profiles"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:303
-msgid ""
-"Profiles define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. Don't forget "
-"that new profiles only work after you've saved something in them."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:318
-#, fuzzy
-msgid "Delete selected profile"
-msgstr "Supprime l'item sélectionné."
-
-#: bibletime/frontend/coptionsdialog.cpp:322
-#, fuzzy
-msgid "Rename selected profile"
-msgstr "Supprimer les items sélectionnés"
-
-#: bibletime/frontend/coptionsdialog.cpp:340
-msgid "Accelerators"
-msgstr "Raccourcis"
-
-#: bibletime/frontend/coptionsdialog.cpp:345
-msgid "Application wide"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:368
-#, fuzzy
-msgid "Bible windows"
-msgstr "Fenêtre de Bible"
-
-#: bibletime/frontend/coptionsdialog.cpp:381
-#, fuzzy
-msgid "Commentary windows"
-msgstr "Fenêtre de commentaires"
-
-#: bibletime/frontend/coptionsdialog.cpp:394
-#, fuzzy
-msgid "Lexicon windows"
-msgstr "Fenêtre du lexique"
-
-#: bibletime/frontend/coptionsdialog.cpp:408
-#, fuzzy
-msgid "Book windows"
-msgstr "Fenêtres en mosaïque"
-
-#: bibletime/frontend/coptionsdialog.cpp:422
-msgid "Sword"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:425
-msgid "General"
-msgstr "Général"
-
-#: bibletime/frontend/coptionsdialog.cpp:431
-#: bibletime/frontend/coptionsdialog.cpp:439
-msgid "Use key cache for lexicons"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:432
-msgid ""
-"BibleTime can create a key cache for lexicons, which speeds up opening large "
-"lexicon modules a lot. However these files consume some disk space (usually "
-"not much), and reside in $KDEHOME/share/apps/bibletime/cache."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:447
-msgid "Scrolling behaviour"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:448
-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/dummy.h:134 bibletime/frontend/coptionsdialog.cpp:454
-#: bibletime/tooltipdef.h:134
-msgid "Use down arrow to scroll to next verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:461
-#, fuzzy
-msgid "Specify a language for biblical booknames"
-msgstr "Langue des noms de livres"
-
-#: bibletime/frontend/coptionsdialog.cpp:462
-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 "
-"choose. If you want to create a new locale, see http://www.crosswire.org/"
-"sword/develop for details."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:469
-msgid "Language for booknames"
-msgstr "Langue des noms de livres"
-
-#: bibletime/frontend/coptionsdialog.cpp:477
-msgid "English"
-msgstr "Anglais"
-
-#: bibletime/frontend/coptionsdialog.cpp:495
-#: bibletime/frontend/coptionsdialog.cpp:500
-#, fuzzy
-msgid "Default modules"
-msgstr "Modules utilisés"
-
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid ""
-"Default modules are used, when no module is specified. This may happen with "
-"references into modules like Bibles or Lexicons."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:505
-msgid "Default Bible"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:513
-#, fuzzy
-msgid "Default Commentary"
-msgstr "Commentaires"
-
-#: bibletime/frontend/coptionsdialog.cpp:522
-#, fuzzy
-msgid "Default Lexicon"
-msgstr "Lexiques"
-
-#: bibletime/frontend/coptionsdialog.cpp:530
-msgid "Default Hebrew Strong's Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:538
-msgid "Default Greek Strong's Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:546
-msgid "Default Hebrew Morphological Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:553
-msgid "Default Greek Morphological Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:636
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid "Filter settings"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can choose the default settings of the various filter settings. You can "
-"change the settings in each display window, too."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:643
-msgid "Show line break after each verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:648
-#, fuzzy
-msgid "Show verse numbers"
-msgstr "Afficher les numéros de strong"
-
-#: bibletime/frontend/coptionsdialog.cpp:693
-msgid "Use textual variants"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Printing..."
-msgstr "Impression..."
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Abort printing"
-msgstr "Annuler l'impression"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr "&Index "
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr "Fe&nêtre"
-
-#: bibletime/tips-dummy.cpp:3
-msgid ""
-"This is <B>BibleTime 1.1</B>!<BR>\n"
-"This version of BibleTime should have reached the state where it could\n"
-"be called stable, useful and user friendly!<BR>\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:9
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:13
-msgid ""
-"BibleTime 1.1 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:18
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:22
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:26
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>! \n"
-"It was written by Bob Harman and is a great help how to study the Bible.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:31
-msgid ""
-"The Bible has the power to \"comfort the afflicted\" and \"afflict the "
-"comfortable\". (Revelation 10:10)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:35
-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:39
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:43
-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:48
-msgid "That the Bible is truth. (John 17:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:52
-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:57
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:61
-msgid ""
-"It's possible to insert the text of bookmarks and references to verses or "
-"lexicon entries into the personal commentary editor by dropping them there.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:65
-msgid ""
-"By studying the Bible you will have no reason to stand ashamed before God. "
-"(2 Timothy 2:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:69
-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 optionsdialog.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:76
-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:80
-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:84
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:88
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the regular expression \"x | y | z\" for searching, which is "
-"equivalent to \"x OR y OR z\", e.g. \"pray | worship | supplicate\".\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:92
-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:96
-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:100
-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"
-"Now double click on it and drag the selected word on the foreign module in "
-"the main index.\n"
-"The search dialog will be opened with the word in the edit line.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:106
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:110
-msgid ""
-"Foreign modules (e.g. greek or hebrew) do often require a special unicode "
-"font to read them.\n"
-"Many of the fonts are available on www.crosswire.org or on the Sword CD.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:115
-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:119
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:123
-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:128
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:132
-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/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr "Effacer la file d'impression"
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr "Ouvrir le dialogue d'impression"
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr "Fermer BibleTime"
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr "Rechercher dans les modules"
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr "Supprimer les items sélectionnés"
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr "Afficher l'index principal"
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr "Afficher la barre d'outils"
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr "Afficher les numéros de strong"
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr "Fenêtres en mosaïque"
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr "Fenêtres en mosaïque automatiquement"
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr "Fenêtres en cascade"
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr "Fenêtres en cascade automatiquement"
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr "Fermer toutes les fenêtres"
-
-#: bibletime/dummy.h:37 bibletime/dummy.h:227 bibletime/tooltipdef.h:37
-#: bibletime/whatsthisdef.h:46
-msgid "Save current profile"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-#, fuzzy
-msgid "Edit profiles"
-msgstr "Éditer les plages"
-
-#: bibletime/dummy.h:39 bibletime/dummy.h:229 bibletime/tooltipdef.h:39
-#: bibletime/whatsthisdef.h:48
-#, fuzzy
-msgid "Load a new profile"
-msgstr "Ajouter une nouvelle plage"
-
-#: bibletime/dummy.h:40 bibletime/dummy.h:230 bibletime/tooltipdef.h:40
-#: bibletime/whatsthisdef.h:49
-msgid "Toggle fullscreen mode"
-msgstr ""
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Edit toolbar"
-msgstr "Éditer la barre d'outils"
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "BibleTime's handbook"
-msgstr "Manuel de BibleTime"
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "BibleTime's installation documentation"
-msgstr ""
-
-#: bibletime/dummy.h:47 bibletime/tooltipdef.h:47
-#, fuzzy
-msgid "BibleTime's Bible study HowTo"
-msgstr "Bible study HowTo"
-
-#: bibletime/dummy.h:48 bibletime/tooltipdef.h:48
-msgid "Enter \"What's this?\" mode"
-msgstr "Entrer en mode \"Qu'est ce que c'est ?\""
-
-#: bibletime/dummy.h:49 bibletime/tooltipdef.h:49
-msgid "Send bugreport"
-msgstr "Envoyer un rapport de bug"
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-#, fuzzy
-msgid "Show daily tips at startup"
-msgstr "Afficher les astuces quotidiennes"
-
-#: bibletime/dummy.h:51 bibletime/tooltipdef.h:51
-msgid "About BibleTime"
-msgstr "À propos de BibleTime"
-
-#: bibletime/dummy.h:52 bibletime/tooltipdef.h:52
-msgid "About KDE"
-msgstr "À propos de KDE"
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "The main index"
-msgstr "L'index principal"
-
-#: bibletime/dummy.h:62 bibletime/tooltipdef.h:62
-msgid "Add bookmark to printing queue"
-msgstr "Ajouter les signets à la file d'impression"
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "The working area"
-msgstr "L'aire de travail"
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Show the next entry"
-msgstr "Afficher l'entrée suivante"
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Show the previous entry"
-msgstr "Afficher l'entrée précédente"
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-#, fuzzy
-msgid "Jump to the next verse"
-msgstr "Aller au verset suivant"
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-#, fuzzy
-msgid "Jump to the previous verse"
-msgstr "Aller au verset précédent"
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-#, fuzzy
-msgid "Show the next chapter"
-msgstr "Afficher le chapitre suivant"
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-#, fuzzy
-msgid "Show the previous chapter"
-msgstr "Afficher le chapitre précédent"
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-#, fuzzy
-msgid "Show the next book"
-msgstr "Afficher le livre suivant"
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-#, fuzzy
-msgid "Show the previous book"
-msgstr "Afficher le livre précédent"
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of books"
-msgstr "Liste des livres"
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of chapters"
-msgstr "Liste des chapitres"
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "List of verses"
-msgstr "Liste des versets"
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "List of entries"
-msgstr "Liste des entrées"
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Scroll through the list"
-msgstr "Faire défiler la liste"
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Edit this entry"
-msgstr "Éditer cette entrée"
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Save this comment"
-msgstr "Sauver ce commentaire"
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Delete this comment"
-msgstr "Effacer ce commentaire"
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Comment up to"
-msgstr "Commenter jusqu'à"
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set bold"
-msgstr "Mettre en gras"
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set italic"
-msgstr "Mettre en italique"
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set underlined"
-msgstr "Souligner"
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set font"
-msgstr "Choisir la police"
-
-#: bibletime/dummy.h:90 bibletime/tooltipdef.h:90
-msgid "Set the color"
-msgstr "Choisir la couleur"
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Set the fontsize"
-msgstr "Choisir la taille de police"
-
-#: bibletime/dummy.h:93 bibletime/tooltipdef.h:93
-msgid "Synchronize with Bible windows"
-msgstr "Synchroniser avec la fenêtre de Bible"
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Save as HTML"
-msgstr "Sauver en HTML"
-
-#: bibletime/dummy.h:98 bibletime/tooltipdef.h:98
-msgid "Copy to clipboard"
-msgstr "Copier dans le presse-papier"
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-#, fuzzy
-msgid "Choose the modules to search in"
-msgstr "Choisir les modules pour la recherche"
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "Add the selected module to the list"
-msgstr "Ajouter le module sélectionné à la liste"
-
-#: bibletime/dummy.h:103 bibletime/tooltipdef.h:103
-msgid "Remove the selected module from the list"
-msgstr "Supprimer le module sélectionné de la liste"
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "List of modules used for the search"
-msgstr "Liste des modules utilisés pour la recherche"
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-#, fuzzy
-msgid "Search for this text"
-msgstr "Rechercher ce texte"
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search multiple words"
-msgstr "Rechercher des mots multiples"
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Exact match"
-msgstr "Correspondance exacte"
-
-#: bibletime/dummy.h:109 bibletime/tooltipdef.h:109
-msgid "Search with GNU regular expressions"
-msgstr "Rechercher avec des expressions régulières GNU"
-
-#: bibletime/dummy.h:110 bibletime/tooltipdef.h:110
-msgid "Search case sensitive"
-msgstr "Rechercher en respectant la case"
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Last search result"
-msgstr "Dernier résultat de recherche"
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-#, fuzzy
-msgid "Use custom scope"
-msgstr "Limitation personnalisée"
-
-#: bibletime/dummy.h:115 bibletime/tooltipdef.h:115
-msgid "Add a new scope"
-msgstr "Ajouter une nouvelle plage"
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Delete this search scope"
-msgstr "Effacer cette plage de recherche"
-
-#: bibletime/dummy.h:117 bibletime/dummy.h:307 bibletime/tooltipdef.h:117
-#: bibletime/whatsthisdef.h:126
-msgid "Edit and define your search scopes"
-msgstr "Édition et définition de vos plages de recherche"
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Choose a search scope from the list"
-msgstr "Choisir une plage dans la liste"
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Enter your own search scope"
-msgstr "Entrez votre propre plage de recherche"
-
-#: bibletime/dummy.h:120 bibletime/tooltipdef.h:120
-msgid "Parsed result"
-msgstr "Analyse des résultats"
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Close this dialog"
-msgstr "Fermer ce dialogue"
-
-#: bibletime/dummy.h:123 bibletime/tooltipdef.h:123
-msgid "Used modules"
-msgstr "Modules utilisés"
-
-#: bibletime/dummy.h:124 bibletime/tooltipdef.h:124
-msgid "Items found"
-msgstr "Items trouvés"
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Preview"
-msgstr "Previsualisation"
-
-#: bibletime/dummy.h:127 bibletime/tooltipdef.h:127
-#, fuzzy
-msgid "Graphical Search Analysis"
-msgstr "Analyse graphique"
-
-#: bibletime/dummy.h:131 bibletime/tooltipdef.h:131
-msgid "Show daily tip"
-msgstr "Afficher les astuces quotidiennes"
-
-#: bibletime/dummy.h:132 bibletime/tooltipdef.h:132
-msgid "List of languages"
-msgstr "Liste des langues"
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-#, fuzzy
-msgid "Show start-up logo"
-msgstr "Afficher le logo au démarrage"
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Restore the windows in the workspace on startup"
-msgstr ""
-
-#: bibletime/dummy.h:137 bibletime/tooltipdef.h:137
-msgid "Use cache files for the lexicon entries"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "The default bible used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:139 bibletime/tooltipdef.h:139
-msgid "The default commentary used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "The default lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "The default Hebrew lexicon used in the workspace are"
-msgstr ""
-
-#: bibletime/dummy.h:142 bibletime/tooltipdef.h:142
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:143 bibletime/tooltipdef.h:143
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Set keyboard accelerators"
-msgstr "Définir les raccourcis claviers"
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "Choose the area of application"
-msgstr "Choisir l'élément de l'interface"
-
-#: bibletime/dummy.h:150 bibletime/dummy.h:337 bibletime/tooltipdef.h:150
-#: bibletime/whatsthisdef.h:156
-msgid "Choose a font"
-msgstr "Choisir une police"
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Color of the background"
-msgstr "Couleur de l'arrière plan"
-
-#: bibletime/dummy.h:153 bibletime/tooltipdef.h:153
-msgid "Color of the highlighted verse"
-msgstr "Couleur des versets surlignés"
-
-#: bibletime/dummy.h:155 bibletime/tooltipdef.h:155
-#, fuzzy
-msgid "Keyboard accelerators used by all display windows"
-msgstr "Ceci est la couleur de fond des fenêtres d'affichage."
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Keyboard accelerators used by Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Keyboard accelerators used by commentary windows"
-msgstr ""
-
-#: bibletime/dummy.h:158 bibletime/tooltipdef.h:158
-msgid "Keyboard accelerators used by lexicon windows"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Start printing"
-msgstr "Démarrage de l'impression"
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-#, fuzzy
-msgid "Preview print job"
-msgstr "Application de prévisualisation :"
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Open help"
-msgstr "Ouvrir l'aide"
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "List of print items"
-msgstr "Liste des items à imprimer"
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Move item up"
-msgstr "Déplacer l'item vers le haut"
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Move item down"
-msgstr "Déplacer l'item vers le bas"
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Delete items"
-msgstr "Effacer l'item"
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "Insert a page break"
-msgstr "Insérer un saut de page"
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Page borders"
-msgstr "Bords de la page"
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Left border"
-msgstr "Bord gauche"
-
-#: bibletime/dummy.h:175 bibletime/tooltipdef.h:175
-msgid "Right border"
-msgstr "Bord droit"
-
-#: bibletime/dummy.h:176 bibletime/tooltipdef.h:176
-msgid "Upper border"
-msgstr "Bord supérieur"
-
-#: bibletime/dummy.h:177 bibletime/tooltipdef.h:177
-msgid "Lower border"
-msgstr "Bord inférieur"
-
-#: bibletime/dummy.h:178 bibletime/tooltipdef.h:178
-#, fuzzy
-msgid "List of print styles"
-msgstr "Liste des items à imprimer"
-
-#: bibletime/dummy.h:179 bibletime/tooltipdef.h:179
-#, fuzzy
-msgid "Delete the selected style"
-msgstr "Supprime l'item sélectionné."
-
-#: bibletime/dummy.h:180 bibletime/tooltipdef.h:180
-#, fuzzy
-msgid "Edit the selected style"
-msgstr "Supprime l'item sélectionné."
-
-#: bibletime/dummy.h:181 bibletime/tooltipdef.h:181
-msgid "Create a new printing style"
-msgstr "Créer un nouveau style d'impression"
-
-#: bibletime/dummy.h:209 bibletime/whatsthisdef.h:28
-#, fuzzy
-msgid ""
-"Clear the print queue of BibleTime. All items will be removed from the list "
-"and the print button will be disabled."
-msgstr ""
-"Vide la file d'impression de BibleTime. Tout les items vont être enlevés de "
-"la liste, le bouton d'impression va être désactivé."
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:29
-#, fuzzy
-msgid ""
-"Open the printer dialog of BibleTime.  Here you can edit the print queue and "
-"assign styles to the items."
-msgstr ""
-"Ouvre le dialogue d'impression de BibleTime ou vous pouvez éditer la file "
-"d'impression et assigner des styles aux items."
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr "Ferme BibleTime et enregistre la configuration."
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:32
-#, fuzzy
-msgid "Open the search dialog to search for text in one or more modules."
-msgstr ""
-"Ouvre le dialogue de recherche pour chercher un texte dans un ou plusieurs "
-"modules."
-
-#: bibletime/dummy.h:214 bibletime/whatsthisdef.h:33
-#, fuzzy
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder, "
-"the subitems of it will be removed too."
-msgstr ""
-"Supprime les items sélectionnés de l'index principal.<BR>Si vous supprimez "
-"une dossier, les sous-items vont être supprimés eux aussi."
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:34
-#, fuzzy
-msgid ""
-"Reset the main index.<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-"Réinitialise l'index principal<BR>Tout les signets et dossiers vont être "
-"supprimés et les dossiers par défaut restaurés."
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:36
-#, fuzzy
-msgid "Toggle the main index view."
-msgstr "L'index principal"
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:37
-msgid "Toggle the main toolbar view."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:38
-msgid "Toggle footnotes in the modules."
-msgstr ""
-
-#: bibletime/dummy.h:220 bibletime/whatsthisdef.h:39
-#, fuzzy
-msgid "Toggle Strong's numbers in the modules."
-msgstr "Affiche ou masque les numéros de strong selon l'état actuel."
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:41
-#, fuzzy
-msgid "Tile the open display windows."
-msgstr "Ferme toutes les fenêtres d'affichage ouvertes."
-
-#: bibletime/dummy.h:223 bibletime/whatsthisdef.h:42
-#, fuzzy
-msgid "Automatically tile the display windows."
-msgstr "Fenêtres en mosaïque automatiquement"
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:43
-#, fuzzy
-msgid "Cascade the open display windows."
-msgstr "Ferme toutes les fenêtres d'affichage ouvertes."
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:44
-#, fuzzy
-msgid "Automatically cascade the opened display windows."
-msgstr "Fenêtres en cascade automatiquement"
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr "Ferme toutes les fenêtres d'affichage ouvertes."
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:47
-#, fuzzy
-msgid "Edit profiles..."
-msgstr "Éditer l'entrée..."
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:52
-msgid "Open the BibleTime tool bar editor."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:53
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-"Ouvre le dialogue d'options de BibleTime où vous pouvez définir la pluspart "
-"de vos préférences."
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:55
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr "Ouvre le navigateur de manuels de KDE sur le manuel de BibleTime."
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:56
-msgid ""
-"Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The "
-"installation instructions explain how to set up BibleTime and the text "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:57
-msgid ""
-"Open KDE's helpbrowser with the Bible study HowTo included with BibleTime."
-"<BR>This HowTo is an introduction how to study the Bible in an efficient way."
-msgstr ""
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:58
-#, fuzzy
-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 ""
-"Bascule en mode <B>\"Qu'est ce que c'est ?\"</B>.<BR>Tout les éléments "
-"importants de l'interface de BibleTime possèdent une aide \"Qu'est ce que "
-"c'est ?\"."
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:59
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr "Envoie un rapport de bug à l'équipe de BibleTime !"
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:60
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-"Affiche une astuce quotidienne.<BR>Celle-ci contient des citations "
-"importantes de la Bible et des astuces pratiques pour l'utilisation de "
-"BibleTime."
-
-#: bibletime/dummy.h:242 bibletime/whatsthisdef.h:61
-msgid "Show detailed information about BibleTime."
-msgstr "Affiche des information détaillées à propos de BibleTime."
-
-#: bibletime/dummy.h:243 bibletime/whatsthisdef.h:62
-#, fuzzy
-msgid "Show the \"about\" dialog of KDE 2."
-msgstr "Affiche la boite de dialogue \"à propos\" générale pour KDE 2."
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:66
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-"Ceci est l'index principal de BibleTime.<BR>Utilisez le pour gérer les "
-"modules installés, pour utiliser les signets, pour ouvrir des fenêtres "
-"d'affichage etc..."
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:67
-#, fuzzy
-msgid ""
-"Create a new folder in the main index.<BR>If you press the right mouse "
-"button on a folder, the new folder will become a sub-folder of it."
-"<BR>Otherwise you will create a toplevel folder."
-msgstr ""
-"Crée un nouveau dossier dans l'index principal.<BR>Si vous avez pressé le "
-"bouton droit de la souris sur un dossier, le nouveau en sera un sous-dossier."
-"<BR>Autrement, vous créerez un dossier au sommet de la hiérarchie."
-
-#: bibletime/dummy.h:249 bibletime/whatsthisdef.h:68
-msgid "Change the properties of the selected folder."
-msgstr "Change les propriétés du dossier sélectionné."
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:69
-msgid "Change the properties of the selected bookmark."
-msgstr "Change les propriétés du signet sélectionné."
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:70
-#, fuzzy
-msgid "Import bookmarks from a file."
-msgstr "Importe des signets depuis un fichier"
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:71
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-"Export les signets vers un fichier afin que vous ou les "
-"autres<BR>utilisateurs puissent les importer plus tard."
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:72
-#, fuzzy
-msgid ""
-"Use this to add this bookmark to BibleTime's print queue. The key, the "
-"description, and the text of the key will be used for printing."
-msgstr ""
-"Utilisez ceci pour ajouter ce signet à la file d'impression de BibleTime. Sa "
-"clef, sa description et son texte seront utilisés pour l'impression."
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:73
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr ""
-"Ouvre une boite de dialogue permettant de déverrouiller le module "
-"sélectionné."
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:74
-msgid "Open a dialog to show information about the selected module."
-msgstr ""
-"Ouvre une boite de dialogue montrant les informations à propos du module "
-"sélectionné."
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:77
-#, fuzzy
-msgid ""
-"This area is the main workspace of Bibletime.<BR>All display windows are "
-"opened in this window."
-msgstr ""
-"Cette partie de l'interface de BibleTime est l'aire de travail.<BR>Toutes "
-"les fenêtres d'affichage sont ouvertes à cet endroit."
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:79
-msgid "The next entry of the module will be shown."
-msgstr "L'entrée suivante du module sera affichée."
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:80
-msgid "The previous entry of the module will be shown."
-msgstr "L'entrée précédente du module sera affichée."
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:81
-#, fuzzy
-msgid ""
-"For Bible texts, the next verse will be highlighted.<BR>In commentaries, the "
-"next entry will be shown."
-msgstr ""
-"Si vous affichez un texte de la Bible, le verset suivant sera souligné."
-"<BR>Si vous lisez un commentaire, l'entrée suivante sera affichée."
-
-#: bibletime/dummy.h:263 bibletime/whatsthisdef.h:82
-#, fuzzy
-msgid ""
-"For Bible texts, the previous verse will be highlighted. In commentaries,  "
-"the previous entry will be shown."
-msgstr ""
-"Si vous affichez un texte de la Bible, le verset précédent sera souligné."
-"<BR>Si vous lisez un commentaire, l'entrée précédente sera affichée."
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:83
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-"Affiche le chapitre suivant de ce module. Le verset sera initialisé à \"1\"."
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:84
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-"Affiche le chapitre précédent de ce module. Le verset sera initialisé à \"1"
-"\"."
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:85
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-"Affiche le livre suivant de ce module. Le chapitre et le verset seront "
-"initialisés à \"1\"."
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:86
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-"Affiche le livre précédent dans ce module. Le chapitre et le verset seront "
-"initialisés à \"1\"."
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:87
-msgid "This list contains the books which are available in this module."
-msgstr "Cette liste contient les livres disponibles dans ce module."
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:88
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr "Cette liste contient les chapitres disponibles dans le livre courant."
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:89
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr "Cette liste contient les versets disponibles dans le chapitre courant."
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:90
-msgid "This list contains the entries of the current module."
-msgstr "Cette liste contient les entrées du module courant."
-
-#: bibletime/dummy.h:272 bibletime/whatsthisdef.h:91
-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 ""
-"Ce bouton sert à faire défiler les entrées contenues dans la liste. Pressez "
-"ce bouton et déplacez la souris pour augmenter ou réduire les items."
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:92
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-"Bascule entre les modes lecture/écriture et lecture seule pour les modules "
-"modifiables."
-
-#: bibletime/dummy.h:274 bibletime/whatsthisdef.h:93
-#, fuzzy
-msgid "Save new personal comments."
-msgstr "Enregistre le commentaire personnel."
-
-#: bibletime/dummy.h:275 bibletime/whatsthisdef.h:94
-msgid "Clear the text and delete the entry from the module."
-msgstr "Efface le texte et supprime l'entrée du module."
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:95
-#, fuzzy
-msgid "Toggle bold formatting of the selected text."
-msgstr "Bascule entre caractères gras et normaux pour le texte sélectionné."
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:96
-#, fuzzy
-msgid "Toggle italic formatting of the selected text."
-msgstr ""
-"Bascule entre caractères italiques et normaux pour le texte sélectionné."
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:97
-#, fuzzy
-msgid "Toggle underlined formatting of the selected text."
-msgstr ""
-"Bascule entre caractères soulignés et normaux pour le texte sélectionné."
-
-#: bibletime/dummy.h:279 bibletime/whatsthisdef.h:98
-msgid "Choose a new font for the selected text."
-msgstr "Choisir une police de caractère pour le texte sélectionné."
-
-#: bibletime/dummy.h:280 bibletime/whatsthisdef.h:99
-msgid "Choose a new color for the selected text."
-msgstr "Choisir une couleur pour le texte sélectionné."
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:100
-msgid "Choose a new fontsize for the selected text."
-msgstr "Choisir une taille de caractères pour le texte sélectionné."
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:102
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-"Synchronise le verset affiché par ce module avec la fenêtre de bible active."
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:105
-#, fuzzy
-msgid "Save the displayed chapter as an HTML file."
-msgstr "Sauvegarde le chapitre affiché en tant que fichier HTML."
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:106
-msgid "Select all text."
-msgstr "Sélectionne tout le texte."
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:107
-msgid "Copy the displayed text to the clipboard."
-msgstr "Copie le texte affiché dans le presse-papier."
-
-#: bibletime/dummy.h:291 bibletime/whatsthisdef.h:110
-#, fuzzy
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two buttons "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-"Choisir les modules dans lesquels la recherche se fera.<BR>Les deux boutons "
-"sur le côté droit servent à ajouter ou supprimer des modules de la liste de "
-"ceux qui seront utilisés."
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:111
-#, fuzzy
-msgid "Add the selected module to the list on the right."
-msgstr "Ajoute le module sélectionné à la liste de gauche."
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:112
-#, fuzzy
-msgid "Remove the selected module from the list on the right side."
-msgstr "Supprime le module sélectionné de la liste de droite."
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:113
-msgid "The list of modules used for the search."
-msgstr "La liste des modules utilisés pour la recherche."
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:115
-#, fuzzy
-msgid ""
-"The text entered in this edit box will be searched for in all selected "
-"modules."
-msgstr ""
-"Le texte entré dans cette boite de saisie sera recherché dans tout les "
-"modules."
-
-#: bibletime/dummy.h:297 bibletime/whatsthisdef.h:116
-#, fuzzy
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit box above "
-"is searched as a single word."
-msgstr ""
-"Activer ceci pour faire une recherche pour des mots multiples.<BR>Chaque mot "
-"dans la ligne d'édition sera recherché indépendamment des autres."
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:117
-#, fuzzy
-msgid ""
-"Select this to search for exactly the same text you entered in the edit box."
-msgstr ""
-"Activer ceci pour rechercher exactement le texte que vous avez entré dans la "
-"ligne d'édition."
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:118
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-"Sélectionner ceci pour lancer une recherche à l'aide des expressions "
-"régulières GNU.<BR>Lire le manuel pour une explication quant à leur usage."
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:119
-#, fuzzy
-msgid "Activate this to use a case sensitive search."
-msgstr ""
-"Activer ceci pour que la recherche soit case-sensitive (c'est à dire "
-"respecte majuscules/minuscules)."
-
-#: bibletime/dummy.h:302 bibletime/whatsthisdef.h:121
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr ""
-"Sélectionner ceci si vous souhaitez rechercher dans l'ensemble du ou des "
-"modules."
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:122
-#, fuzzy
-msgid ""
-"Select this if you want to use the last search result as the search scope."
-msgstr ""
-"Sélectionnez ceci si vous souhaitez utiliser le dernier résultat de "
-"recherche comme plage de recherche."
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:123
-msgid "Create a new search scope."
-msgstr "Crée une nouvelle plage de recherche"
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:124
-#, fuzzy
-msgid ""
-"Use a custom scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-"Utiliser votre propre plage de recherche.<BR>Un jeu standard de plage de "
-"recherche existe."
-
-#: bibletime/dummy.h:306 bibletime/whatsthisdef.h:125
-msgid "Use this button to delete the chosen search scope."
-msgstr "Utilisez ce bouton pour supprimer la plage de recherche choisie."
-
-#: bibletime/dummy.h:308 bibletime/whatsthisdef.h:127
-msgid "Choose a search scope from the combo box"
-msgstr "Choisir une plage de recherche depuis la liste déroulante."
-
-#: bibletime/dummy.h:309 bibletime/whatsthisdef.h:128
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-"Entrez votre propre plage de recherche.<BR>Pour définir une plage, utilisez "
-"\"-\" (i.e Genèse- Exode), <BR>pour séparer différentes plages ou clef, "
-"utilisez le point-virgule (ie Genèse;Mathieu)."
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:129
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-"Cette liste contient l'analyse des résultats de votre plage de recherche. Ce "
-"résultat sera utilisé pour la recherche."
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:130
-msgid "Close this dialog and save the changes."
-msgstr "Ferme ce dialogue et enregistre les modifications."
-
-#: bibletime/dummy.h:313 bibletime/whatsthisdef.h:132
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-"Liste des modules utilisés pour la recherche.<BR>Cliquer sur un module pour "
-"voir les résultats sur le côté droit."
-
-#: bibletime/dummy.h:314 bibletime/whatsthisdef.h:133
-msgid "This contains the items found in the selected module."
-msgstr "Ceci contient les items trouvés dans les modules sélectionnés."
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:134
-msgid "This text box shows a preview of the chosen item."
-msgstr "Cette boite de texte affiche un aperçu des items choisis."
-
-#: bibletime/dummy.h:317 bibletime/whatsthisdef.h:136
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-"Analyse graphique des résultats de votre recherche.<BR>Les barres montrent "
-"le nombre d'items trouvés dans chaque livre de la Bible ou dans les "
-"commentaires."
-
-#: bibletime/dummy.h:320 bibletime/whatsthisdef.h:139
-msgid "Activate this box to see a daily tip on startup."
-msgstr "Activer cette boite pour afficher une astuce au démarrage."
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:140
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-"Contient les langues qui peuvent être utilisés pour les noms de livres."
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:141
-#, fuzzy
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr "Activer cette boite pour afficher une astuce au démarrage."
-
-#: bibletime/dummy.h:323 bibletime/whatsthisdef.h:142
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr ""
-
-#: bibletime/dummy.h:324 bibletime/whatsthisdef.h:143
-msgid ""
-"Save the windows in the workspace if BibleTime is closed<BR>and restore them "
-"on the next startup. "
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:145
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This will speed up opening the lexicons a lot, but consume some disk space. "
-"Recommended."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:146
-msgid "The default Bible is used when a hyperlink into a Bible was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:147
-msgid ""
-"The default commentary is used when a hyperlink into a commentary was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:329 bibletime/whatsthisdef.h:148
-msgid "The default lexicon is used when a hyperlink into a lexicon was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:149
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon "
-"was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:150
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon was "
-"clicked"
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:151
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:152
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:154
-#, fuzzy
-msgid "Select an action and change the key binding for the action."
-msgstr "Sélectionner une action et changer le raccourci clavier pour celle-ci."
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:155
-#, fuzzy
-msgid ""
-"Use this box to select how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-"Sélectionner dans cette boite comment la police est utilisée et change celle-"
-"ci dans le sélecteur de polices."
-
-#: bibletime/dummy.h:339 bibletime/whatsthisdef.h:158
-msgid "This is the background color used in display windows."
-msgstr "Ceci est la couleur de fond des fenêtres d'affichage."
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:159
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr ""
-"Ceci est la couleur des versets surlignés dans les fenêtres d'affichage."
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:161
-#, fuzzy
-msgid "Set the keyboard accelerators used in all display windows"
-msgstr "Ceci est la couleur de fond des fenêtres d'affichage."
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:162
-#, fuzzy
-msgid "Set keyboard accelerators used in Bible windows"
-msgstr "Définir les raccourcis claviers"
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:163
-#, fuzzy
-msgid "Set the keyboard accelerators used in commentary windows"
-msgstr "Définir les raccourcis claviers"
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:164
-#, fuzzy
-msgid "Set the keyboard accelerators used in lexicon windows"
-msgstr "Définir les raccourcis claviers"
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:168
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-"Lance l'impression.<BR>Les items de la liste vont être imprimés suivant les "
-"style assignés."
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:169
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-"Imprime dans un fichier temporaire et ouvre un visualiseur de Postscript "
-"pour prévisualiser le résultat de l'impression."
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:170
-#, fuzzy
-msgid "Closes this dialog without doing anything else."
-msgstr ""
-"Ferme cette boite de dialogue sans rien faire aux items ou à l'imprimante."
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:171
-msgid "Open the online help of BibleTime."
-msgstr "Ouvre l'aide en ligne de BibleTime."
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:173
-#, fuzzy
-msgid "This combo box contains the available print styles."
-msgstr "Cette liste déroulante contient les styles d'impression disponibles."
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:174
-msgid "This is the list which contains the available print items."
-msgstr "Ceci est la liste contenant les items retenus pour l'impression."
-
-#: bibletime/dummy.h:356 bibletime/whatsthisdef.h:175
-#, fuzzy
-msgid "Move the selected item up one item."
-msgstr "Déplace l'item sélectionné en dessous."
-
-#: bibletime/dummy.h:357 bibletime/whatsthisdef.h:176
-#, fuzzy
-msgid "Move the selected item down one item."
-msgstr "Déplace l'item sélectionné en dessus."
-
-#: bibletime/dummy.h:358 bibletime/whatsthisdef.h:177
-msgid "Delete the selected items."
-msgstr "Supprime l'item sélectionné."
-
-#: bibletime/dummy.h:359 bibletime/whatsthisdef.h:178
-#, fuzzy
-msgid ""
-"Inserts a page break into the list.<BR>The printer will start a new page."
-msgstr ""
-"Insert un saut de page dans la liste.<BR>L'imprimante commencera une "
-"nouvelle page."
-
-#: bibletime/dummy.h:361 bibletime/whatsthisdef.h:180
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr "Cette boite contient les marges de la page mesurées en millimètres."
-
-#: bibletime/dummy.h:362 bibletime/whatsthisdef.h:181
-#, fuzzy
-msgid "The size of the border on the left side of the paper."
-msgstr "Taille de la marge gauche du papier."
-
-#: bibletime/dummy.h:363 bibletime/whatsthisdef.h:182
-#, fuzzy
-msgid "The size of the border on the right side of the paper."
-msgstr "Taille de la marge droite du papier."
-
-#: bibletime/dummy.h:364 bibletime/whatsthisdef.h:183
-#, fuzzy
-msgid "The size of the border on the top of the paper."
-msgstr "Taille de la marge au sommet du papier."
-
-#: bibletime/dummy.h:365 bibletime/whatsthisdef.h:184
-#, fuzzy
-msgid "The size of the border on the bottom of the paper."
-msgstr "Taille de la marge en bas du papier."
-
-#: bibletime/dummy.h:366 bibletime/whatsthisdef.h:185
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-"Cette liste contient les styles d'impression disponibles.<BR>Créez le votre "
-"à l'aide du bouton \"Nouveau style\"."
-
-#: bibletime/dummy.h:367 bibletime/whatsthisdef.h:186
-msgid "Remove the selected printing style from the list."
-msgstr "Supprime le style d'impression sélectionné de la liste."
-
-#: bibletime/dummy.h:368 bibletime/whatsthisdef.h:187
-msgid "Change the properties of the selected printing style."
-msgstr "Change les propriétés du style d'impression sélectionné."
-
-#: bibletime/dummy.h:369 bibletime/whatsthisdef.h:188
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr ""
-"Crée un nouveau style d'impression.<BR>Ce nouveau style va être ajouté à la "
-"liste."
-
-#~ msgid "&Show footnotes"
-#~ msgstr "A&fficher notes"
-
-#~ msgid "S&how Strong's numbers"
-#~ msgstr "Afficher numéros de &Strong"
-
-#~ msgid "Translation into Brazilian Portoguese"
-#~ msgstr "Traduction en portugais brésilien"
-
-#~ msgid "handbook"
-#~ msgstr "manuel"
-
-#~ msgid "Martin Luther startup logo"
-#~ msgstr "Logo de démarrage \"Martin Luther\""
-
-#~ msgid "Sponsor of www.bibletime.de"
-#~ msgstr "Sponsor de www.bibletime.de"
-
-#~ msgid "backend"
-#~ msgstr "backend"
-
-#~ msgid ""
-#~ "Leader of the SWORD project.\n"
-#~ "Lots of help with the SWORD API!"
-#~ msgstr ""
-#~ "Leader du projet SWORD.\n"
-#~ "Beaucoup d'aide grâce à l'API SWORD !"
-
-#~ msgid "Printing %1"
-#~ msgstr "Impression de %1"
-
-#~ msgid "Left"
-#~ msgstr "Gauche"
-
-#~ msgid "Center"
-#~ msgstr "Centré"
-
-#~ msgid "Right"
-#~ msgstr "Droit"
-
-#~ msgid "Printdialog"
-#~ msgstr "Dialogue d'impression"
-
-#~ msgid "The general options for printing"
-#~ msgstr "Les options générale pour l'impression"
-
-#~ msgid "Available printers:"
-#~ msgstr "Imprimantes disponibles :"
-
-#~ msgid "Host"
-#~ msgstr "Hôte"
-
-#~ msgid "Comment"
-#~ msgstr "Commentaire"
-
-#~ msgid "&Number of copies"
-#~ msgstr "&Nombre de copies"
-
-#~ msgid "Por&trait"
-#~ msgstr "Por&trait"
-
-#~ msgid "L&andscape"
-#~ msgstr "P&aysage"
-
-#~ msgid "Paper t&ype"
-#~ msgstr "T&ype de papier"
-
-#~ msgid "Size: 8888mm x 8888mm"
-#~ msgstr "Taille : 8888mm x 8888mm"
-
-#~ msgid "*.ps | Postscript files"
-#~ msgstr "*.ps | fichiers Postscript"
-
-#~ msgid "A4"
-#~ msgstr "A4"
-
-#~ msgid "A5"
-#~ msgstr "A5"
-
-#~ msgid "Letter"
-#~ msgstr "Letter"
-
-#~ msgid "Legal"
-#~ msgstr "Legal"
-
-#~ msgid "Executive"
-#~ msgstr "Executive"
-
-#~ msgid "Layout specific settings"
-#~ msgstr "Options de mise en page"
-
-#~ msgid "&Bottom"
-#~ msgstr "&Bas"
-
-#~ msgid "Entries"
-#~ msgstr "Entrées"
-
-#~ msgid "Management of BibleTime's printing queue"
-#~ msgstr "Gestion de la file d'impression de BibleTime"
-
-#~ msgid "Size: %1mm x %2mm"
-#~ msgstr "Taille : %1mm x %2mm"
-
-#~ msgid "Select all"
-#~ msgstr "Tout sélectionner"
-
-#~ msgid "Save verse with text as ..."
-#~ msgstr "Sauver le verset et son texte sous..."
-
-#~ msgid "Configure BibleTime's key bindings"
-#~ msgstr "Configurer les raccourcis clavier de BibleTime"
-
-#~ msgid "Choose fonts for BibleTime"
-#~ msgstr "Choisir les polices pour BibleTime"
-
-#~ msgid "Choose the area of application and set the font for it"
-#~ msgstr "Choisir l'élément de l'interface et les polices à y utiliser"
-
-#~ msgid "Module fonts"
-#~ msgstr "Polices des modules"
-
-#~ msgid "Configure the fonts used for modules"
-#~ msgstr "Configurer les polices utilisées pour les modules"
-
-#~ msgid "Configure BibleTime's general options"
-#~ msgstr "Configurer les options générales de BibleTime"
-
-#~ msgid "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-#~ msgstr "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-
-#~ msgid "Result with text"
-#~ msgstr "Résultats avec texte"
-
-#~ msgid "Search result for \"%1\" in module \"%2\"\n"
-#~ msgstr "Résultats de la recherche pour \"%1\" dans le module \"%2\"\n"
-
-#~ msgid "Useful tips for BibleTime"
-#~ msgstr "Astuces pour BibleTime"
-
-#~ msgid "Run on startup"
-#~ msgstr "Lancer au démarrage"
-
-#~ msgid ""
-#~ "<DIV align=\"center\"><B>Missing tips!</B></DIV><BR><BR>Your installation "
-#~ "is missing the daily tips.\t\tPlease make sure all files of BibleTime are"
-#~ "\t\tinstalled and that the permissions of $KDEDIR are correct!<BR><BR>\t"
-#~ "\tIf you can't solve this problem please contact the team of BibleTime at"
-#~ "\t\t<A HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-#~ msgstr ""
-#~ "<DIV align=\"center\"><B>Astuces Manquantes !</B></DIV><BR><BR>Il manque "
-#~ "les astuces quotidiennes à votre installation.\t\tPrière de vérifier que "
-#~ "tous les fichiers de BibleTime sont\t\tinstallés et que les permissions "
-#~ "de $KDEDIR sont correctes !<BR><BR>\t\tSi vous ne parvenez pas à résoudre "
-#~ "ce problème, prière de contacter l'équipe de BibleTime à\t\t<A HREF="
-#~ "\"mailto :info@bibletime.de\">info@bibletime.de</A> !"
-
-#~ msgid "Foonotes: %1<BR>"
-#~ msgstr "Notes : %1<BR>"
-
-#~ msgid "Strong's numbers: %1<BR>"
-#~ msgstr "Numéro de Strong : %1<BR>"
-
-#~ msgid "Unlock key:"
-#~ msgstr "Clef de déverrouillage :"
-
-#~ msgid "Version:"
-#~ msgstr "Version :"
-
-#~ msgid "Font:"
-#~ msgstr "Police :"
-
-#~ msgid "<I>Not necessary!</I>"
-#~ msgstr "<I>Non nécessaire !</I>"
-
-#~ msgid "Datapath"
-#~ msgstr "Emplacement"
-
-#~ msgid ""
-#~ "<qt><B>The file does already exist!</B><BR>Do you want to overwrite it?</"
-#~ "qt>"
-#~ msgstr ""
-#~ "<qt><B>Le fichier existe déjà !</B><BR>Voulez-vous écrire dessus ?</qt>"
-
-#~ msgid "BibleTime - Save file as ..."
-#~ msgstr "BibleTime - Sauver le fichier sous ..."
-
-#~ msgid "BibleTime - Help window"
-#~ msgstr "BibleTime - Fenêtre d'aide"
-
-#~ msgid "Show a daily tip"
-#~ msgstr "Afficher l'astuce quotidienne"
-
-#~ msgid "The bible window"
-#~ msgstr "La fenêtre de Bible"
-
-#~ msgid "The commentary window"
-#~ msgstr "La fenêtre de commentaires"
-
-#~ msgid "The lexicon window"
-#~ msgstr "La fenêtre de lexique"
-
-#~ msgid "List of modules"
-#~ msgstr "Liste des modules"
-
-#~ msgid "Show a preview"
-#~ msgstr "Afficher une prévisualisation"
-
-#~ msgid "The list of printers"
-#~ msgstr "La liste des imprimantes"
-
-#~ msgid "Print into a file"
-#~ msgstr "Imprimer dans un fichier"
-
-#~ msgid "Browse for the file"
-#~ msgstr "Sélection d'un fichier"
-
-#~ msgid "Copies"
-#~ msgstr "Copies"
-
-#~ msgid "Paper type"
-#~ msgstr "Type de papier"
-
-#~ msgid "Paper size"
-#~ msgstr "Taille du papier"
-
-#~ msgid "List of styles"
-#~ msgstr "Liste des styles"
-
-#~ msgid "Delete the chosen printing style"
-#~ msgstr "Supprimer le style d'impression choisit"
-
-#~ msgid "Edit the chosen printing style"
-#~ msgstr "Éditer le style d'impression choisit"
-
-#~ msgid "Show or hide the main index depending on current state."
-#~ msgstr "Affiche ou masque l'index principal selon l'état actuel."
-
-#~ msgid "Show or hide the main toolbar depending on current state."
-#~ msgstr "Affiche ou masque la barre d'outils principale selon l'état actuel."
-
-#~ msgid ""
-#~ "Show or hide the footnotes in the modules deoending on current state."
-#~ msgstr "Affiche ou masque les notes du module selon l'état actuel."
-
-#~ msgid "Arrange the opened display windows in a tile pattern."
-#~ msgstr "Range les fenêtres d'affichage ouvertes en mosaïque."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a tile pattern if "
-#~ "it's necessary."
-#~ msgstr ""
-#~ "Les fenêtres d'affichage ouvertes seront arrangées automatiquement en "
-#~ "mosaïque si cela est nécessaire."
-
-#~ msgid "Arrange the open display windows in a cascade pattern."
-#~ msgstr "Range les fenêtres d'affichage en cascade."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a cascade pattern "
-#~ "if it's necessary."
-#~ msgstr ""
-#~ "Les fenêtres d'affichage seront automatiquement arrangées en cascade si "
-#~ "cela est nécessaire."
-
-#~ msgid "Open a dialog where you can edit the toolbar of BibleTime."
-#~ msgstr ""
-#~ "Ouvre un dialogue où vous pouvez éditer la barre d'outils de BibleTime."
-
-#~ msgid "This is the Bible display window"
-#~ msgstr "Ceci est la fenêtre d'affichage de la Bible."
-
-#~ msgid "This is the commentary display window."
-#~ msgstr "Ceci est la fenêtre d'affichage des commentaires."
-
-#~ msgid "This is the lexicon display window."
-#~ msgstr "Ceci est la fenêtre d'affichage du lexique."
-
-#~ msgid "Activate this to see a startup logo on each startup of BibleTime."
-#~ msgstr "Activer ceci pour voir un logo à chaque démarrage de BibleTime."
-
-#~ msgid "This list contains the modules using foreign fonts."
-#~ msgstr ""
-#~ "Cette liste contient les modules utilisant un encodage de caractère "
-#~ "étranger."
-
-#~ msgid ""
-#~ "This is the list of available printers of your system.<BR>Please select "
-#~ "the printer you want to use for printing."
-#~ msgstr ""
-#~ "Ceci est la liste des imprimantes disponibles sur votre système."
-#~ "<BR>Sélectionner celle que vous voulez utiliser pour l'impression."
-
-#~ msgid "Print into a postscript file on disk."
-#~ msgstr "Imprime dans un fichier Postscript sur le disque."
-
-#~ msgid "Browse for the file you want to print into."
-#~ msgstr "Sélectionner le fichier dans lequel vous souhaitez imprimer."
-
-#~ msgid "The number of copies used for printing."
-#~ msgstr "Nombre d'exemplaires de l'impression."
-
-#~ msgid "Choose the orientation of the used paper."
-#~ msgstr "Choisir l'orientation du papier utilisé."
-
-#~ msgid "Print on the paper using \"Portrait\" as orientation."
-#~ msgstr "Imprime sur papier en orientation \"Portrait\"."
-
-#~ msgid "Print on the paper using \"Landscape\" as orientation."
-#~ msgstr "Imprime sur papier en orientation \"Paysage\"."
-
-#~ msgid "The type of the paper which is used for printing."
-#~ msgstr "Type de papier utilisé pour l'impression."
-
-#~ msgid "The size of the used paper."
-#~ msgstr "Taille du papier utilisé pour l'impression."
diff --git a/bibletime-doc/po/hu.po b/bibletime-doc/po/hu.po
deleted file mode 100644
index 31e59a5..0000000
--- a/bibletime-doc/po/hu.po
+++ /dev/null
@@ -1,2129 +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-06-10 20:57+0200\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=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr ""
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:72
-msgid "Clear printing queue"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:87 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:92
-msgid "Search in module(s)"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:97
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:312
-msgid "Remove selected item(s)"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:102
-msgid "&Show footnotes"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:107
-msgid "S&how Strong's numbers"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:116
-msgid "&Show main index"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:128
-msgid "&Cascade"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:133
-msgid "&Tile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:138
-msgid "&Auto cascade"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:143
-msgid "A&uto Tile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:148
-msgid "&Close all"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:169
-msgid "&Daily tip"
-msgstr ""
-
-#: bibletime/main.cpp:70
-msgid "Enable debug messages."
-msgstr ""
-
-#: bibletime/main.cpp:78
-msgid "Bible study tool for KDE 2"
-msgstr ""
-
-#: bibletime/main.cpp:80
-msgid "(c)1999-2001, The BibleTime Team"
-msgstr ""
-
-#: bibletime/main.cpp:81
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for new developers, translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-
-#: bibletime/main.cpp:87
-msgid "Project coordinator, frontend, backend"
-msgstr ""
-
-#: bibletime/main.cpp:88
-msgid "Frontend, backend, misc things"
-msgstr ""
-
-#: bibletime/main.cpp:91
-msgid "Handbook"
-msgstr ""
-
-#: bibletime/main.cpp:94
-msgid "Translation into Hungarian"
-msgstr ""
-
-#: bibletime/main.cpp:95 bibletime/main.cpp:104
-msgid "Translation into Italian"
-msgstr ""
-
-#: bibletime/main.cpp:96
-msgid "Translation into Polish"
-msgstr ""
-
-#: bibletime/main.cpp:97
-msgid "Translation into Danish"
-msgstr ""
-
-#: bibletime/main.cpp:98
-msgid "Translation into Norwegian"
-msgstr ""
-
-#: bibletime/main.cpp:99
-msgid "Translation into Brazilian Portoguese"
-msgstr ""
-
-#: bibletime/main.cpp:100
-msgid "Translation into Dutch"
-msgstr ""
-
-#: bibletime/main.cpp:101
-msgid "Translation into French"
-msgstr ""
-
-#: bibletime/main.cpp:102
-msgid "Translation into Czech"
-msgstr ""
-
-#: bibletime/main.cpp:103 bibletime/main.cpp:105
-msgid "Translation into Portoguese"
-msgstr ""
-
-#: bibletime/main.cpp:106
-msgid "Translation into Slovak"
-msgstr ""
-
-#: bibletime/main.cpp:109
-msgid "Bible study HowTo"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:56
-#: bibletime/main.cpp:110
-msgid "Optionsdialog"
-msgstr ""
-
-#: bibletime/main.cpp:111
-msgid "handbook"
-msgstr ""
-
-#: bibletime/main.cpp:112
-msgid "Martin Luther startup logo"
-msgstr ""
-
-#: bibletime/main.cpp:113
-msgid "Sponsor of www.bibletime.de"
-msgstr ""
-
-#: bibletime/main.cpp:114
-msgid "backend"
-msgstr ""
-
-#: bibletime/main.cpp:115
-msgid ""
-"Leader of the SWORD project.\n"
-"Lots of help with the SWORD API!"
-msgstr ""
-
-#: bibletime/bibletime.cpp:175 bibletime/bibletime.cpp:190
-#: bibletime/bibletime_slots.cpp:98 bibletime/bibletime_slots.cpp:107
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:95
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:297
-msgid "Display window"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:288
-msgid "Printing..."
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:288
-msgid "Abort printing"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:313
-#, c-format, ycp-format
-msgid "Printing %1"
-msgstr ""
-
-#: bibletime/printing/cstylelist.cpp:46
-msgid "Name:"
-msgstr ""
-
-#: bibletime/printing/cprinter.cpp:310 bibletime/printing/cprinter.cpp:341
-#: bibletime/printing/cprinter.cpp:519 bibletime/printing/cprinter.cpp:527
-#: bibletime/printing/cprinterdialog.cpp:616
-#: bibletime/printing/cstyleeditordialog.cpp:182
-#: bibletime/printing/cstylelist.cpp:130
-msgid "Standard"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:42
-msgid "unknown name"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-#: bibletime/printing/cprintitemlist.cpp:48
-msgid "Module"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:49
-msgid "From"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:50
-msgid "To"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:51
-msgid "Style"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:43
-msgid "style editor"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:67
-msgid "Name of style:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-msgid "Choose the part of the style:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:77
-#: bibletime/printing/cstyleeditordialog.cpp:281
-msgid "Header"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:593
-#: bibletime/printing/cstyleeditordialog.cpp:78
-#: bibletime/printing/cstyleeditordialog.cpp:285
-msgid "Description"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:79
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Module text"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:85
-msgid "Enable this part"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:468
-#: bibletime/printing/cstyleeditordialog.cpp:96
-msgid "Left"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:470
-#: bibletime/printing/cstyleeditordialog.cpp:97
-msgid "Center"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:472
-#: bibletime/printing/cstyleeditordialog.cpp:98
-msgid "Right"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:109
-msgid "Foreground:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:120
-msgid "Background:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:131
-msgid "Choose font"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:134
-msgid "Font preview"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:148
-msgid "Use frame"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:158
-msgid "Line thickness (in point):"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:166
-msgid "Frame color:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:64
-msgid "Printdialog"
-msgstr ""
-
-#: bibletime/dummy.h:123 bibletime/printing/cprinterdialog.cpp:65
-#: bibletime/tooltipdef.h:123
-msgid "Preview"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:166
-#: bibletime/printing/cprinterdialog.cpp:89
-msgid "General"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:89
-msgid "The general options for printing"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:92
-msgid "Available printers:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:97
-msgid "Printer"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:98
-msgid "Host"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:99
-msgid "Comment"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:106
-msgid "Print to file:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-#: bibletime/printing/cprinterdialog.cpp:120
-msgid "Search"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:141
-msgid "&Number of copies"
-msgstr ""
-
-#: bibletime/dummy.h:153 bibletime/printing/cprinterdialog.cpp:149
-#: bibletime/tooltipdef.h:153
-msgid "Orientation"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:153
-msgid "Por&trait"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:157
-msgid "L&andscape"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:173
-msgid "Paper t&ype"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:177
-msgid "Size: 8888mm x 8888mm"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:196
-msgid "Preview application:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:292
-msgid "*.ps | Postscript files"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:335
-msgid "A4"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:336
-msgid "A5"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:337
-msgid "Letter"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:338
-msgid "Legal"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:339
-msgid "Executive"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:370
-msgid "Layout specific settings"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:373
-msgid "Margins (in millimeter)"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:381
-msgid "&Top"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:382
-msgid "&Bottom"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:383
-msgid "&Left"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:384
-msgid "&Right"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:433
-msgid "List of style items:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:471
-msgid "Entries"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:471
-msgid "Management of BibleTime's printing queue"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:481
-msgid "Choose a style"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:493
-msgid "Entries which should be printed:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:540
-#, c-format, ycp-format
-msgid "Size: %1mm x %2mm"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:63
-msgid "Synchronize..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:68
-msgid "Edit entry..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:78
-msgid "Commentary window"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:81
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:66
-msgid "Entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:82
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:67
-msgid "Text of entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:83
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:88
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:68
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:73
-msgid "Entry with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:75
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:70
-msgid "Selected text"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:91
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:76
-msgid "Entry as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:92
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:77
-msgid "Entry as HTML"
-msgstr ""
-
-#: bibletime/dummy.h:95 bibletime/frontend/presenters/cbiblepresenter.cpp:86
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:94
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:79
-#: bibletime/tooltipdef.h:95
-msgid "Select all"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:87
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:95
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:80
-msgid "Lookup selected text in lexicon"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:89
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:97
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:82
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:401
-msgid "Copy..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:90
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:98
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:83
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:402
-msgid "Add to printing queue..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:91
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:403
-msgid "Save..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:67
-msgid "Bible window"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:70
-msgid "Verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:71
-msgid "Text of verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:72
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:78
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:82
-msgid "Verse with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:73
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:79
-msgid "Chapter"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:83
-msgid "Chapter as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:84
-msgid "Chapter as HTML"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:225
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:300
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:300
-msgid "Save verse with text as ..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-msgid "Select additional modules"
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:51
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:121
-msgid "NONE"
-msgstr ""
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:63
-msgid "Lexicon window"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:76
-msgid "Accelerators"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:76
-msgid "Configure BibleTime's key bindings"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:86
-msgid "Choose fonts for BibleTime"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:90
-msgid "Choose the area of application and set the font for it"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:101
-msgid "The quick brown fox jumped over the lazy dog"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:109
-msgid "Module fonts"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:109
-msgid "Configure the fonts used for modules"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:134
-msgid "Colors"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:134
-msgid "Configure BibleTime's colors"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:141
-msgid "Background"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:158
-msgid "Highlighted Verse"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:166
-msgid "Configure BibleTime's general options"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:170
-msgid "Show tip of the day"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:187
-msgid "Language for booknames"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:192
-msgid "English"
-msgstr ""
-
-#: bibletime/dummy.h:130
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:211
-#: bibletime/tooltipdef.h:130
-msgid "Show startuplogo"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:172
-msgid "<I>module not set</I>"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-msgid "Search Dialog"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-msgid "Interrupt"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:94
-msgid "Choose modules"
-msgstr ""
-
-#: bibletime/dummy.h:99 bibletime/frontend/searchdialog/csearchdialog.cpp:94
-#: bibletime/tooltipdef.h:99
-msgid "Choose the modules for the search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:98
-msgid "Search Text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:98
-msgid "Enter the text to search for"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:102
-msgid "Search Result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:102
-msgid "The result of your search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:106
-msgid "Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:106
-msgid "Graphical analysis of your search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialoganalysis.cpp:316
-#, ycp-format
-msgid "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:57
-msgid "Search properties"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:75
-msgid "Multiple Words"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:83
-msgid "Exact Search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:90
-msgid "Regular Expression"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:103
-msgid "Case Sensitive"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:107
-msgid "Search scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:111
-msgid "Search progress"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:116
-msgid "Current module:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:117
-msgid "Overall:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-msgid "Search result with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Result with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:203
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:240
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:273
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:318
-#, ycp-format
-msgid "Search result for \"%1\" in module \"%2\"\n"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:232
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:312
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:549
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:580
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:232
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:312
-msgid "Save search result ..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:391
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:398
-msgid "Key"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:392
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:395
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:399
-msgid "Key with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:549
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:580
-msgid "Save key ..."
-msgstr ""
-
-#: bibletime/dummy.h:110
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:110
-msgid "No scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:216
-msgid "Choose custom range"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:217
-msgid "Define range text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:218
-msgid "Range parsing results"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:282
-msgid "Range name"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:282
-msgid "Please enter a name for the new range"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:68
-msgid "Useful tips for BibleTime"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:100
-msgid "Run on startup"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:120
-msgid ""
-"<DIV align=\"center\"><B>Missing tips!</B></DIV><BR><BR>Your installation is "
-"missing the daily tips.\t\tPlease make sure all files of BibleTime are\t"
-"\tinstalled and that the permissions of $KDEDIR are correct!<BR><BR>\t\tIf "
-"you can't solve this problem please contact the team of BibleTime at\t\t<A "
-"HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:198
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:218
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:218
-msgid "Save text as HTML page ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:225
-msgid "Save text as plain text ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:453
-msgid "Choose a font:"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:457
-msgid "Choose font size"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:461
-msgid "Bold"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:465
-msgid "Underlined"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:474
-msgid "Justify"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:182
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:193
-msgid "unknown"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:220
-msgid "Bookmark to"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-#, ycp-format
-msgid "Foonotes: %1<BR>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:247
-#, ycp-format
-msgid "Strong's numbers: %1<BR>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:249
-msgid "Unlock key:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:249
-msgid "not set"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:251
-msgid "Version:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:253
-msgid "Font:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:170
-msgid "Bibles"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:173
-msgid "Commentaries"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:176
-msgid "Lexicons"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:284
-msgid "Caption"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:292
-msgid "Main index"
-msgstr ""
-
-#: bibletime/dummy.h:51 bibletime/frontend/groupmanager/cgroupmanager.cpp:293
-#: bibletime/tooltipdef.h:51
-msgid "Create a new folder"
-msgstr ""
-
-#: bibletime/dummy.h:52 bibletime/frontend/groupmanager/cgroupmanager.cpp:296
-#: bibletime/tooltipdef.h:52
-msgid "Change this folder"
-msgstr ""
-
-#: bibletime/dummy.h:53 bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-#: bibletime/tooltipdef.h:53
-msgid "Change this bookmark"
-msgstr ""
-
-#: bibletime/dummy.h:54 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:54
-msgid "Import bookmarks"
-msgstr ""
-
-#: bibletime/dummy.h:55 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:55
-msgid "Export bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:309
-msgid "Print bookmark"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:315
-msgid "Search in selected module(s)"
-msgstr ""
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:318
-#: bibletime/tooltipdef.h:57
-msgid "Unlock this module"
-msgstr ""
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:321
-#: bibletime/tooltipdef.h:58
-msgid "About this module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:377
-msgid "Bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:377
-msgid "Please enter here the description:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:415
-msgid "Change bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:415
-msgid "Please change the description of the item!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:426
-msgid "Change folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:426
-msgid "Please change the name of the group!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:563
-msgid "<I>Not necessary!</I>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:575
-msgid "Datapath"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:577
-msgid "Version"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:579
-msgid "Unlock key"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:581
-msgid "Writable"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:589
-msgid "Footnotes"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:591
-msgid "Strong's numbers"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:937
-msgid "Enter name of folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:937
-msgid "Please enter the name of the folder!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1021
-msgid "BibleTime - Unlock module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1021
-msgid "Enter the key to unlock the module!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1178
-msgid "Import bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1186
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1189
-msgid "Import of bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1203
-msgid "Export bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1553
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1553
-msgid "BibleTime - Reset main index"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:78
-msgid ""
-"<qt><B>The file does already exist!</B><BR>Do you want to overwrite it?</qt>"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:78
-msgid "BibleTime - Save file as ..."
-msgstr ""
-
-#: bibletime/frontend/chtmldialog.cpp:35 bibletime/frontend/chtmldialog.cpp:43
-msgid "BibleTime - Help window"
-msgstr ""
-
-#: bibletime/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr ""
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr ""
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr ""
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr ""
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr ""
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr ""
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr ""
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-msgid "Edit toolbar"
-msgstr ""
-
-#: bibletime/dummy.h:41 bibletime/tooltipdef.h:41
-msgid "BibleTime's handbook"
-msgstr ""
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Enter \"What's this?\" mode"
-msgstr ""
-
-#: bibletime/dummy.h:43 bibletime/tooltipdef.h:43
-msgid "Send bugreport"
-msgstr ""
-
-#: bibletime/dummy.h:44 bibletime/tooltipdef.h:44
-msgid "Show a daily tip"
-msgstr ""
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "About BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "About KDE"
-msgstr ""
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-msgid "The main index"
-msgstr ""
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "Add bookmark to printing queue"
-msgstr ""
-
-#: bibletime/dummy.h:61 bibletime/tooltipdef.h:61
-msgid "The working area"
-msgstr ""
-
-#: bibletime/dummy.h:63 bibletime/tooltipdef.h:63
-msgid "The bible window"
-msgstr ""
-
-#: bibletime/dummy.h:64 bibletime/tooltipdef.h:64
-msgid "The commentary window"
-msgstr ""
-
-#: bibletime/dummy.h:65 bibletime/tooltipdef.h:65
-msgid "The lexicon window"
-msgstr ""
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "Show the next entry"
-msgstr ""
-
-#: bibletime/dummy.h:68 bibletime/tooltipdef.h:68
-msgid "Show the previous entry"
-msgstr ""
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Jump to next verse"
-msgstr ""
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Jump to previous verse"
-msgstr ""
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-msgid "Show next chapter"
-msgstr ""
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-msgid "Show previous chapter"
-msgstr ""
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-msgid "Show next book"
-msgstr ""
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-msgid "Show previous book"
-msgstr ""
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-msgid "List of books"
-msgstr ""
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-msgid "List of chapters"
-msgstr ""
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of verses"
-msgstr ""
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of entries"
-msgstr ""
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "Scroll through the list"
-msgstr ""
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "Edit this entry"
-msgstr ""
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Save this comment"
-msgstr ""
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Delete this comment"
-msgstr ""
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Comment up to"
-msgstr ""
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Set bold"
-msgstr ""
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Set italic"
-msgstr ""
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set underlined"
-msgstr ""
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set font"
-msgstr ""
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set the color"
-msgstr ""
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set the fontsize"
-msgstr ""
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Synchronize with Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:94 bibletime/tooltipdef.h:94
-msgid "Save as HTML"
-msgstr ""
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Copy to clipboard"
-msgstr ""
-
-#: bibletime/dummy.h:100 bibletime/tooltipdef.h:100
-msgid "Add the selected module to the list"
-msgstr ""
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-msgid "Remove the selected module from the list"
-msgstr ""
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "List of modules used for the search"
-msgstr ""
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "Search this text"
-msgstr ""
-
-#: bibletime/dummy.h:105 bibletime/tooltipdef.h:105
-msgid "Search multiple words"
-msgstr ""
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-msgid "Exact match"
-msgstr ""
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search with GNU regular expressions"
-msgstr ""
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Search case sensitive"
-msgstr ""
-
-#: bibletime/dummy.h:111 bibletime/tooltipdef.h:111
-msgid "Last search result"
-msgstr ""
-
-#: bibletime/dummy.h:112 bibletime/tooltipdef.h:112
-msgid "Use own scope"
-msgstr ""
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Add a new scope"
-msgstr ""
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-msgid "Delete this search scope"
-msgstr ""
-
-#: bibletime/dummy.h:115 bibletime/dummy.h:297 bibletime/tooltipdef.h:115
-#: bibletime/whatsthisdef.h:123
-msgid "Edit and define your search scopes"
-msgstr ""
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Choose a search scope from the list"
-msgstr ""
-
-#: bibletime/dummy.h:117 bibletime/tooltipdef.h:117
-msgid "Enter your own search scope"
-msgstr ""
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Parsed result"
-msgstr ""
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Close this dialog"
-msgstr ""
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Used modules"
-msgstr ""
-
-#: bibletime/dummy.h:122 bibletime/tooltipdef.h:122
-msgid "Items found"
-msgstr ""
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Graphical analysis"
-msgstr ""
-
-#: bibletime/dummy.h:128 bibletime/tooltipdef.h:128
-msgid "Show daily tip"
-msgstr ""
-
-#: bibletime/dummy.h:129 bibletime/tooltipdef.h:129
-msgid "List of languages"
-msgstr ""
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-msgid "Set keyboard accelerators"
-msgstr ""
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Choose the area of application"
-msgstr ""
-
-#: bibletime/dummy.h:136 bibletime/dummy.h:317 bibletime/tooltipdef.h:136
-#: bibletime/whatsthisdef.h:143
-msgid "Choose a font"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "List of modules"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "Color of the background"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "Color of the highlighted verse"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid "Start printing"
-msgstr ""
-
-#: bibletime/dummy.h:145 bibletime/tooltipdef.h:145
-msgid "Show a preview"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Open help"
-msgstr ""
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "The list of printers"
-msgstr ""
-
-#: bibletime/dummy.h:150 bibletime/tooltipdef.h:150
-msgid "Print into a file"
-msgstr ""
-
-#: bibletime/dummy.h:151 bibletime/tooltipdef.h:151
-msgid "Browse for the file"
-msgstr ""
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Copies"
-msgstr ""
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Paper type"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Paper size"
-msgstr ""
-
-#: bibletime/dummy.h:159 bibletime/tooltipdef.h:159
-msgid "Styles"
-msgstr ""
-
-#: bibletime/dummy.h:160 bibletime/tooltipdef.h:160
-msgid "List of print items"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Move item up"
-msgstr ""
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-msgid "Move item down"
-msgstr ""
-
-#: bibletime/dummy.h:163 bibletime/tooltipdef.h:163
-msgid "Delete items"
-msgstr ""
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Insert a page break"
-msgstr ""
-
-#: bibletime/dummy.h:166 bibletime/tooltipdef.h:166
-msgid "Page borders"
-msgstr ""
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "Left border"
-msgstr ""
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Right border"
-msgstr ""
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Upper border"
-msgstr ""
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Lower border"
-msgstr ""
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "List of styles"
-msgstr ""
-
-#: bibletime/dummy.h:172 bibletime/tooltipdef.h:172
-msgid "Delete the chosen printing style"
-msgstr ""
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Edit the chosen printing style"
-msgstr ""
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Create a new printing style"
-msgstr ""
-
-#: bibletime/dummy.h:202 bibletime/whatsthisdef.h:28
-msgid ""
-"Clear the printing queue of BibleTime. All items will be removed from the "
-"list, the print button will be disabled."
-msgstr ""
-
-#: bibletime/dummy.h:203 bibletime/whatsthisdef.h:29
-msgid ""
-"Open the printerdialog of BibleTime where you can edit the printing queue "
-"and assign styles to the items."
-msgstr ""
-
-#: bibletime/dummy.h:204 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr ""
-
-#: bibletime/dummy.h:206 bibletime/whatsthisdef.h:32
-msgid "Open the search dialog to search text in one or more modules."
-msgstr ""
-
-#: bibletime/dummy.h:207 bibletime/whatsthisdef.h:33
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder the "
-"subitems of it will be removed, too."
-msgstr ""
-
-#: bibletime/dummy.h:208 bibletime/whatsthisdef.h:34
-msgid ""
-"Reset the main index<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:36
-msgid "Show or hide the main index depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:37
-msgid "Show or hide the main toolbar depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:212 bibletime/whatsthisdef.h:38
-msgid "Show or hide the footnotes in the modules deoending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:39
-msgid ""
-"Show or hide Strong's numbers in the modules depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:41
-msgid "Arrange the opened display windows in a tile pattern."
-msgstr ""
-
-#: bibletime/dummy.h:216 bibletime/whatsthisdef.h:42
-msgid ""
-"The open display windows will automatically arranged in a tile pattern if "
-"it's necessary."
-msgstr ""
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:43
-msgid "Arrange the open display windows in a cascade pattern."
-msgstr ""
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:44
-msgid ""
-"The open display windows will automatically arranged in a cascade pattern if "
-"it's necessary."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr ""
-
-#: bibletime/dummy.h:221 bibletime/whatsthisdef.h:47
-msgid "Open a dialog where you can edit the toolbar of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:48
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:50
-msgid "Open KDE's helpbrowser with BibleTime's handbook."
-msgstr ""
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:51
-msgid ""
-"Switch into the <B>\"What's this?\"</B> mode.<BR>All important elements of "
-"BibleTime's GUI offer a \"What's this?\" help."
-msgstr ""
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:52
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr ""
-
-#: bibletime/dummy.h:227 bibletime/whatsthisdef.h:53
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:54
-msgid "Show detailed information about BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:229 bibletime/whatsthisdef.h:55
-msgid "Show the general about dialog of KDE 2."
-msgstr ""
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:59
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:60
-msgid ""
-"Create a new folder in the main index.<BR>If you pressed the right mouse "
-"button on a folder the new folder will be a sub-item of it.<BR>Otherwise you "
-"will create a toplevel folder."
-msgstr ""
-
-#: bibletime/dummy.h:235 bibletime/whatsthisdef.h:61
-msgid "Change the properties of the selected folder."
-msgstr ""
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:62
-msgid "Change the properties of the selected bookmark."
-msgstr ""
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:63
-msgid "Import bookmark from a file."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:64
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:65
-msgid ""
-"Use this to add this bookmark to BibleTime's printing queue. The key, the "
-"description and the text of the key will be used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:66
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:67
-msgid "Open a dialog to show information about the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:244 bibletime/whatsthisdef.h:70
-msgid ""
-"This area contains is the working place of Bibletime.<BR>All display windows "
-"are opened in this place."
-msgstr ""
-
-#: bibletime/dummy.h:246 bibletime/whatsthisdef.h:72
-msgid "This is the Bible display window"
-msgstr ""
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:73
-msgid "This is the commentary display window."
-msgstr ""
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:74
-msgid "This is the lexicon display window."
-msgstr ""
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:76
-msgid "The next entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:77
-msgid "The previous entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:78
-msgid ""
-"If you view the text of a Bible the next verse will be highlighted.<BR>If "
-"you read a commentary the next entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:79
-msgid ""
-"If you view the text of a Bible the previous verse will be highlighted. If "
-"you read a commentary the next entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:80
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:81
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-
-#: bibletime/dummy.h:256 bibletime/whatsthisdef.h:82
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:257 bibletime/whatsthisdef.h:83
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:84
-msgid "This list contains the books which are available in this module."
-msgstr ""
-
-#: bibletime/dummy.h:259 bibletime/whatsthisdef.h:85
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr ""
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:86
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:87
-msgid "This list contains the entries of the current module."
-msgstr ""
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:88
-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/dummy.h:263 bibletime/whatsthisdef.h:89
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:90
-msgid "Save the personal comment."
-msgstr ""
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:91
-msgid "Clear the text and delete the entry from the module."
-msgstr ""
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:92
-msgid "Switch between bold and non-bold formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:93
-msgid "Switch between italic and non-italic formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:94
-msgid ""
-"Switch between underlined and non-undelined formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:95
-msgid "Choose a new font for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:96
-msgid "Choose a new color for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:97
-msgid "Choose a new fontsize for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:99
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:102
-msgid "Save the displayed chapter as a HTML file."
-msgstr ""
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:103
-msgid "Select all text."
-msgstr ""
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:104
-msgid "Copy the displayed text to the clipboard."
-msgstr ""
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:107
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two button "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-
-#: bibletime/dummy.h:282 bibletime/whatsthisdef.h:108
-msgid "Add the selected module to the list on the left."
-msgstr ""
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:109
-msgid "Remove the selected module from the list on the left side."
-msgstr ""
-
-#: bibletime/dummy.h:284 bibletime/whatsthisdef.h:110
-msgid "The list of modules used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:112
-msgid "The text entered in this edit box will be searched in all modules."
-msgstr ""
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:113
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit line is "
-"searched as a single word."
-msgstr ""
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:114
-msgid ""
-"Select this to search for exactly the same text you entered in the edit line."
-msgstr ""
-
-#: bibletime/dummy.h:289 bibletime/whatsthisdef.h:115
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-
-#: bibletime/dummy.h:290 bibletime/whatsthisdef.h:116
-msgid "Activate this to use case sensitive search."
-msgstr ""
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:118
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr ""
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:119
-msgid ""
-"Select this if you want to use the last search result of each module as "
-"search scope."
-msgstr ""
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:120
-msgid "Create a new search scope."
-msgstr ""
-
-#: bibletime/dummy.h:295 bibletime/whatsthisdef.h:121
-msgid ""
-"Use an own scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:122
-msgid "Use this button to delete the chosen search scope."
-msgstr ""
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:124
-msgid "Choose a search scope from the combo box"
-msgstr ""
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:125
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:126
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:301 bibletime/whatsthisdef.h:127
-msgid "Close this dialog and save the changes."
-msgstr ""
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:129
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:130
-msgid "This contains the items found in the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:131
-msgid "This text box shows a preview of the chosen item."
-msgstr ""
-
-#: bibletime/dummy.h:307 bibletime/whatsthisdef.h:133
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:136
-msgid "Activate this box to see a daily tip on startup."
-msgstr ""
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:137
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-
-#: bibletime/dummy.h:312 bibletime/whatsthisdef.h:138
-msgid "Activate this to see a startup logo on each startup of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:141
-msgid "Select a action and change the key binding for the action."
-msgstr ""
-
-#: bibletime/dummy.h:316 bibletime/whatsthisdef.h:142
-msgid ""
-"Select in this box how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-
-#: bibletime/dummy.h:319 bibletime/whatsthisdef.h:145
-msgid "This list contains the modules using foreign fonts."
-msgstr ""
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:147
-msgid "This is the background color used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:148
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:325 bibletime/whatsthisdef.h:151
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:152
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:153
-msgid ""
-"Closes this dialog without doing anything with the items or the printer."
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:154
-msgid "Open the online help of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:156
-msgid ""
-"This is the list of available printers of your system.<BR>Please select the "
-"printer you want to use for printing."
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:157
-msgid "Print into a postscript file on disk."
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:158
-msgid "Browse for the file you want to print into."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:159
-msgid "The number of copies used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:334 bibletime/whatsthisdef.h:160
-msgid "Choose the orientation of the used paper."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:161
-msgid "Print on the paper using \"Portrait\" as orientation."
-msgstr ""
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:162
-msgid "Print on the paper using \"Landscape\" as orientation."
-msgstr ""
-
-#: bibletime/dummy.h:337 bibletime/whatsthisdef.h:163
-msgid "The type of the paper which is used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:338 bibletime/whatsthisdef.h:164
-msgid "The size of the used paper."
-msgstr ""
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:166
-msgid "This combo box contains the available printing styles."
-msgstr ""
-
-#: bibletime/dummy.h:341 bibletime/whatsthisdef.h:167
-msgid "This is the list which contains the available print items."
-msgstr ""
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:168
-msgid "Move the selected item one item above."
-msgstr ""
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:169
-msgid "Move the selected item one item below."
-msgstr ""
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:170
-msgid "Delete the selected items."
-msgstr ""
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:171
-msgid "Inserts a page break into the list.<BR>The printer will start new page."
-msgstr ""
-
-#: bibletime/dummy.h:347 bibletime/whatsthisdef.h:173
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr ""
-
-#: bibletime/dummy.h:348 bibletime/whatsthisdef.h:174
-msgid "The size of the border on the left side of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:175
-msgid "The size of the border on the right side of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:176
-msgid "The size of the border on the top of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:177
-msgid "The size of the border on the bottom of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:178
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-
-#: bibletime/dummy.h:353 bibletime/whatsthisdef.h:179
-msgid "Remove the selected printing style from the list."
-msgstr ""
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:180
-msgid "Change the properties of the selected printing style."
-msgstr ""
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:181
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr ""
diff --git a/bibletime-doc/po/it.gmo b/bibletime-doc/po/it.gmo
deleted file mode 100644
index 5b21f8d..0000000
--- a/bibletime-doc/po/it.gmo
+++ /dev/null
diff --git a/bibletime-doc/po/it.po b/bibletime-doc/po/it.po
deleted file mode 100644
index 9849d48..0000000
--- a/bibletime-doc/po/it.po
+++ /dev/null
@@ -1,3375 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-07 01:40+0200\n"
-"PO-Revision-Date: 2001-05-08 23:33CEST\n"
-"Last-Translator: Silvio Bacchetta <silvio.bacchetta@milug.org>\n"
-"Language-Team: italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.8\n"
-
-#: bibletime/backend/cswordbackend.cpp:313
-#: bibletime/frontend/coptionsdialog.cpp:272
-msgid "Footnotes"
-msgstr "note a piè di pagina"
-
-#: bibletime/backend/cswordbackend.cpp:315
-#, fuzzy
-msgid "Strong's Numbers"
-msgstr "Numeri di Strong"
-
-#: bibletime/backend/cswordbackend.cpp:317
-msgid "Headings"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:319
-msgid "Morphological Tags"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:321
-msgid "Lemmas"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:323
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:325
-#, fuzzy
-msgid "Hebrew Cantillation"
-msgstr "Disposizione"
-
-#: bibletime/backend/cswordbackend.cpp:327
-msgid "Greek Accents"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:329
-msgid "Textual Variants"
-msgstr ""
-
-#: bibletime/main.cpp:110
-#, fuzzy
-msgid "Enable debug messages"
-msgstr "Abilita messaggi di debug"
-
-#: bibletime/main.cpp:111
-msgid "Ignore the startup profile saved after the last BibleTime execution."
-msgstr ""
-
-#: bibletime/main.cpp:119
-msgid "Bible study tool for KDE 2"
-msgstr "Strumento per lo studio della Bibbia per KDE 2"
-
-#: bibletime/main.cpp:121
-#, fuzzy
-msgid "(c)1999-2002, The BibleTime Team"
-msgstr "(c)1999-2001, The BibleTime Team"
-
-#: bibletime/main.cpp:122
-#, fuzzy
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-"Bibletime è uno strumento per KDE 2 potente ma di facile utilizzo per lo "
-"studio della Bibbia.\n"
-"\n"
-"Stiamo cercando nuovi sviluppatori, traduttori e autori di manuali.\n"
-"Se desideri unirti a noi manda una e-mail in inglese o in tedesco a "
-"info@bibletime.de"
-
-#: bibletime/main.cpp:130
-#, fuzzy
-msgid "Project coordinator"
-msgstr "Coordinatore del progetto, frontend, backend"
-
-#: bibletime/main.cpp:131
-#, fuzzy
-msgid "Frontend, backend"
-msgstr "Frontend, backend, varie"
-
-#: bibletime/main.cpp:132
-#, fuzzy
-msgid "Searchdialog"
-msgstr "Finestra di ricerca"
-
-#: bibletime/main.cpp:138
-msgid "Icons, startlogo, banners"
-msgstr ""
-
-#: bibletime/main.cpp:141
-msgid "Handbook"
-msgstr "Manuale"
-
-#: bibletime/main.cpp:144
-msgid "Translation into Czech"
-msgstr "Traduzione in ceco"
-
-#: bibletime/main.cpp:145
-msgid "Translation into Danish"
-msgstr "Traduzione in danese"
-
-#: bibletime/main.cpp:146
-msgid "Translation into Dutch"
-msgstr "Traduzione in olandese"
-
-#: bibletime/main.cpp:148
-msgid "Translation into French"
-msgstr "Traduzione in francese"
-
-#: bibletime/main.cpp:149
-msgid "Translation into Hungarian"
-msgstr "Traduzione in ungherese"
-
-#: bibletime/main.cpp:150 bibletime/main.cpp:151
-msgid "Translation into Italian"
-msgstr "Traduzione in italiano"
-
-#: bibletime/main.cpp:152
-msgid "Translation into Norwegian"
-msgstr "Traduzione in norvegese"
-
-#: bibletime/main.cpp:153
-msgid "Translation into Polish"
-msgstr "Traduzione in polacco"
-
-#: bibletime/main.cpp:154
-msgid "Translation into Portoguese"
-msgstr "Traduzione in portoghese"
-
-#: bibletime/main.cpp:155
-#, fuzzy
-msgid "Translation into Russian"
-msgstr "Traduzione in ungherese"
-
-#: bibletime/main.cpp:156
-msgid "Translation into Slovak"
-msgstr "Traduzione in slovacco"
-
-#: bibletime/main.cpp:157
-#, fuzzy
-msgid "Translation into Spanish"
-msgstr "Traduzione in danese"
-
-#: bibletime/main.cpp:160
-msgid "Bible study HowTo"
-msgstr "Bible study HowTo"
-
-#: bibletime/main.cpp:185
-#, fuzzy
-msgid "Starting BibleTime"
-msgstr "Informazioni su BibleTime"
-
-#: bibletime/bibletime_init.cpp:59
-#, fuzzy
-msgid "Creating BibleTime's GUI"
-msgstr "Chiudi BibleTime"
-
-#: bibletime/bibletime_init.cpp:77
-msgid "Initializing menu- and toolbars"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:81
-msgid "Clear printing queue"
-msgstr "Pulisci la coda di stampa"
-
-#: bibletime/bibletime_init.cpp:99 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr "Azzera l'indice principale"
-
-#: bibletime/bibletime_init.cpp:105
-msgid "Search in module(s)"
-msgstr "Cerca nel modulo(i)"
-
-#: bibletime/bibletime_init.cpp:111
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:297
-msgid "Remove selected item(s)"
-msgstr "Rimuovi oggetto(i) selezionato"
-
-#: bibletime/bibletime_init.cpp:122
-msgid "&Show main index"
-msgstr "Mo&stra l'indice principale"
-
-#: bibletime/bibletime_init.cpp:137
-msgid "&Cascade"
-msgstr "Sovrapponi (&C)"
-
-#: bibletime/bibletime_init.cpp:143
-msgid "&Tile"
-msgstr "Affianca (&T)"
-
-#: bibletime/bibletime_init.cpp:149
-msgid "&Auto cascade"
-msgstr "Sovrapposizione &automatica"
-
-#: bibletime/bibletime_init.cpp:155
-msgid "A&uto Tile"
-msgstr "Affiancamento a&utomatico"
-
-#: bibletime/bibletime_init.cpp:161
-msgid "&Close all"
-msgstr "&Chiudi tutto"
-
-#: bibletime/bibletime_init.cpp:167
-#, fuzzy
-msgid "&Save profile"
-msgstr "Crea una nuova cartella"
-
-#: bibletime/bibletime_init.cpp:172
-#, fuzzy
-msgid "&Load profile"
-msgstr "Crea una nuova cartella"
-
-#: bibletime/bibletime_init.cpp:177
-#, fuzzy
-msgid "&Configure profiles"
-msgstr "Configura i colori di BibleTime"
-
-#: bibletime/bibletime_init.cpp:183
-#, fuzzy
-msgid "&Fullscreen mode"
-msgstr "Modulo corrente:"
-
-#: bibletime/bibletime_init.cpp:202
-#, fuzzy
-msgid "&Handbook"
-msgstr "Manuale"
-
-#: bibletime/bibletime_init.cpp:208
-msgid "&Installation"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:214
-#, fuzzy
-msgid "&Bible Study Howto"
-msgstr "Bible study HowTo"
-
-#: bibletime/bibletime_init.cpp:229
-msgid "&Daily tip"
-msgstr "Suggerimento del giorno (&d)"
-
-#: bibletime/bibletime_init.cpp:294
-msgid "Initializing Sword"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:341
-msgid "Initializing printing system"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:40
-msgid "style editor"
-msgstr "editor degli stili"
-
-#: bibletime/printing/cstyleeditordialog.cpp:63
-msgid "Name of style:"
-msgstr "Nome dello stile:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose the part of the style:"
-msgstr "Scegli la parte dello stile:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:73
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Header"
-msgstr "Intestazione"
-
-#: bibletime/printing/cstyleeditordialog.cpp:74
-#: bibletime/printing/cstyleeditordialog.cpp:293
-msgid "Description"
-msgstr "Descrizione"
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-#: bibletime/printing/cstyleeditordialog.cpp:297
-msgid "Module text"
-msgstr "Testo del modulo"
-
-#: bibletime/printing/cstyleeditordialog.cpp:81
-msgid "Enable this part"
-msgstr "Abilita questa parte"
-
-#: bibletime/printing/cstyleeditordialog.cpp:104
-msgid "Foreground:"
-msgstr "Primo piano:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:115
-msgid "Background:"
-msgstr "Sfondo:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:126
-msgid "Choose font"
-msgstr "Scegli il font"
-
-#: bibletime/printing/cstyleeditordialog.cpp:129
-msgid "Font preview"
-msgstr "Anteprima del font"
-
-#: bibletime/printing/cstyleeditordialog.cpp:143
-msgid "Use frame"
-msgstr "Usa cornice"
-
-#: bibletime/printing/cstyleeditordialog.cpp:154
-msgid "Line thickness (in point):"
-msgstr "Spessore della linea (in punti):"
-
-#: bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr "Colore della cornice:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:170
-#, fuzzy
-msgid "Line style:"
-msgstr "Nome dello stile:"
-
-#: bibletime/frontend/coptionsdialog.cpp:218
-#: bibletime/frontend/coptionsdialog.cpp:735
-#: bibletime/printing/cprintdialogpages.cpp:176
-#: bibletime/printing/cprinter.cpp:307 bibletime/printing/cprinter.cpp:316
-#: bibletime/printing/cstyle.cpp:180
-#: bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr "Standard"
-
-#: bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr "Nome:"
-
-#: bibletime/printing/cstyle.cpp:181
-msgid "Colored style for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:182
-msgid "Black&White for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:187
-msgid "unknown name"
-msgstr "nome sconosciuto"
-
-#: bibletime/dummy.h:166 bibletime/printing/cprintdialogpages.cpp:43
-#: bibletime/tooltipdef.h:166
-msgid "Styles"
-msgstr "Stili"
-
-#: bibletime/printing/cprintdialogpages.cpp:48
-msgid "Margins (in millimeter)"
-msgstr "Margini (in millimetri)"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Top"
-msgstr "Superiore (&T)"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Left"
-msgstr "Sinistro (&L)"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Right"
-msgstr "Destro (&R)"
-
-#: bibletime/printing/cprintdialogpages.cpp:104
-msgid "List of style items:"
-msgstr "Lista degli stili:"
-
-#: bibletime/printing/cprintdialogpages.cpp:192
-#, fuzzy
-msgid "Print queue"
-msgstr "Stampante"
-
-#: bibletime/printing/cprintdialogpages.cpp:203
-msgid "Choose a style"
-msgstr "Scegli uno stile"
-
-#: bibletime/printing/cprintdialogpages.cpp:215
-msgid "Entries which should be printed:"
-msgstr "Voci da stampare:"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:239
-#: bibletime/printing/cprintitemlist.cpp:44
-msgid "Module"
-msgstr "Modulo"
-
-#: bibletime/printing/cprintitemlist.cpp:45
-msgid "From"
-msgstr "Da"
-
-#: bibletime/printing/cprintitemlist.cpp:46
-msgid "To"
-msgstr "A"
-
-#: bibletime/printing/cprintitemlist.cpp:47
-msgid "Style"
-msgstr "Stile"
-
-#: bibletime/frontend/chtmldialog.cpp:84
-#, fuzzy
-msgid "Backward"
-msgstr "Sfondo"
-
-#: bibletime/frontend/chtmldialog.cpp:102
-msgid "Forward"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:264
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr "Impossibile trovare la pagina %1!"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.html *.htm *.shtml *.shtm | File HTML\n"
-" *.* | Tutti i file (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid "Save text as HTML page ..."
-msgstr "Salva il testo come pagina HTML..."
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-".txt | file di testo (*.txt)\n"
-"*.* | Tutti i  file (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid "Save text as plain text ..."
-msgstr "Salva come testo semplice..."
-
-#: bibletime/frontend/chtmlwidget.cpp:501
-msgid "Choose a font:"
-msgstr "Scegli un font:"
-
-#: bibletime/frontend/chtmlwidget.cpp:505
-msgid "Choose font size"
-msgstr "Scegli la dimensione del font"
-
-#: bibletime/frontend/chtmlwidget.cpp:509
-msgid "Bold"
-msgstr "Grassetto"
-
-#: bibletime/frontend/chtmlwidget.cpp:513
-msgid "Underlined"
-msgstr "Sottolineato"
-
-#: bibletime/frontend/chtmlwidget.cpp:522
-msgid "Justify"
-msgstr "Giustifica"
-
-#: bibletime/frontend/cprofile.cpp:33
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:178
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:189
-msgid "unknown"
-msgstr "sconosciuto"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:214
-msgid "Bookmark to"
-msgstr "Aggiungi come segnalibro a"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:539
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:241
-#, fuzzy
-msgid "Language"
-msgstr "Lista delle lingue"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:549
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:243
-msgid "Unlock key"
-msgstr "Chiave di sblocco"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-msgid "not set"
-msgstr "non impostato"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:532
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-msgid "Version"
-msgstr "Versione"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:149
-msgid "Bibles"
-msgstr "Bibbie"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:150
-msgid "Books"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:151
-msgid "Commentaries"
-msgstr "Commentari"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:152
-msgid "Lexicons"
-msgstr "Lessici"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:269
-msgid "Caption"
-msgstr "Acquisizione"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:277
-msgid "Main index"
-msgstr "Indice principale"
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:278
-#: bibletime/tooltipdef.h:57
-msgid "Create a new folder"
-msgstr "Crea una nuova cartella"
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:281
-#: bibletime/tooltipdef.h:58
-msgid "Change this folder"
-msgstr "Cambia questa cartella"
-
-#: bibletime/dummy.h:59 bibletime/frontend/groupmanager/cgroupmanager.cpp:285
-#: bibletime/tooltipdef.h:59
-msgid "Change this bookmark"
-msgstr "Cambia questo segnalibro"
-
-#: bibletime/dummy.h:60 bibletime/frontend/groupmanager/cgroupmanager.cpp:288
-#: bibletime/tooltipdef.h:60
-msgid "Import bookmarks"
-msgstr "Importa segnalibri"
-
-#: bibletime/dummy.h:61 bibletime/frontend/groupmanager/cgroupmanager.cpp:291
-#: bibletime/tooltipdef.h:61
-msgid "Export bookmarks"
-msgstr "Esporta segnalibri"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:294
-msgid "Print bookmark"
-msgstr "Stampa segnalibro"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-msgid "Search in selected module(s)"
-msgstr "Cerca nei moduli selezionati"
-
-#: bibletime/dummy.h:63 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:63
-msgid "Unlock this module"
-msgstr "Sblocca questo modulo"
-
-#: bibletime/dummy.h:64 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:64
-msgid "About this module"
-msgstr "Informazioni su questo modulo"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Bookmark description - BibleTime"
-msgstr "Descrizione del segnalibro - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Please enter here the description:"
-msgstr "Inserisci la descrizione:"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Change bookmark description - BibleTime"
-msgstr "Cambia la descrizione del segnalibro - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Please change the description of the item!"
-msgstr "Per favore, modifica la descrizione dell'oggetto!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Change folder - BibleTime"
-msgstr "Cambia cartella - Bibletime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Please change the name of the group!"
-msgstr "Per favore, cambia il nome del gruppo!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:536
-#, fuzzy
-msgid "Location"
-msgstr "Acquisizione"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:544
-msgid "Writable"
-msgstr "Scrivibile"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:545
-#, fuzzy
-msgid "yes"
-msgstr "Stili"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Encoding"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:219
-#: bibletime/frontend/coptionsdialog.cpp:738
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Unicode"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "iso8859-1"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:564
-msgid "Features"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Enter name of folder - BibleTime"
-msgstr "Inserisci il nome della cartella - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Please enter the name of the folder!"
-msgstr "Per favore, inserisci il nome della cartella!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "BibleTime - Unlock module"
-msgstr "BibleTime - Sblocca modulo"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "Enter the key to unlock the module!"
-msgstr "Inserisci la chiave per sbloccare il modulo!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1148
-msgid "Import bookmarks ..."
-msgstr "Importa segnalibri..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1156
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Si è verificato un problema nell'importazione dei segnalibri!<BR>Il "
-"formato dei segnalibri del file importato è più recente<BR>del formato di "
-"file di questa versione di BibleTime!<BR><B>L'importazione dei segnalibri "
-"potrebbe non funzionare correttamente!</B><BR>Vuoi continuare?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1159
-msgid "Import of bookmarks"
-msgstr "Importazione dei segnalibri"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1173
-msgid "Export bookmarks ..."
-msgstr "Esportazione dei segnalibri..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Questa funzione azzererà l'indice principale!<BR>Questo creerà di nuovo "
-"i gruppi originali e cancellerà tutti gli altri elementi!<BR>Assicurati che "
-"non siano cancellati segnalibri importanti!<BR>Vuoi continuare?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid "BibleTime - Reset main index"
-msgstr "BibleTime - Azzera l'indice principale"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:85
-msgid "Lexicon window"
-msgstr "Finestra dei lessici"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:88
-msgid "Entry"
-msgstr "Voce"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:100
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:89
-msgid "Text of entry"
-msgstr "Testo della voce"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:106
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:90
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:95
-msgid "Entry with text"
-msgstr "Voce con testo"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:100
-#: bibletime/frontend/presenters/cbookpresenter.cpp:98
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:103
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:92
-msgid "Selected text"
-msgstr "Testo selezionato"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:109
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:98
-msgid "Entry as plain text"
-msgstr "Voce come testo semplice"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:106
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:110
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:99
-msgid "Entry as HTML"
-msgstr "Voce come HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:112
-#: bibletime/frontend/presenters/cbookpresenter.cpp:109
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:113
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:102
-msgid "Lookup selected text in lexicon"
-msgstr "Cerca il testo selezionato nel lessico"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:114
-#: bibletime/frontend/presenters/cbookpresenter.cpp:111
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:115
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:104
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:270
-msgid "Copy..."
-msgstr "Copia..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:115
-#: bibletime/frontend/presenters/cbookpresenter.cpp:112
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:116
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:105
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:271
-msgid "Add to printing queue..."
-msgstr "Aggiungi alla coda di stampa..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:116
-#: bibletime/frontend/presenters/cbookpresenter.cpp:113
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:117
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:106
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:272
-msgid "Save..."
-msgstr "Salva..."
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:259
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:267
-#, fuzzy
-msgid "Next entry"
-msgstr "Testo della voce"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:260
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:270
-#, fuzzy
-msgid "Previous entry"
-msgstr "Mostra la voce precedente"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:92
-msgid "Bible window"
-msgstr "Finestra della Bibbia"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:95
-msgid "Verse"
-msgstr "Versetto"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:96
-msgid "Text of verse"
-msgstr "Testo del versetto"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:97
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:103
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:107
-msgid "Verse with text"
-msgstr "Versetto con testo"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:98
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:104
-msgid "Chapter"
-msgstr "Capitolo"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:108
-msgid "Chapter as plain text"
-msgstr "Capitolo come testo semplice"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:109
-msgid "Chapter as HTML"
-msgstr "Capitolo come HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:327
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:343
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:413
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:432
-#, fuzzy
-msgid "Next book"
-msgstr "Mostra il libro successivo"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:328
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:345
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:414
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:434
-#, fuzzy
-msgid "Previous book"
-msgstr "Mostra il libro precedente"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:330
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:348
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:416
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:437
-#, fuzzy
-msgid "Next chapter"
-msgstr "Mostra il capitolo successivo"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:331
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:350
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:417
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:439
-#, fuzzy
-msgid "Previous chapter"
-msgstr "Mostra il capitolo precedente"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:333
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:353
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:419
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:442
-#, fuzzy
-msgid "Next verse"
-msgstr "Testo del versetto"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:334
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:355
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:420
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:444
-#, fuzzy
-msgid "Previous verse"
-msgstr "Salta al versetto precedente"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:47
-msgid "Select additional modules"
-msgstr "Seleziona moduli addizionali"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:126
-msgid "NONE"
-msgstr "NESSUNO"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:70
-#, fuzzy
-msgid "Display options"
-msgstr "Mostra finestra"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:73
-msgid "Use linebreaks"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:74
-#, fuzzy
-msgid "Show versenumbers"
-msgstr "Mostra numeri di Strong"
-
-#: bibletime/frontend/coptionsdialog.cpp:663
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:76
-msgid "Show headings"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/frontend/coptionsdialog.cpp:653
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:78
-#: bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr "Mostra note a pié di pagina"
-
-#: bibletime/frontend/coptionsdialog.cpp:658
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:80
-#, fuzzy
-msgid "Show Strong's Numbers"
-msgstr "Mostra numeri di Strong"
-
-#: bibletime/frontend/coptionsdialog.cpp:668
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:83
-msgid "Show morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:673
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:85
-msgid "Show lemmas"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:678
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:87
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:683
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:89
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:688
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:91
-msgid "Show Greek accents"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:93
-msgid "Use alternative textual variant"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:80
-msgid "Synchronize..."
-msgstr "Sincronizza"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-msgid "Edit entry..."
-msgstr "Modifica voce..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:96
-msgid "Commentary window"
-msgstr "Finestra del commentario"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:232
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:392
-msgid "The text was not saved to the module. Save the changes now?"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:422
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:447
-msgid "Toggle synchronize button"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:511
-#, fuzzy
-msgid "Save changes to module?"
-msgstr "Cerca nei moduli"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:68
-msgid "Toggle tree..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:90
-#, fuzzy
-msgid "Book window"
-msgstr "Finestra della Bibbia"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:200
-#: bibletime/frontend/presenters/cbookpresenter.cpp:208
-#, fuzzy
-msgid "Toggle tree"
-msgstr "Modulo corrente:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr "Moduli:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr "Voci trovate:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:173
-#, fuzzy
-msgid "module not set"
-msgstr "<I>modulo non impostato</I>"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:53
-msgid "Search properties"
-msgstr "Opzioni di ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:72
-msgid "Multiple Words"
-msgstr "Parole multiple"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:80
-msgid "Exact Search"
-msgstr "Frase esatta"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:87
-msgid "Regular Expression"
-msgstr "Espressione regolare"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:100
-msgid "Case Sensitive"
-msgstr "Maiuscole/minuscole"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:104
-msgid "Search scope"
-msgstr "Limiti di ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:108
-msgid "Search progress"
-msgstr "Ricerca in corso"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:113
-msgid "Current module:"
-msgstr "Modulo corrente:"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:114
-msgid "Overall:"
-msgstr "Globale:"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search Dialog"
-msgstr "Finestra di ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search"
-msgstr "Cerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Interrupt"
-msgstr "Interrotta"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid "Choose modules"
-msgstr "Scegli moduli"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-msgid "Choose the modules for the search"
-msgstr "Scegli i moduli per la ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Search Text"
-msgstr "Testo da cercare"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Enter the text to search for"
-msgstr "Inserisci il testo da cercare"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "Search Result"
-msgstr "Risultati della ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "The result of your search"
-msgstr "I risultati della tua ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Search Analysis"
-msgstr "Analisi della ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Graphical analysis of your search result"
-msgstr "Analisi grafica dei risultati della tua ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "HTML files"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-#, fuzzy
-msgid "Save Search Analysis"
-msgstr "Analisi della ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:155
-#, fuzzy
-msgid "BibleTime Search Analysis"
-msgstr "Analisi della ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:156
-#, fuzzy
-msgid "Search Text :"
-msgstr "Testo da cercare"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:157
-#, fuzzy
-msgid "Search Type :"
-msgstr "Testo da cercare"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:158
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Limiti di ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:161
-msgid "Book"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:162
-msgid "Total Hits"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:186
-msgid "Created by"
-msgstr ""
-
-#: bibletime/dummy.h:112
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:112
-msgid "No scope"
-msgstr "Nessun limite"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr "Ultimo risultato"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr "Usa limiti"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:223
-msgid "Choose custom range"
-msgstr "Scegli la portata su misura"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr "Modifica la portata"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr "Vecchio testamento"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr "Mosè/Pentateuco/Torah"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr "Storia"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr "Profeti"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr "Nuovo testamento"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr "Vangeli"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr "Lettere/Epistole"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr "Lettere di San Paolo"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:224
-msgid "Define range text"
-msgstr "Definisci il testo della portata"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:225
-msgid "Range parsing results"
-msgstr "Risultati dell'analisi dell'intervallo"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Range name"
-msgstr "Nome dell'intervallo"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Please enter a name for the new range"
-msgstr "Per favore, inserisci un nome per il nuovo intervallo"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr "Moduli"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr "Risultati della ricerca"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Search result with text"
-msgstr "Risultati della ricerca con testo"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:152
-#, fuzzy
-msgid "Appending keys to the printing queue ..."
-msgstr "Aggiungi alla coda di stampa..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:166
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:195
-#, fuzzy
-msgid "Copying search result to clipboard..."
-msgstr "Copia negli appunti"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:181
-#, fuzzy
-msgid "Saving the search result ..."
-msgstr "Salva i risultati della ricerca..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:209
-#, fuzzy
-msgid "Saving the search result..."
-msgstr "Salva i risultati della ricerca..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:260
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:267
-msgid "Key"
-msgstr "Chiave"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:261
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:264
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:268
-msgid "Key with text"
-msgstr "Chiave con testo"
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.txt | File di testo\n"
-" *.* | Tutti i file (*.*)"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid "Save key ..."
-msgstr "Salva chiave..."
-
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid ""
-"Choose the module you want to use for the search. The tree on the left "
-"contains all available modules, the tree on the right the modules for the "
-"search. Use the two arrow buttons to add or remove modules from the right "
-"tree."
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:79
-msgid "The file does already exist!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:80
-msgid "Do you want to overwrite it?"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:96
-msgid "Sorry! But the file couldn't be saved!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:97
-msgid "Please check permissions etc. !"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-msgid "Save search result ..."
-msgstr "Salva i risultati della ricerca..."
-
-#: bibletime/frontend/coptionsdialog.cpp:68
-msgid "Optionsdialog"
-msgstr "Finestra opzioni"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#: bibletime/frontend/coptionsdialog.cpp:314
-#, fuzzy
-msgid "Create new profile"
-msgstr "Crea una nuova cartella"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#, fuzzy
-msgid "Please enter the name of the new profile"
-msgstr "Per favore, inserisci il nome della cartella!"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Rename profile"
-msgstr "Rimuovi gli elementi selezionati"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Please enter the new name of the profile"
-msgstr "Per favore, inserisci il nome della cartella!"
-
-#: bibletime/frontend/coptionsdialog.cpp:170
-#, fuzzy
-msgid "Startup"
-msgstr "Mostra logo iniziale"
-
-#: bibletime/frontend/coptionsdialog.cpp:174
-msgid "Show tip of the day"
-msgstr "Mostra il suggerimento del giorno"
-
-#: bibletime/frontend/coptionsdialog.cpp:184
-msgid "Show startuplogo"
-msgstr "Mostra logo iniziale"
-
-#: bibletime/frontend/coptionsdialog.cpp:193
-msgid "Restore windows in workspace area"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-#, fuzzy
-msgid "Choose fonts"
-msgstr "Scegli il font"
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid ""
-"The fonts you can choose here are used in the display windows. Use the drop-"
-"down box below to choose the area of application. Then select a font for it. "
-"Make sure the charset \"iso10646-1\" is available for the selected Unicode "
-"font.!"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:225
-#, fuzzy
-msgid "The quick brown fox jumps over the lazy dog"
-msgstr "Ma la volpe col suo balzo ha raggiunto il quieto Fido"
-
-#: bibletime/frontend/coptionsdialog.cpp:238
-msgid "Colors"
-msgstr "Colori"
-
-#: bibletime/frontend/coptionsdialog.cpp:245
-#, fuzzy
-msgid "Choose colors"
-msgstr "Scegli moduli"
-
-#: bibletime/frontend/coptionsdialog.cpp:246
-msgid ""
-"Choose the colors to change the look of the display windows to your own "
-"preferences. Some options like \"Words of Jesus\" do only apply to texts "
-"which support this special feature."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:252
-msgid "Text"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:257
-msgid "Background"
-msgstr "Sfondo"
-
-#: bibletime/frontend/coptionsdialog.cpp:262
-#, fuzzy
-msgid "Highlighted verse"
-msgstr "Versetto selezionato"
-
-#: bibletime/frontend/coptionsdialog.cpp:267
-#, fuzzy
-msgid "Hyperlinks"
-msgstr "Avvia stampa"
-
-#: bibletime/frontend/coptionsdialog.cpp:277
-msgid "Strong's numbers"
-msgstr "Numeri di Strong"
-
-#: bibletime/frontend/coptionsdialog.cpp:282
-msgid "Morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:287
-msgid "Words of Jesus"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:297
-#, fuzzy
-msgid "Profiles"
-msgstr "Modifica voce..."
-
-#: bibletime/frontend/coptionsdialog.cpp:302
-#, fuzzy
-msgid "Manage your profiles"
-msgstr "Configura i colori di BibleTime"
-
-#: bibletime/frontend/coptionsdialog.cpp:303
-msgid ""
-"Profiles define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. Don't forget "
-"that new profiles only work after you've saved something in them."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:318
-#, fuzzy
-msgid "Delete selected profile"
-msgstr "Elimina gli elementi selezionati."
-
-#: bibletime/frontend/coptionsdialog.cpp:322
-#, fuzzy
-msgid "Rename selected profile"
-msgstr "Rimuovi gli elementi selezionati"
-
-#: bibletime/frontend/coptionsdialog.cpp:340
-msgid "Accelerators"
-msgstr "Scorciatoie"
-
-#: bibletime/frontend/coptionsdialog.cpp:345
-msgid "Application wide"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:368
-#, fuzzy
-msgid "Bible windows"
-msgstr "Finestra della Bibbia"
-
-#: bibletime/frontend/coptionsdialog.cpp:381
-#, fuzzy
-msgid "Commentary windows"
-msgstr "Finestra del commentario"
-
-#: bibletime/frontend/coptionsdialog.cpp:394
-#, fuzzy
-msgid "Lexicon windows"
-msgstr "Finestra dei lessici"
-
-#: bibletime/frontend/coptionsdialog.cpp:408
-#, fuzzy
-msgid "Book windows"
-msgstr "Finestra della Bibbia"
-
-#: bibletime/frontend/coptionsdialog.cpp:422
-msgid "Sword"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:425
-msgid "General"
-msgstr "Generale"
-
-#: bibletime/frontend/coptionsdialog.cpp:431
-#: bibletime/frontend/coptionsdialog.cpp:439
-msgid "Use key cache for lexicons"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:432
-msgid ""
-"BibleTime can create a key cache for lexicons, which speeds up opening large "
-"lexicon modules a lot. However these files consume some disk space (usually "
-"not much), and reside in $KDEHOME/share/apps/bibletime/cache."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:447
-msgid "Scrolling behaviour"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:448
-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/dummy.h:134 bibletime/frontend/coptionsdialog.cpp:454
-#: bibletime/tooltipdef.h:134
-msgid "Use down arrow to scroll to next verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:461
-#, fuzzy
-msgid "Specify a language for biblical booknames"
-msgstr "Lingua per i nomi dei libri"
-
-#: bibletime/frontend/coptionsdialog.cpp:462
-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 "
-"choose. If you want to create a new locale, see http://www.crosswire.org/"
-"sword/develop for details."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:469
-msgid "Language for booknames"
-msgstr "Lingua per i nomi dei libri"
-
-#: bibletime/frontend/coptionsdialog.cpp:477
-msgid "English"
-msgstr "Inglese"
-
-#: bibletime/frontend/coptionsdialog.cpp:495
-#: bibletime/frontend/coptionsdialog.cpp:500
-#, fuzzy
-msgid "Default modules"
-msgstr "Moduli utilizzati"
-
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid ""
-"Default modules are used, when no module is specified. This may happen with "
-"references into modules like Bibles or Lexicons."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:505
-msgid "Default Bible"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:513
-#, fuzzy
-msgid "Default Commentary"
-msgstr "Commentari"
-
-#: bibletime/frontend/coptionsdialog.cpp:522
-#, fuzzy
-msgid "Default Lexicon"
-msgstr "Lessici"
-
-#: bibletime/frontend/coptionsdialog.cpp:530
-#, fuzzy
-msgid "Default Hebrew Strong's Lexicon"
-msgstr "Lessici"
-
-#: bibletime/frontend/coptionsdialog.cpp:538
-#, fuzzy
-msgid "Default Greek Strong's Lexicon"
-msgstr "Lessici"
-
-#: bibletime/frontend/coptionsdialog.cpp:546
-#, fuzzy
-msgid "Default Hebrew Morphological Lexicon"
-msgstr "Lessici"
-
-#: bibletime/frontend/coptionsdialog.cpp:553
-#, fuzzy
-msgid "Default Greek Morphological Lexicon"
-msgstr "Lessici"
-
-#: bibletime/frontend/coptionsdialog.cpp:636
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid "Filter settings"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can choose the default settings of the various filter settings. You can "
-"change the settings in each display window, too."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:643
-msgid "Show line break after each verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:648
-#, fuzzy
-msgid "Show verse numbers"
-msgstr "Mostra numeri di Strong"
-
-#: bibletime/frontend/coptionsdialog.cpp:693
-msgid "Use textual variants"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Printing..."
-msgstr "In stampa..."
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Abort printing"
-msgstr "Annulla stampa"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr "Indice principale (&M)"
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:3
-msgid ""
-"This is <B>BibleTime 1.1</B>!<BR>\n"
-"This version of BibleTime should have reached the state where it could\n"
-"be called stable, useful and user friendly!<BR>\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:9
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:13
-msgid ""
-"BibleTime 1.1 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:18
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:22
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:26
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>! \n"
-"It was written by Bob Harman and is a great help how to study the Bible.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:31
-msgid ""
-"The Bible has the power to \"comfort the afflicted\" and \"afflict the "
-"comfortable\". (Revelation 10:10)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:35
-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:39
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:43
-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:48
-msgid "That the Bible is truth. (John 17:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:52
-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:57
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:61
-msgid ""
-"It's possible to insert the text of bookmarks and references to verses or "
-"lexicon entries into the personal commentary editor by dropping them there.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:65
-msgid ""
-"By studying the Bible you will have no reason to stand ashamed before God. "
-"(2 Timothy 2:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:69
-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 optionsdialog.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:76
-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:80
-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:84
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:88
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the regular expression \"x | y | z\" for searching, which is "
-"equivalent to \"x OR y OR z\", e.g. \"pray | worship | supplicate\".\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:92
-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:96
-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:100
-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"
-"Now double click on it and drag the selected word on the foreign module in "
-"the main index.\n"
-"The search dialog will be opened with the word in the edit line.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:106
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:110
-msgid ""
-"Foreign modules (e.g. greek or hebrew) do often require a special unicode "
-"font to read them.\n"
-"Many of the fonts are available on www.crosswire.org or on the Sword CD.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:115
-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:119
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:123
-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:128
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:132
-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/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr "Pulisci la coda di stampa"
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr "Apri la finestra di stampa"
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr "Chiudi BibleTime"
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr "Cerca nei moduli"
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr "Rimuovi gli elementi selezionati"
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr "Mostra indice principale"
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr "Mostra barra degli strumenti"
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr "Mostra numeri di Strong"
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr "Affianca finestre"
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr "Affianca finestre automaticamente"
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr "Sovrapponi finestre"
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr "Sovrapponi finestre automaticamente"
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr "Chiudi tutte le finestre"
-
-#: bibletime/dummy.h:37 bibletime/dummy.h:227 bibletime/tooltipdef.h:37
-#: bibletime/whatsthisdef.h:46
-msgid "Save current profile"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-#, fuzzy
-msgid "Edit profiles"
-msgstr "Modifica voce..."
-
-#: bibletime/dummy.h:39 bibletime/dummy.h:229 bibletime/tooltipdef.h:39
-#: bibletime/whatsthisdef.h:48
-#, fuzzy
-msgid "Load a new profile"
-msgstr "Crea una nuova cartella"
-
-#: bibletime/dummy.h:40 bibletime/dummy.h:230 bibletime/tooltipdef.h:40
-#: bibletime/whatsthisdef.h:49
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Modulo corrente:"
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Edit toolbar"
-msgstr "Modifica barra degli strumenti"
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "BibleTime's handbook"
-msgstr "Manuale di Bibletime"
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "BibleTime's installation documentation"
-msgstr ""
-
-#: bibletime/dummy.h:47 bibletime/tooltipdef.h:47
-#, fuzzy
-msgid "BibleTime's Bible study HowTo"
-msgstr "Bible study HowTo"
-
-#: bibletime/dummy.h:48 bibletime/tooltipdef.h:48
-msgid "Enter \"What's this?\" mode"
-msgstr "Modalità \"Cos'è questo?\""
-
-#: bibletime/dummy.h:49 bibletime/tooltipdef.h:49
-msgid "Send bugreport"
-msgstr "Invia bug report"
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-#, fuzzy
-msgid "Show daily tips at startup"
-msgstr "Mostra suggerimento giornaliero"
-
-#: bibletime/dummy.h:51 bibletime/tooltipdef.h:51
-msgid "About BibleTime"
-msgstr "Informazioni su BibleTime"
-
-#: bibletime/dummy.h:52 bibletime/tooltipdef.h:52
-msgid "About KDE"
-msgstr "Informazioni su KDE"
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "The main index"
-msgstr "L'indice principale"
-
-#: bibletime/dummy.h:62 bibletime/tooltipdef.h:62
-msgid "Add bookmark to printing queue"
-msgstr "Aggiungi segnalibri alla coda di stampa"
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "The working area"
-msgstr "L'area di lavoro"
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Show the next entry"
-msgstr "Mostra la voce successiva"
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Show the previous entry"
-msgstr "Mostra la voce precedente"
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-#, fuzzy
-msgid "Jump to the next verse"
-msgstr "Salta al versetto successivo"
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-#, fuzzy
-msgid "Jump to the previous verse"
-msgstr "Salta al versetto precedente"
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-#, fuzzy
-msgid "Show the next chapter"
-msgstr "Mostra il capitolo successivo"
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-#, fuzzy
-msgid "Show the previous chapter"
-msgstr "Mostra il capitolo precedente"
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-#, fuzzy
-msgid "Show the next book"
-msgstr "Mostra il libro successivo"
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-#, fuzzy
-msgid "Show the previous book"
-msgstr "Mostra il libro precedente"
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of books"
-msgstr "Lista dei libri"
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of chapters"
-msgstr "Lista dei capitoli"
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "List of verses"
-msgstr "Lista dei versetti"
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "List of entries"
-msgstr "Lista delle voci"
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Scroll through the list"
-msgstr "Scorri attraverso la lista"
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Edit this entry"
-msgstr "Modifica questa voce"
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Save this comment"
-msgstr "Salva questo commento"
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Delete this comment"
-msgstr "Cancella questo commento"
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Comment up to"
-msgstr "Commenta fino a"
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set bold"
-msgstr "Imposta grassetto"
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set italic"
-msgstr "Imposta corsivo"
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set underlined"
-msgstr "Imposta sottolineato"
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set font"
-msgstr "Imposta font"
-
-#: bibletime/dummy.h:90 bibletime/tooltipdef.h:90
-msgid "Set the color"
-msgstr "Imposta colore"
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Set the fontsize"
-msgstr "Imposta dimensione del font"
-
-#: bibletime/dummy.h:93 bibletime/tooltipdef.h:93
-msgid "Synchronize with Bible windows"
-msgstr "Sincronizza con le finestre della Bibbia"
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Save as HTML"
-msgstr "Salva come HTML"
-
-#: bibletime/dummy.h:98 bibletime/tooltipdef.h:98
-msgid "Copy to clipboard"
-msgstr "Copia negli appunti"
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-#, fuzzy
-msgid "Choose the modules to search in"
-msgstr "Scegli i moduli per la ricerca"
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "Add the selected module to the list"
-msgstr "Aggiungi il modulo selezionato alla lista"
-
-#: bibletime/dummy.h:103 bibletime/tooltipdef.h:103
-msgid "Remove the selected module from the list"
-msgstr "Rimuovi il modulo selezionato dalla lista"
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "List of modules used for the search"
-msgstr "Lista dei moduli usati nella ricerca"
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-#, fuzzy
-msgid "Search for this text"
-msgstr "Cerca questo testo"
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search multiple words"
-msgstr "Cerca parole multiple"
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Exact match"
-msgstr "Corrispondenza esatta"
-
-#: bibletime/dummy.h:109 bibletime/tooltipdef.h:109
-msgid "Search with GNU regular expressions"
-msgstr "Cerca usando le espressioni regolari GNU"
-
-#: bibletime/dummy.h:110 bibletime/tooltipdef.h:110
-msgid "Search case sensitive"
-msgstr "Cerca con maiuscole/minuscole"
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Last search result"
-msgstr "Risultato dell'ultima ricerca"
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-#, fuzzy
-msgid "Use custom scope"
-msgstr "Usa i propri limiti"
-
-#: bibletime/dummy.h:115 bibletime/tooltipdef.h:115
-msgid "Add a new scope"
-msgstr "Aggiungi un nuovo limite"
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Delete this search scope"
-msgstr "Elimina questo limite di ricerca"
-
-#: bibletime/dummy.h:117 bibletime/dummy.h:307 bibletime/tooltipdef.h:117
-#: bibletime/whatsthisdef.h:126
-msgid "Edit and define your search scopes"
-msgstr "Modifica e definisci i tuoi limiti di ricerca"
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Choose a search scope from the list"
-msgstr "Scegli un limite di ricerca dalla lista"
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Enter your own search scope"
-msgstr "Inserisci il tuo limite di ricerca"
-
-#: bibletime/dummy.h:120 bibletime/tooltipdef.h:120
-msgid "Parsed result"
-msgstr "Risultati analizzati"
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Close this dialog"
-msgstr "Chiudi questa finestra"
-
-#: bibletime/dummy.h:123 bibletime/tooltipdef.h:123
-msgid "Used modules"
-msgstr "Moduli utilizzati"
-
-#: bibletime/dummy.h:124 bibletime/tooltipdef.h:124
-msgid "Items found"
-msgstr "Elementi trovati"
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Preview"
-msgstr "Anteprima"
-
-#: bibletime/dummy.h:127 bibletime/tooltipdef.h:127
-#, fuzzy
-msgid "Graphical Search Analysis"
-msgstr "Analisi grafica"
-
-#: bibletime/dummy.h:131 bibletime/tooltipdef.h:131
-msgid "Show daily tip"
-msgstr "Mostra suggerimento giornaliero"
-
-#: bibletime/dummy.h:132 bibletime/tooltipdef.h:132
-msgid "List of languages"
-msgstr "Lista delle lingue"
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-#, fuzzy
-msgid "Show start-up logo"
-msgstr "Mostra logo iniziale"
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Restore the windows in the workspace on startup"
-msgstr ""
-
-#: bibletime/dummy.h:137 bibletime/tooltipdef.h:137
-msgid "Use cache files for the lexicon entries"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "The default bible used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:139 bibletime/tooltipdef.h:139
-msgid "The default commentary used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "The default lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "The default Hebrew lexicon used in the workspace are"
-msgstr ""
-
-#: bibletime/dummy.h:142 bibletime/tooltipdef.h:142
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:143 bibletime/tooltipdef.h:143
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Set keyboard accelerators"
-msgstr "Imposta le scorciatoie da tastiera"
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "Choose the area of application"
-msgstr "Scegli l'area di applicazione"
-
-#: bibletime/dummy.h:150 bibletime/dummy.h:337 bibletime/tooltipdef.h:150
-#: bibletime/whatsthisdef.h:156
-msgid "Choose a font"
-msgstr "Scegli un font"
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Color of the background"
-msgstr "Colore dello sfondo"
-
-#: bibletime/dummy.h:153 bibletime/tooltipdef.h:153
-msgid "Color of the highlighted verse"
-msgstr "Colore del versetto selezionato"
-
-#: bibletime/dummy.h:155 bibletime/tooltipdef.h:155
-#, fuzzy
-msgid "Keyboard accelerators used by all display windows"
-msgstr "Questo è il colore di sfondo usato nelle finestre di visualizzazione."
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Keyboard accelerators used by Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Keyboard accelerators used by commentary windows"
-msgstr ""
-
-#: bibletime/dummy.h:158 bibletime/tooltipdef.h:158
-msgid "Keyboard accelerators used by lexicon windows"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Start printing"
-msgstr "Avvia stampa"
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-#, fuzzy
-msgid "Preview print job"
-msgstr "Applicazione per l'anteprima:"
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Open help"
-msgstr "Apri la guida"
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "List of print items"
-msgstr "Lista degli elementi stampati"
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Move item up"
-msgstr "Sposta l'elemento in su"
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Move item down"
-msgstr "Sposta l'elemento in giù"
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Delete items"
-msgstr "Elimina elementi"
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "Insert a page break"
-msgstr "Inserisci un salto pagina"
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Page borders"
-msgstr "Bordi della pagina"
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Left border"
-msgstr "Bordo sinistro"
-
-#: bibletime/dummy.h:175 bibletime/tooltipdef.h:175
-msgid "Right border"
-msgstr "Bordo destro"
-
-#: bibletime/dummy.h:176 bibletime/tooltipdef.h:176
-msgid "Upper border"
-msgstr "Bordo superiore"
-
-#: bibletime/dummy.h:177 bibletime/tooltipdef.h:177
-msgid "Lower border"
-msgstr "Bordo inferiore"
-
-#: bibletime/dummy.h:178 bibletime/tooltipdef.h:178
-#, fuzzy
-msgid "List of print styles"
-msgstr "Lista degli elementi stampati"
-
-#: bibletime/dummy.h:179 bibletime/tooltipdef.h:179
-#, fuzzy
-msgid "Delete the selected style"
-msgstr "Elimina gli elementi selezionati."
-
-#: bibletime/dummy.h:180 bibletime/tooltipdef.h:180
-#, fuzzy
-msgid "Edit the selected style"
-msgstr "Elimina gli elementi selezionati."
-
-#: bibletime/dummy.h:181 bibletime/tooltipdef.h:181
-msgid "Create a new printing style"
-msgstr "Crea un nuovo stile di stampa"
-
-#: bibletime/dummy.h:209 bibletime/whatsthisdef.h:28
-#, fuzzy
-msgid ""
-"Clear the print queue of BibleTime. All items will be removed from the list "
-"and the print button will be disabled."
-msgstr ""
-"Pulisci la coda di stampa di BibleTime. Tutti gli elementi saranno rimossi "
-"dalla lista, il pulsante di stampa sarà disabilitato."
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:29
-#, fuzzy
-msgid ""
-"Open the printer dialog of BibleTime.  Here you can edit the print queue and "
-"assign styles to the items."
-msgstr ""
-"Apri la finestra di stampa di BibleTime, dove puoi modificare la coda di "
-"stampa e assegnare stili agli elementi."
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr "Chiudi Bibletime e salva le impostazioni."
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:32
-#, fuzzy
-msgid "Open the search dialog to search for text in one or more modules."
-msgstr "Apri la finestra di ricerca per cercare in uno o più moduli."
-
-#: bibletime/dummy.h:214 bibletime/whatsthisdef.h:33
-#, fuzzy
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder, "
-"the subitems of it will be removed too."
-msgstr ""
-"Rimuovi gli elementi selezionati dall'indice principale.<BR>Se rimuovi una "
-"cartella ne saranno rimossi anche gli elementi contenuti."
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:34
-#, fuzzy
-msgid ""
-"Reset the main index.<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-"Azzera l'indice principale<BR>Tutti i segnalibri e le cartelle saranno "
-"eliminate e le cartelle di default saranno ripristinate."
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:36
-#, fuzzy
-msgid "Toggle the main index view."
-msgstr "L'indice principale"
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:37
-msgid "Toggle the main toolbar view."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:38
-msgid "Toggle footnotes in the modules."
-msgstr ""
-
-#: bibletime/dummy.h:220 bibletime/whatsthisdef.h:39
-#, fuzzy
-msgid "Toggle Strong's numbers in the modules."
-msgstr ""
-"Mostra o nascondi i numeri di Strong nei moduli a seconda dello stato "
-"corrente."
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:41
-#, fuzzy
-msgid "Tile the open display windows."
-msgstr "Chiudi tutte le finestre aperte."
-
-#: bibletime/dummy.h:223 bibletime/whatsthisdef.h:42
-#, fuzzy
-msgid "Automatically tile the display windows."
-msgstr "Affianca finestre automaticamente"
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:43
-#, fuzzy
-msgid "Cascade the open display windows."
-msgstr "Chiudi tutte le finestre aperte."
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:44
-#, fuzzy
-msgid "Automatically cascade the opened display windows."
-msgstr "Sovrapponi finestre automaticamente"
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr "Chiudi tutte le finestre aperte."
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:47
-#, fuzzy
-msgid "Edit profiles..."
-msgstr "Modifica voce..."
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:52
-msgid "Open the BibleTime tool bar editor."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:53
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-"Apre la finestra delle opzioni di BibleTime dove puoi impostare la maggior "
-"parte delle preferenze."
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:55
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr "Apre la guida in linea di KDE con il manuale di BibleTime."
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:56
-msgid ""
-"Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The "
-"installation instructions explain how to set up BibleTime and the text "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:57
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with the Bible study HowTo included with BibleTime."
-"<BR>This HowTo is an introduction how to study the Bible in an efficient way."
-msgstr "Apre la guida in linea di KDE con il manuale di BibleTime."
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:58
-#, fuzzy
-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 ""
-"Commuta alla modalità <B>\"Cos'è questo?\"</B>.<BR>Tutti gli elementi "
-"importanti della GUI di BibleTime hanno un aiuto \"Cos'è questo?\"."
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:59
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr "Invia un bug report agli sviluppatori di BibleTime!"
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:60
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-"Mostra un suggerimento giornaliero.<BR>I suggerimenti contengono importanti "
-"citazioni bibliche e consigli utili per l'uso di BibleTime."
-
-#: bibletime/dummy.h:242 bibletime/whatsthisdef.h:61
-msgid "Show detailed information about BibleTime."
-msgstr "Mostra informazioni dettagliate su BibleTime."
-
-#: bibletime/dummy.h:243 bibletime/whatsthisdef.h:62
-#, fuzzy
-msgid "Show the \"about\" dialog of KDE 2."
-msgstr "Mostra la finestra informativa generale di KDE 2."
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:66
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-"Questo è l'indice principale di BibleTime.<BR>Usalo per gestire i moduli "
-"installati, per lavorare con i segnalibri, per aprire finestre ecc..."
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:67
-#, fuzzy
-msgid ""
-"Create a new folder in the main index.<BR>If you press the right mouse "
-"button on a folder, the new folder will become a sub-folder of it."
-"<BR>Otherwise you will create a toplevel folder."
-msgstr ""
-"Crea una nuova cartella nell'indice principale.<BR>Se premi il tasto destro "
-"del mouse su una cartella la nuova cartella sarà una sotto-cartella di "
-"questa.<BR>Altrimenti creerai una cartella al livello principale."
-
-#: bibletime/dummy.h:249 bibletime/whatsthisdef.h:68
-msgid "Change the properties of the selected folder."
-msgstr "Modifica le proprietà della cartella selezionata."
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:69
-msgid "Change the properties of the selected bookmark."
-msgstr "Modifica le proprietà del segnalibro selezionato."
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:70
-#, fuzzy
-msgid "Import bookmarks from a file."
-msgstr "Importa i segnalibri da un file."
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:71
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-"Esporta i segnalibri in un file così che altri<BR>utenti possano importarli "
-"successivamente."
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:72
-#, fuzzy
-msgid ""
-"Use this to add this bookmark to BibleTime's print queue. The key, the "
-"description, and the text of the key will be used for printing."
-msgstr ""
-"Usa questo per aggiungere questo segnalibro alla coda di stampa di "
-"bibleTime. La chiave, la descrizione e il testo della chiave saranno usati "
-"per la stampa."
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:73
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr "Apre un piccola finestra dove potete sbloccare il modulo selezionato."
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:74
-msgid "Open a dialog to show information about the selected module."
-msgstr "Apre una finestra per mostrare informazioni sul modulo selezionato."
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:77
-#, fuzzy
-msgid ""
-"This area is the main workspace of Bibletime.<BR>All display windows are "
-"opened in this window."
-msgstr ""
-"Il contenuto di quest'area è il posto di lavoro di BibleTime.<BR>Tutte le "
-"finestre di visualizzazione sono aperte in questo posto."
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:79
-#, fuzzy
-msgid "The next entry of the module will be shown."
-msgstr "Sarà mostrata la voce successiva di questo modulo."
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:80
-msgid "The previous entry of the module will be shown."
-msgstr "Sarà mostrata la voce precedente di questo modulo."
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:81
-#, fuzzy
-msgid ""
-"For Bible texts, the next verse will be highlighted.<BR>In commentaries, the "
-"next entry will be shown."
-msgstr ""
-"Se visualizzi il testo di una Bibbia il versetto successivo sarà evidenziato."
-"<BR>Se stai leggendo un commentario la voce successiva sarà visualizzata."
-
-#: bibletime/dummy.h:263 bibletime/whatsthisdef.h:82
-#, fuzzy
-msgid ""
-"For Bible texts, the previous verse will be highlighted. In commentaries,  "
-"the previous entry will be shown."
-msgstr ""
-"Se visualizzi il testo di una Bibbia il versetto precedente sarà "
-"evidenziato. Se stai leggendo un commentario la voce precedente sarà "
-"visualizzata."
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:83
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-"Mostra il capitolo successivo del modulo. Il versetto sarà posto a \"1\""
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:84
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-"Mostra il capitolo precedente del modulo. Il versetto sarà posto a \"1\""
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:85
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-"Mostra il libro successivo del modulo. Il capitolo e il versetto saranno "
-"posti a \"1\"."
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:86
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-"Mostra il libro precedente del modulo. Il capitolo e il versetto saranno "
-"posti a \"1\"."
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:87
-#, fuzzy
-msgid "This list contains the books which are available in this module."
-msgstr "Questa lista contiene i libri disponibili in questo modulo."
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:88
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr "Questa lista contiente i capitoli disponibili nel libro corrente."
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:89
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr "Questa lista contiente i versetti disponibili nel capitolo corrente."
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:90
-msgid "This list contains the entries of the current module."
-msgstr "Questa lista contiente le voci del modulo corrente."
-
-#: bibletime/dummy.h:272 bibletime/whatsthisdef.h:91
-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 ""
-"Questo bottone è utile per scorrere attraverso le voci della lista. Premi il "
-"bottone e muovi il mouse per aumentare o decrementare l'elemento."
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:92
-#, fuzzy
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-"Commuta tra i modi lettura/scrittura e solo lettura dei moduli scrivibili."
-
-#: bibletime/dummy.h:274 bibletime/whatsthisdef.h:93
-#, fuzzy
-msgid "Save new personal comments."
-msgstr "Salva i commenti personali."
-
-#: bibletime/dummy.h:275 bibletime/whatsthisdef.h:94
-msgid "Clear the text and delete the entry from the module."
-msgstr "Pulisci il testo ed elimina la voce dal modulo."
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:95
-#, fuzzy
-msgid "Toggle bold formatting of the selected text."
-msgstr ""
-"Commuta tra la formattazione in grassetto e in non-grassetto del testo "
-"selezionato."
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:96
-#, fuzzy
-msgid "Toggle italic formatting of the selected text."
-msgstr ""
-"Commuta tra la formattazione in corsivo e in non-corsivo del testo "
-"selezionato."
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:97
-#, fuzzy
-msgid "Toggle underlined formatting of the selected text."
-msgstr ""
-"Commuta tra la formattazione in sottolineato e in non-sottolineato del testo "
-"selezionato."
-
-#: bibletime/dummy.h:279 bibletime/whatsthisdef.h:98
-msgid "Choose a new font for the selected text."
-msgstr "Scegli un nuovo font per il testo selezionato."
-
-#: bibletime/dummy.h:280 bibletime/whatsthisdef.h:99
-msgid "Choose a new color for the selected text."
-msgstr "Scegli un nuovo colore per il testo selezionato."
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:100
-msgid "Choose a new fontsize for the selected text."
-msgstr "Scegli una nuova dimensione del font per il testo selezionato."
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:102
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-"Sincronizza i versetti visualizzati di questo modulo con la finestra della "
-"Bibbia attiva."
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:105
-#, fuzzy
-msgid "Save the displayed chapter as an HTML file."
-msgstr "Salva il capitolo visualizzato come file HTML."
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:106
-msgid "Select all text."
-msgstr "Seleziona tutto il testo."
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:107
-msgid "Copy the displayed text to the clipboard."
-msgstr "Copia il testo visualizzato negl appunti."
-
-#: bibletime/dummy.h:291 bibletime/whatsthisdef.h:110
-#, fuzzy
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two buttons "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-"Scegli i moduli che saranno usati per la ricerca.<BR>Usa i due bottoni sul "
-"lato desto per aggiungere o eliminare moduli dalla lista di quelli "
-"utilizzati."
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:111
-#, fuzzy
-msgid "Add the selected module to the list on the right."
-msgstr "Aggiungi i moduli selezionati alla lista sulla sinistra."
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:112
-#, fuzzy
-msgid "Remove the selected module from the list on the right side."
-msgstr "Rimuovi i moduli selezionati dalla lista sulla sinistra."
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:113
-msgid "The list of modules used for the search."
-msgstr "La lista dei moduli usati per la ricerca."
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:115
-#, fuzzy
-msgid ""
-"The text entered in this edit box will be searched for in all selected "
-"modules."
-msgstr "Il testo inserito in questa casella sarà cercato in tutti i moduli."
-
-#: bibletime/dummy.h:297 bibletime/whatsthisdef.h:116
-#, fuzzy
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit box above "
-"is searched as a single word."
-msgstr ""
-"Seleziona questo per ricercare parole multiple.<BR>Ogni parola verrà "
-"ricercata come singola."
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:117
-#, fuzzy
-msgid ""
-"Select this to search for exactly the same text you entered in the edit box."
-msgstr ""
-"Seleziona questo per ricercare esattamente lo stesso testo presente nella "
-"riga di inserimento."
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:118
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-"Seleziona questo per cercare usando le espressioni regolari standard GNU."
-"<BR>Leggi il manuale per una spiegazione su come usarle."
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:119
-#, fuzzy
-msgid "Activate this to use a case sensitive search."
-msgstr ""
-"Attiva questo per effettuare una ricerca che distingua maiuscole e minuscole."
-
-#: bibletime/dummy.h:302 bibletime/whatsthisdef.h:121
-#, fuzzy
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr "Seleziona questo se vuoi cercare in tutte le parti del modulo(i)."
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:122
-#, fuzzy
-msgid ""
-"Select this if you want to use the last search result as the search scope."
-msgstr ""
-"Seleziona questo se vuoi usare il risultato dell'ultima ricerca come limite "
-"di ricerca."
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:123
-msgid "Create a new search scope."
-msgstr "Crea un nuovo limite di ricerca."
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:124
-#, fuzzy
-msgid ""
-"Use a custom scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-"Usa un proprio limite per la ricerca.<BR>Esiste un set standard di limiti di "
-"ricerca."
-
-#: bibletime/dummy.h:306 bibletime/whatsthisdef.h:125
-msgid "Use this button to delete the chosen search scope."
-msgstr "Usa questo bottone per eliminare il limite scelto."
-
-#: bibletime/dummy.h:308 bibletime/whatsthisdef.h:127
-msgid "Choose a search scope from the combo box"
-msgstr "Scegli un limite di ricerca dal combo box."
-
-#: bibletime/dummy.h:309 bibletime/whatsthisdef.h:128
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-"Inserisci i tuoi limiti di ricerca.<BR>Per definire un intervallo usa \"-"
-"\" (p.es. Genesi-Esodo),<BR>per separare intervalli o chiavi differenti usa "
-"il punto e virgola (p.es. Genesi;Matteo)."
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:129
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-"Questa lista contiene il risultato analizzato dei limiti impostati. Questo "
-"risultato sarà usato per la ricerca."
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:130
-msgid "Close this dialog and save the changes."
-msgstr "Chiudi questa finestra e salva i cambiamenti."
-
-#: bibletime/dummy.h:313 bibletime/whatsthisdef.h:132
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-"Lista dei moduli usati per la ricerca.<BR>Clicca su un modulo per vedere i "
-"risultati della ricerca sulla destra."
-
-#: bibletime/dummy.h:314 bibletime/whatsthisdef.h:133
-msgid "This contains the items found in the selected module."
-msgstr "Questo contiene gli oggetti trovati nel modulo selezionato."
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:134
-msgid "This text box shows a preview of the chosen item."
-msgstr ""
-"Questo finestra di testo mostra un'anteprima dell'elemento selezionato."
-
-#: bibletime/dummy.h:317 bibletime/whatsthisdef.h:136
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-"Analisi grafica dei risultati della ricerca.<BR>La barra mostra il numero di "
-"elementi trovati in ciascun libro della Bibbia o del commentario."
-
-#: bibletime/dummy.h:320 bibletime/whatsthisdef.h:139
-msgid "Activate this box to see a daily tip on startup."
-msgstr ""
-"Attiva questa casella per vedere un suggerimento giornaliero all'avvio."
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:140
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-"Contiene le lingue che possono essere usate per i nomi internazionali dei "
-"libri."
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:141
-#, fuzzy
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr ""
-"Attiva questa casella per vedere un suggerimento giornaliero all'avvio."
-
-#: bibletime/dummy.h:323 bibletime/whatsthisdef.h:142
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr ""
-
-#: bibletime/dummy.h:324 bibletime/whatsthisdef.h:143
-msgid ""
-"Save the windows in the workspace if BibleTime is closed<BR>and restore them "
-"on the next startup. "
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:145
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This will speed up opening the lexicons a lot, but consume some disk space. "
-"Recommended."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:146
-msgid "The default Bible is used when a hyperlink into a Bible was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:147
-msgid ""
-"The default commentary is used when a hyperlink into a commentary was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:329 bibletime/whatsthisdef.h:148
-msgid "The default lexicon is used when a hyperlink into a lexicon was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:149
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon "
-"was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:150
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon was "
-"clicked"
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:151
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:152
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:154
-#, fuzzy
-msgid "Select an action and change the key binding for the action."
-msgstr "Seleziona un'azione e cambia la combinazione di tasti per questa."
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:155
-#, fuzzy
-msgid ""
-"Use this box to select how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-"Seleziona in questa casella come il font è usato e modifica il font nel "
-"selettore dei font."
-
-#: bibletime/dummy.h:339 bibletime/whatsthisdef.h:158
-msgid "This is the background color used in display windows."
-msgstr "Questo è il colore di sfondo usato nelle finestre di visualizzazione."
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:159
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr ""
-"Questo è il colore dei versetti evidenziati, usato nelle finestre di "
-"visualizzazione."
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:161
-#, fuzzy
-msgid "Set the keyboard accelerators used in all display windows"
-msgstr "Questo è il colore di sfondo usato nelle finestre di visualizzazione."
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:162
-#, fuzzy
-msgid "Set keyboard accelerators used in Bible windows"
-msgstr "Imposta le scorciatoie da tastiera"
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:163
-#, fuzzy
-msgid "Set the keyboard accelerators used in commentary windows"
-msgstr "Imposta le scorciatoie da tastiera"
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:164
-#, fuzzy
-msgid "Set the keyboard accelerators used in lexicon windows"
-msgstr "Imposta le scorciatoie da tastiera"
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:168
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-"Avvia il processo di stampa.<BR>Gli elementi della lista saranno stampati "
-"usando gli stili assegnati."
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:169
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-"Stampa in un file temporaneo e apre un visualizzatore postscript per "
-"un'anteprima dei risultati di stampa."
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:170
-#, fuzzy
-msgid "Closes this dialog without doing anything else."
-msgstr ""
-"Chiude questa finestra senza fare nulla con gli elementi o la stampante."
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:171
-msgid "Open the online help of BibleTime."
-msgstr "Apre la guida in linea di BibleTime."
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:173
-#, fuzzy
-msgid "This combo box contains the available print styles."
-msgstr "Questa casella contiene gli stili di stampa disponibili."
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:174
-msgid "This is the list which contains the available print items."
-msgstr "Questa è la lista che contiene gli elementi di stampa disponibili."
-
-#: bibletime/dummy.h:356 bibletime/whatsthisdef.h:175
-#, fuzzy
-msgid "Move the selected item up one item."
-msgstr "Muove l'elemento selezionato in giù di una posizione."
-
-#: bibletime/dummy.h:357 bibletime/whatsthisdef.h:176
-#, fuzzy
-msgid "Move the selected item down one item."
-msgstr "Muove l'elemento selezionato in su di una posizione."
-
-#: bibletime/dummy.h:358 bibletime/whatsthisdef.h:177
-msgid "Delete the selected items."
-msgstr "Elimina gli elementi selezionati."
-
-#: bibletime/dummy.h:359 bibletime/whatsthisdef.h:178
-#, fuzzy
-msgid ""
-"Inserts a page break into the list.<BR>The printer will start a new page."
-msgstr ""
-"Inserisce un salto pagina nella lista.<BR>La stampante inizierà su una nuova "
-"pagina."
-
-#: bibletime/dummy.h:361 bibletime/whatsthisdef.h:180
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr "Questo gruppo contiene i bordi della pagina misurati in millimetri."
-
-#: bibletime/dummy.h:362 bibletime/whatsthisdef.h:181
-#, fuzzy
-msgid "The size of the border on the left side of the paper."
-msgstr "La dimensione del bordo sul lato sinistro del foglio di carta."
-
-#: bibletime/dummy.h:363 bibletime/whatsthisdef.h:182
-#, fuzzy
-msgid "The size of the border on the right side of the paper."
-msgstr "La dimensione del bordo sul lato destro del foglio di carta."
-
-#: bibletime/dummy.h:364 bibletime/whatsthisdef.h:183
-#, fuzzy
-msgid "The size of the border on the top of the paper."
-msgstr "La dimensione del bordo sul lato superiore del foglio di carta."
-
-#: bibletime/dummy.h:365 bibletime/whatsthisdef.h:184
-#, fuzzy
-msgid "The size of the border on the bottom of the paper."
-msgstr "La dimensione del bordo sul lato inferiore del foglio di carta."
-
-#: bibletime/dummy.h:366 bibletime/whatsthisdef.h:185
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-"Questa lista contiene gli stili di stampa disponibili.<BR>Crea il tuo stile "
-"usando il bottone \"Nuovo stile\"."
-
-#: bibletime/dummy.h:367 bibletime/whatsthisdef.h:186
-msgid "Remove the selected printing style from the list."
-msgstr "Rimuovi lo stile di stampa selezionato dalla lista."
-
-#: bibletime/dummy.h:368 bibletime/whatsthisdef.h:187
-msgid "Change the properties of the selected printing style."
-msgstr "Cambia le proprietà dello stile di stampa selezionato."
-
-#: bibletime/dummy.h:369 bibletime/whatsthisdef.h:188
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr ""
-"Crea un nuovo stile di stampa.<BR>Il nuovo stile sarà aggiunto alla lista."
-
-#, fuzzy
-#~ msgid "Save verse with text as ..."
-#~ msgstr "Salva versetto con testo come..."
-
-#~ msgid "The bible window"
-#~ msgstr "La finestra della Bibbia"
-
-#~ msgid "The commentary window"
-#~ msgstr "La finestra del commentario"
-
-#~ msgid "The lexicon window"
-#~ msgstr "La finestra del lessico"
-
-#~ msgid "The list of printers"
-#~ msgstr "Lista delle stampanti"
-
-#, fuzzy
-#~ msgid "Print to a file"
-#~ msgstr "Stampa su file"
-
-#~ msgid "Browse for the file"
-#~ msgstr "Cerca il file"
-
-#, fuzzy
-#~ msgid "Number of copies"
-#~ msgstr "&Numero di copie"
-
-#~ msgid "Paper type"
-#~ msgstr "Tipo di carta"
-
-#~ msgid "Paper size"
-#~ msgstr "Dimensioni della carta"
-
-#~ msgid "This is the Bible display window"
-#~ msgstr "Questa è la finestra di visualizzazione della Bibbia."
-
-#~ msgid "This is the commentary display window."
-#~ msgstr "Questa è la finestra di visualizzazione del commentario."
-
-#~ msgid "This is the lexicon display window."
-#~ msgstr "Questa è la finestra di visualizzazione del lessico."
-
-#~ msgid ""
-#~ "This is the list of available printers of your system.<BR>Please select "
-#~ "the printer you want to use for printing."
-#~ msgstr ""
-#~ "Questa è la lista delle stampanti disponibili sul vostro sistema.<BR>Per "
-#~ "favore, seleziona la la stampante che vuoi usare per la stampa."
-
-#, fuzzy
-#~ msgid "Print to a postscript file on disk."
-#~ msgstr "Stampa in un file postscript su disco."
-
-#, fuzzy
-#~ msgid "Browse for the file you want to print to."
-#~ msgstr "Cerca il file in cui vuoi stampare."
-
-#, fuzzy
-#~ msgid "The number of copies for printing."
-#~ msgstr "Il numero di copie usate per la stampa."
-
-#, fuzzy
-#~ msgid "Choose the orientation of the paper."
-#~ msgstr "Scegli l'orientamento della carta usata."
-
-#, fuzzy
-#~ msgid "Print on the paper using \"Portrait\" orientation."
-#~ msgstr "Stampa su carta con orientamento verticale."
-
-#, fuzzy
-#~ msgid "Print on the paper using \"Landscape\" orientation."
-#~ msgstr "Stampa su carta con orientamento orizzontale."
-
-#~ msgid "The type of the paper which is used for printing."
-#~ msgstr "Il tipo di carta usato per la stampa."
-
-#, fuzzy
-#~ msgid "The size of the paper used."
-#~ msgstr "Le dimensioni della carta usata."
-
-#~ msgid "Search result for \"%1\" in module \"%2\"\n"
-#~ msgstr "Risultati della ricerca per \"%1\" nel modulo \"%2\"\n"
-
-#~ msgid "Printdialog"
-#~ msgstr "Finestra di stampa"
-
-#~ msgid "The general options for printing"
-#~ msgstr "Opzioni generali di stampa"
-
-#~ msgid "Available printers:"
-#~ msgstr "Stampanti disponibili:"
-
-#~ msgid "Host"
-#~ msgstr "Host"
-
-#~ msgid "Comment"
-#~ msgstr "Commento"
-
-#~ msgid "Print to file:"
-#~ msgstr "Stampa su file:"
-
-#~ msgid "&Number of copies"
-#~ msgstr "&Numero di copie"
-
-#~ msgid "Por&trait"
-#~ msgstr "Ver&ticale"
-
-#~ msgid "L&andscape"
-#~ msgstr "Orizzont&ale"
-
-#~ msgid "Paper t&ype"
-#~ msgstr "Tipo di car&ta"
-
-#~ msgid "Size: 8888mm x 8888mm"
-#~ msgstr "Dimensioni: 8888mm x 8888mm"
-
-#~ msgid "Preview application:"
-#~ msgstr "Applicazione per l'anteprima:"
-
-#~ msgid "*.ps | Postscript files"
-#~ msgstr "*.ps | file Postscript"
-
-#~ msgid "A4"
-#~ msgstr "A4"
-
-#~ msgid "A5"
-#~ msgstr "A5"
-
-#~ msgid "Letter"
-#~ msgstr "Lettera"
-
-#~ msgid "Legal"
-#~ msgstr "Legale"
-
-#~ msgid "Executive"
-#~ msgstr "Executive"
-
-#~ msgid "Layout specific settings"
-#~ msgstr "Opzioni specifiche di impaginazione"
-
-#~ msgid "Entries"
-#~ msgstr "Voci"
-
-#~ msgid "Management of BibleTime's printing queue"
-#~ msgstr "Gestione della coda di stampa di BibleTime"
-
-#~ msgid "Size: %1mm x %2mm"
-#~ msgstr "Dimensioni: %1mm x %2mm"
-
-#~ msgid "Useful tips for BibleTime"
-#~ msgstr "Consigli utili per BibleTime"
-
-#~ msgid "Run on startup"
-#~ msgstr "Esegui all'avvio"
-
-#, fuzzy
-#~ msgid "Language:"
-#~ msgstr "Lista delle lingue"
-
-#, fuzzy
-#~ msgid "Foonotes:"
-#~ msgstr "note a piè di pagina"
-
-#~ msgid "Strong's numbers: %1<BR>"
-#~ msgstr "Numero di strong: %1<BR>"
-
-#, fuzzy
-#~ msgid "Unlock key:"
-#~ msgstr "Chiave di sblocco"
-
-#, fuzzy
-#~ msgid "Version:"
-#~ msgstr "Versione"
-
-#, fuzzy
-#~ msgid "Not necessary"
-#~ msgstr "<I>Non necessario!</I>"
-
-#~ msgid "Datapath"
-#~ msgstr "Percorso dati"
-
-#~ msgid ""
-#~ "<qt><B>The file does already exist!</B><BR>Do you want to overwrite it?</"
-#~ "qt>"
-#~ msgstr "<qt><B>Il file esiste già!</B><BR>Vuoi sovrascriverlo?</qt>"
-
-#~ msgid "BibleTime - Save file as ..."
-#~ msgstr "BibleTime - Salva file come..."
-
-#~ msgid "Printing %1"
-#~ msgstr "Stampo %1"
-
-#, fuzzy
-#~ msgid "Startup options"
-#~ msgstr "Avvia stampa"
-
-#, fuzzy
-#~ msgid "SWORD options"
-#~ msgstr "Avvia stampa"
-
-#, fuzzy
-#~ msgid "Configure BibleTime's key bindings"
-#~ msgstr "Configura le combinazioni di tasti di BibleTime"
-
-#, fuzzy
-#~ msgid "Display windows"
-#~ msgstr "Mostra finestra"
-
-#, fuzzy
-#~ msgid "General settings for display windows"
-#~ msgstr "Chiudi tutte le finestre aperte."
-
-#, fuzzy
-#~ msgid "Colors used in display windows"
-#~ msgstr "Chiudi tutte le finestre aperte."
-
-#~ msgid "Choose fonts for BibleTime"
-#~ msgstr "Scegli i font di BibleTime"
-
-#~ msgid "Choose the area of application and set the font for it"
-#~ msgstr "Scegli l'area di applicazione e imposta il font relativo"
-
-#, fuzzy
-#~ msgid "Accelerators used by all windows"
-#~ msgstr "Chiudi tutte le finestre"
-
-#, fuzzy
-#~ msgid "Accelerators for bible windows"
-#~ msgstr "La finestra della Bibbia"
-
-#, fuzzy
-#~ msgid "Accelerators for commentary windows"
-#~ msgstr "La finestra del commentario"
-
-#, fuzzy
-#~ msgid "Accelerators for lexicon windows"
-#~ msgstr "La finestra del lessico"
-
-#, fuzzy
-#~ msgid "Initializing keyboard accelerators"
-#~ msgstr "Imposta le scorciatoie da tastiera"
-
-#~ msgid "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-#~ msgstr "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-
-#~ msgid "Display window"
-#~ msgstr "Mostra finestra"
-
-#, fuzzy
-#~ msgid "Display window Unicode"
-#~ msgstr "Mostra finestra"
-
-#, fuzzy
-#~ msgid ""
-#~ "* | Text files\n"
-#~ " *.* | All files (*.*)"
-#~ msgstr ""
-#~ "*.txt | File di testo\n"
-#~ " *.* | Tutti i file (*.*)"
-
-#~ msgid "Show a daily tip"
-#~ msgstr "Mostra un suggerimento giornaliero"
-
-#~ msgid "List of modules"
-#~ msgstr "Lista dei moduli"
-
-#~ msgid "Show a preview"
-#~ msgstr "Mostra anteprima"
-
-#~ msgid "Copies"
-#~ msgstr "Copie"
-
-#~ msgid "List of styles"
-#~ msgstr "Lista degli stili"
-
-#~ msgid "Delete the chosen printing style"
-#~ msgstr "Elimina lo stile di stampa scelto"
-
-#~ msgid "Edit the chosen printing style"
-#~ msgstr "Modifica lo stile di stampa scelto"
-
-#~ msgid "Show or hide the main index depending on current state."
-#~ msgstr ""
-#~ "Mostra o nascondi l'indice principale a seconda dello stato corrente."
-
-#~ msgid "Show or hide the main toolbar depending on current state."
-#~ msgstr ""
-#~ "Mostra o nascondi la barra deli strumenti principale a seconda dello "
-#~ "stato corrente."
-
-#~ msgid ""
-#~ "Show or hide the footnotes in the modules deoending on current state."
-#~ msgstr ""
-#~ "Mostra o nascondi le note a pié di pagina nei moduli a seconda dello "
-#~ "stato corrente."
-
-#~ msgid "Arrange the opened display windows in a tile pattern."
-#~ msgstr "Dispondi le finestre aperte in modo affiancato."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a tile pattern if "
-#~ "it's necessary."
-#~ msgstr ""
-#~ "Le finestre aperte saranno automaticamente disposte in modo affiancato se "
-#~ "necessario."
-
-#~ msgid "Arrange the open display windows in a cascade pattern."
-#~ msgstr "Disponi le finestre aperte in modo sovrapposto."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a cascade pattern "
-#~ "if it's necessary."
-#~ msgstr ""
-#~ "Le finestre aperte saranno automaticamente disposte in modo sovrapposto "
-#~ "se necessario."
-
-#~ msgid "Open a dialog where you can edit the toolbar of BibleTime."
-#~ msgstr ""
-#~ "Apre una finestra dove puoi modificare la barra degli strumenti di "
-#~ "BibleTime."
-
-#~ msgid "Activate this to see a startup logo on each startup of BibleTime."
-#~ msgstr "Attiva questa casella per vedere un logo all'avvio di BibleTime."
-
-#~ msgid "This list contains the modules using foreign fonts."
-#~ msgstr "Questa lista contiene i moduli che usano font stranieri."
-
-#~ msgid "&Show footnotes"
-#~ msgstr "Mo&stra note a pié di pagina."
-
-#~ msgid "S&how Strong's numbers"
-#~ msgstr "Mostra numeri di Strong (&h)"
-
-#~ msgid "handbook"
-#~ msgstr "manuale"
-
-#~ msgid "Martin Luther startup logo"
-#~ msgstr "Logo iniziale di Martin Lutero"
-
-#~ msgid "Sponsor of www.bibletime.de"
-#~ msgstr "Sponsor di www.bibletime.de"
-
-#~ msgid "backend"
-#~ msgstr "backend"
-
-#~ msgid ""
-#~ "Leader of the SWORD project.\n"
-#~ "Lots of help with the SWORD API!"
-#~ msgstr ""
-#~ "Leader del progetto SWORD.\n"
-#~ "Di notevole aiuto con le API di SWORD!"
-
-#~ msgid "Module fonts"
-#~ msgstr "Font dei moduli"
-
-#~ msgid "Configure the fonts used for modules"
-#~ msgstr "Configura i font usati per i moduli"
-
-#~ msgid "Result with text"
-#~ msgstr "Risultati con testo"
-
-#~ msgid "Left"
-#~ msgstr "Sinistra"
-
-#~ msgid "Center"
-#~ msgstr "Centro"
-
-#~ msgid "Right"
-#~ msgstr "Destra"
-
-#~ msgid "&Bottom"
-#~ msgstr "Inferiore (&B)"
-
-#~ msgid "Select all"
-#~ msgstr "Seleziona tutto"
-
-#~ msgid "Configure BibleTime's general options"
-#~ msgstr "Configura le opzioni generali di BibleTime"
-
-#~ msgid ""
-#~ "<DIV align=\"center\"><B>Missing tips!</B></DIV><BR><BR>Your installation "
-#~ "is missing the daily tips.\t\tPlease make sure all files of BibleTime are"
-#~ "\t\tinstalled and that the permissions of $KDEDIR are correct!<BR><BR>\t"
-#~ "\tIf you can't solve this problem please contact the team of BibleTime at"
-#~ "\t\t<A HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-#~ msgstr ""
-#~ "<DIV align=\"center\"><B>Mancano i suggerimenti!</B></DIV><BR><BR>La "
-#~ "vostra installazione non comprende i suggerimenti del giorno.\t\tPer "
-#~ "favore, assicuratevi che tutti i file di BibleTime siano\t\tinstallati e "
-#~ "che i permessi di $KDEDIR siano corretti!<BR><BR>\t\tSe non riuscite a "
-#~ "risolvere questo problema, contattate il team di BibleTime a\t\t<A HREF="
-#~ "\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-
-#~ msgid "Foonotes: %1<BR>"
-#~ msgstr "Note a pié di pagina: %1<BR>"
-
-#~ msgid "BibleTime - Help window"
-#~ msgstr "BibleTime - Finestra di aiuto"
-
-#~ msgid "Translation into Brazilian Portoguese"
-#~ msgstr "Traduzione in portoghese brasiliano"
-
-#~ msgid "<FONT color=\"red\">%1 </FONT><SMALL>(%2)</SMALL><BR><HR>%3"
-#~ msgstr "<FONT color=\"red\">%1 </FONT><SMALL>(%2)</SMALL><BR><HR>%3"
-
-#~ msgid "Print..."
-#~ msgstr "Stampa..."
diff --git a/bibletime-doc/po/nl.gmo b/bibletime-doc/po/nl.gmo
deleted file mode 100644
index 62394ec..0000000
--- a/bibletime-doc/po/nl.gmo
+++ /dev/null
diff --git a/bibletime-doc/po/nl.po b/bibletime-doc/po/nl.po
deleted file mode 100644
index 7318da3..0000000
--- a/bibletime-doc/po/nl.po
+++ /dev/null
@@ -1,2972 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-07 01:40+0200\n"
-"PO-Revision-Date: 2001-05-25 13:04GMT\n"
-"Last-Translator: Joachim Ansorg <jansorg@gmx.de>\n"
-"Language-Team: Deutsch <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.1\n"
-
-#: bibletime/backend/cswordbackend.cpp:313
-#: bibletime/frontend/coptionsdialog.cpp:272
-#, fuzzy
-msgid "Footnotes"
-msgstr "&Toon voetnoten"
-
-#: bibletime/backend/cswordbackend.cpp:315
-#, fuzzy
-msgid "Strong's Numbers"
-msgstr "Toon &Strong nummering"
-
-#: bibletime/backend/cswordbackend.cpp:317
-msgid "Headings"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:319
-msgid "Morphological Tags"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:321
-msgid "Lemmas"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:323
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:325
-msgid "Hebrew Cantillation"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:327
-msgid "Greek Accents"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:329
-msgid "Textual Variants"
-msgstr ""
-
-#: bibletime/main.cpp:110
-#, fuzzy
-msgid "Enable debug messages"
-msgstr "Debug boodschappen aan"
-
-#: bibletime/main.cpp:111
-msgid "Ignore the startup profile saved after the last BibleTime execution."
-msgstr ""
-
-#: bibletime/main.cpp:119
-msgid "Bible study tool for KDE 2"
-msgstr "Bijbelstudie programma voor KDE 2"
-
-#: bibletime/main.cpp:121
-#, fuzzy
-msgid "(c)1999-2002, The BibleTime Team"
-msgstr "(c)1999-2001, Het BibleTime Team"
-
-#: bibletime/main.cpp:122
-#, fuzzy
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-"BibleTime is een makkelijk te gebruiken, maar krachtig bijbelstudie "
-"programma voor KDE 2.\n"
-"\n"
-"We zoeken nieuwe ontwikkelaars, vertalers en schrijvers van het handboek.\n"
-"Als u wilt meedoen, stuur dan een eMail aan info@bibletime.de."
-
-#: bibletime/main.cpp:130
-#, fuzzy
-msgid "Project coordinator"
-msgstr "Project coordinator, frontend, backend"
-
-#: bibletime/main.cpp:131
-#, fuzzy
-msgid "Frontend, backend"
-msgstr "Frontend, backend, allerlei"
-
-#: bibletime/main.cpp:132
-#, fuzzy
-msgid "Searchdialog"
-msgstr "Zoeken"
-
-#: bibletime/main.cpp:138
-msgid "Icons, startlogo, banners"
-msgstr ""
-
-#: bibletime/main.cpp:141
-msgid "Handbook"
-msgstr "Handboek"
-
-#: bibletime/main.cpp:144
-msgid "Translation into Czech"
-msgstr "Vertaling in het Tsjechisch"
-
-#: bibletime/main.cpp:145
-msgid "Translation into Danish"
-msgstr "Vertaling in het Deens"
-
-#: bibletime/main.cpp:146
-msgid "Translation into Dutch"
-msgstr "Vertaling in het Nederlands"
-
-#: bibletime/main.cpp:148
-msgid "Translation into French"
-msgstr "Vertaling in het Frans"
-
-#: bibletime/main.cpp:149
-msgid "Translation into Hungarian"
-msgstr "Vertaling in het Hongaars"
-
-#: bibletime/main.cpp:150 bibletime/main.cpp:151
-msgid "Translation into Italian"
-msgstr "Vertaling in het Italiaans"
-
-#: bibletime/main.cpp:152
-msgid "Translation into Norwegian"
-msgstr "Vertaling in het Noors"
-
-#: bibletime/main.cpp:153
-msgid "Translation into Polish"
-msgstr "Vertaling in het Pools"
-
-#: bibletime/main.cpp:154
-msgid "Translation into Portoguese"
-msgstr "Vertaling in het Portugees"
-
-#: bibletime/main.cpp:155
-#, fuzzy
-msgid "Translation into Russian"
-msgstr "Vertaling in het Hongaars"
-
-#: bibletime/main.cpp:156
-msgid "Translation into Slovak"
-msgstr "Vertaling in het Slowaaks"
-
-#: bibletime/main.cpp:157
-#, fuzzy
-msgid "Translation into Spanish"
-msgstr "Vertaling in het Deens"
-
-#: bibletime/main.cpp:160
-msgid "Bible study HowTo"
-msgstr "Bijbelstudie HowTo"
-
-#: bibletime/main.cpp:185
-msgid "Starting BibleTime"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:59
-msgid "Creating BibleTime's GUI"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:77
-msgid "Initializing menu- and toolbars"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:81
-msgid "Clear printing queue"
-msgstr "Schoon printer wachtrij"
-
-#: bibletime/bibletime_init.cpp:99 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr "Reset hoofdindex"
-
-#: bibletime/bibletime_init.cpp:105
-msgid "Search in module(s)"
-msgstr "Zoek in module(s)"
-
-#: bibletime/bibletime_init.cpp:111
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:297
-msgid "Remove selected item(s)"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/bibletime_init.cpp:122
-msgid "&Show main index"
-msgstr "&Toon hoofd index"
-
-#: bibletime/bibletime_init.cpp:137
-msgid "&Cascade"
-msgstr "&Overlappen"
-
-#: bibletime/bibletime_init.cpp:143
-msgid "&Tile"
-msgstr "&Ordenen"
-
-#: bibletime/bibletime_init.cpp:149
-msgid "&Auto cascade"
-msgstr "&Automatisch overlappen"
-
-#: bibletime/bibletime_init.cpp:155
-msgid "A&uto Tile"
-msgstr "A&utomatisch ordenen"
-
-#: bibletime/bibletime_init.cpp:161
-msgid "&Close all"
-msgstr "&Sluit alle"
-
-#: bibletime/bibletime_init.cpp:167
-msgid "&Save profile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:172
-msgid "&Load profile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:177
-msgid "&Configure profiles"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:183
-msgid "&Fullscreen mode"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:202
-#, fuzzy
-msgid "&Handbook"
-msgstr "Handboek"
-
-#: bibletime/bibletime_init.cpp:208
-msgid "&Installation"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:214
-#, fuzzy
-msgid "&Bible Study Howto"
-msgstr "Bijbelstudie HowTo"
-
-#: bibletime/bibletime_init.cpp:229
-msgid "&Daily tip"
-msgstr "&Dagelijkse tip"
-
-#: bibletime/bibletime_init.cpp:294
-msgid "Initializing Sword"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:341
-msgid "Initializing printing system"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:40
-msgid "style editor"
-msgstr "stijl editor"
-
-#: bibletime/printing/cstyleeditordialog.cpp:63
-msgid "Name of style:"
-msgstr "Naam van de stijl:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose the part of the style:"
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:73
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Header"
-msgstr "Koptekst"
-
-#: bibletime/printing/cstyleeditordialog.cpp:74
-#: bibletime/printing/cstyleeditordialog.cpp:293
-msgid "Description"
-msgstr "Omschrijving"
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-#: bibletime/printing/cstyleeditordialog.cpp:297
-msgid "Module text"
-msgstr "Module tekst"
-
-#: bibletime/printing/cstyleeditordialog.cpp:81
-msgid "Enable this part"
-msgstr "Dit deel aanzetten"
-
-#: bibletime/printing/cstyleeditordialog.cpp:104
-msgid "Foreground:"
-msgstr "Voorgrond:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:115
-msgid "Background:"
-msgstr "Achtergrond:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:126
-msgid "Choose font"
-msgstr "Kies lettertype"
-
-#: bibletime/printing/cstyleeditordialog.cpp:129
-msgid "Font preview"
-msgstr "Lettertype voorbeeld"
-
-#: bibletime/printing/cstyleeditordialog.cpp:143
-msgid "Use frame"
-msgstr "Gebruik frame"
-
-#: bibletime/printing/cstyleeditordialog.cpp:154
-msgid "Line thickness (in point):"
-msgstr "Lijndikte (in punten):"
-
-#: bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr "Frame kleur:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:170
-#, fuzzy
-msgid "Line style:"
-msgstr "Naam van de stijl:"
-
-#: bibletime/frontend/coptionsdialog.cpp:218
-#: bibletime/frontend/coptionsdialog.cpp:735
-#: bibletime/printing/cprintdialogpages.cpp:176
-#: bibletime/printing/cprinter.cpp:307 bibletime/printing/cprinter.cpp:316
-#: bibletime/printing/cstyle.cpp:180
-#: bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr "Standaard"
-
-#: bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr "Naam:"
-
-#: bibletime/printing/cstyle.cpp:181
-msgid "Colored style for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:182
-msgid "Black&White for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:187
-msgid "unknown name"
-msgstr "onbekende naam"
-
-#: bibletime/dummy.h:166 bibletime/printing/cprintdialogpages.cpp:43
-#: bibletime/tooltipdef.h:166
-msgid "Styles"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:48
-msgid "Margins (in millimeter)"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Top"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-#, fuzzy
-msgid "&Left"
-msgstr "Links"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-#, fuzzy
-msgid "&Right"
-msgstr "Rechts"
-
-#: bibletime/printing/cprintdialogpages.cpp:104
-msgid "List of style items:"
-msgstr ""
-
-#: bibletime/printing/cprintdialogpages.cpp:192
-#, fuzzy
-msgid "Print queue"
-msgstr "Printer"
-
-#: bibletime/printing/cprintdialogpages.cpp:203
-#, fuzzy
-msgid "Choose a style"
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/printing/cprintdialogpages.cpp:215
-msgid "Entries which should be printed:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:239
-#: bibletime/printing/cprintitemlist.cpp:44
-#, fuzzy
-msgid "Module"
-msgstr "Module tekst"
-
-#: 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/frontend/chtmldialog.cpp:84
-#, fuzzy
-msgid "Backward"
-msgstr "Achtergrond:"
-
-#: bibletime/frontend/chtmldialog.cpp:102
-msgid "Forward"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:264
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid "Save text as HTML page ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid "Save text as plain text ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:501
-#, fuzzy
-msgid "Choose a font:"
-msgstr "Kies lettertype"
-
-#: bibletime/frontend/chtmlwidget.cpp:505
-#, fuzzy
-msgid "Choose font size"
-msgstr "Kies lettertype"
-
-#: bibletime/frontend/chtmlwidget.cpp:509
-msgid "Bold"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:513
-msgid "Underlined"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:522
-msgid "Justify"
-msgstr ""
-
-#: bibletime/frontend/cprofile.cpp:33
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:178
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:189
-#, fuzzy
-msgid "unknown"
-msgstr "onbekende naam"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:214
-msgid "Bookmark to"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:539
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:241
-msgid "Language"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:549
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:243
-msgid "Unlock key"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-msgid "not set"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:532
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-msgid "Version"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:149
-msgid "Bibles"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:150
-msgid "Books"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:151
-#, fuzzy
-msgid "Commentaries"
-msgstr "Commentaar"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:152
-msgid "Lexicons"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:269
-msgid "Caption"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:277
-#, fuzzy
-msgid "Main index"
-msgstr "&Hoofd index"
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:278
-#: bibletime/tooltipdef.h:57
-msgid "Create a new folder"
-msgstr ""
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:281
-#: bibletime/tooltipdef.h:58
-msgid "Change this folder"
-msgstr ""
-
-#: bibletime/dummy.h:59 bibletime/frontend/groupmanager/cgroupmanager.cpp:285
-#: bibletime/tooltipdef.h:59
-msgid "Change this bookmark"
-msgstr ""
-
-#: bibletime/dummy.h:60 bibletime/frontend/groupmanager/cgroupmanager.cpp:288
-#: bibletime/tooltipdef.h:60
-msgid "Import bookmarks"
-msgstr ""
-
-#: bibletime/dummy.h:61 bibletime/frontend/groupmanager/cgroupmanager.cpp:291
-#: bibletime/tooltipdef.h:61
-msgid "Export bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:294
-msgid "Print bookmark"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-#, fuzzy
-msgid "Search in selected module(s)"
-msgstr "Zoek in module(s)"
-
-#: bibletime/dummy.h:63 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:63
-msgid "Unlock this module"
-msgstr ""
-
-#: bibletime/dummy.h:64 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:64
-msgid "About this module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Please enter here the description:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Change bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Please change the description of the item!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Change folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Please change the name of the group!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:536
-msgid "Location"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:544
-msgid "Writable"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:545
-msgid "yes"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Encoding"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:219
-#: bibletime/frontend/coptionsdialog.cpp:738
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Unicode"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "iso8859-1"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:564
-msgid "Features"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Enter name of folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Please enter the name of the folder!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "BibleTime - Unlock module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "Enter the key to unlock the module!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1148
-msgid "Import bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1156
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1159
-msgid "Import of bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1173
-msgid "Export bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-#, fuzzy
-msgid "BibleTime - Reset main index"
-msgstr "Reset hoofdindex"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:85
-msgid "Lexicon window"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:88
-msgid "Entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:100
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:89
-msgid "Text of entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:106
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:90
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:95
-msgid "Entry with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:100
-#: bibletime/frontend/presenters/cbookpresenter.cpp:98
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:103
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:92
-msgid "Selected text"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:109
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:98
-msgid "Entry as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:106
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:110
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:99
-msgid "Entry as HTML"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:112
-#: bibletime/frontend/presenters/cbookpresenter.cpp:109
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:113
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:102
-msgid "Lookup selected text in lexicon"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:114
-#: bibletime/frontend/presenters/cbookpresenter.cpp:111
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:115
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:104
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:270
-msgid "Copy..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:115
-#: bibletime/frontend/presenters/cbookpresenter.cpp:112
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:116
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:105
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:271
-#, fuzzy
-msgid "Add to printing queue..."
-msgstr "Schoon printer wachtrij"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:116
-#: bibletime/frontend/presenters/cbookpresenter.cpp:113
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:117
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:106
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:272
-msgid "Save..."
-msgstr ""
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:259
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:267
-msgid "Next entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:260
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:270
-msgid "Previous entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:92
-#, fuzzy
-msgid "Bible window"
-msgstr "Toon venster"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:95
-msgid "Verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:96
-msgid "Text of verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:97
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:103
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:107
-msgid "Verse with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:98
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:104
-#, fuzzy
-msgid "Chapter"
-msgstr "Centreer"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:108
-msgid "Chapter as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:109
-msgid "Chapter as HTML"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:327
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:343
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:413
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:432
-msgid "Next book"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:328
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:345
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:414
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:434
-msgid "Previous book"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:330
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:348
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:416
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:437
-#, fuzzy
-msgid "Next chapter"
-msgstr "Centreer"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:331
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:350
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:417
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:439
-msgid "Previous chapter"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:333
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:353
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:419
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:442
-msgid "Next verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:334
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:355
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:420
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:444
-msgid "Previous verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:47
-#, fuzzy
-msgid "Select additional modules"
-msgstr "Zoek in module(s)"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:126
-msgid "NONE"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:70
-#, fuzzy
-msgid "Display options"
-msgstr "Toon venster"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:73
-msgid "Use linebreaks"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:74
-#, fuzzy
-msgid "Show versenumbers"
-msgstr "Toon &Strong nummering"
-
-#: bibletime/frontend/coptionsdialog.cpp:663
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:76
-msgid "Show headings"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/frontend/coptionsdialog.cpp:653
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:78
-#: bibletime/tooltipdef.h:29
-#, fuzzy
-msgid "Show footnotes"
-msgstr "&Toon voetnoten"
-
-#: bibletime/frontend/coptionsdialog.cpp:658
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:80
-#, fuzzy
-msgid "Show Strong's Numbers"
-msgstr "Toon &Strong nummering"
-
-#: bibletime/frontend/coptionsdialog.cpp:668
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:83
-msgid "Show morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:673
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:85
-msgid "Show lemmas"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:678
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:87
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:683
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:89
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:688
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:91
-msgid "Show Greek accents"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:93
-msgid "Use alternative textual variant"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:80
-msgid "Synchronize..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-msgid "Edit entry..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:96
-msgid "Commentary window"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:232
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:392
-msgid "The text was not saved to the module. Save the changes now?"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:422
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:447
-msgid "Toggle synchronize button"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:511
-#, fuzzy
-msgid "Save changes to module?"
-msgstr "Zoek in module(s)"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:68
-msgid "Toggle tree..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:90
-#, fuzzy
-msgid "Book window"
-msgstr "Toon venster"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:200
-#: bibletime/frontend/presenters/cbookpresenter.cpp:208
-msgid "Toggle tree"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-#, fuzzy
-msgid "Modules:"
-msgstr "Module tekst"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:173
-#, fuzzy
-msgid "module not set"
-msgstr "Module tekst"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:53
-msgid "Search properties"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:72
-msgid "Multiple Words"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:80
-#, fuzzy
-msgid "Exact Search"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:87
-msgid "Regular Expression"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:100
-msgid "Case Sensitive"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:104
-#, fuzzy
-msgid "Search scope"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:108
-msgid "Search progress"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:113
-msgid "Current module:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:114
-msgid "Overall:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-#, fuzzy
-msgid "Search Dialog"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Interrupt"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-#, fuzzy
-msgid "Choose modules"
-msgstr "Kies lettertype"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#, fuzzy
-msgid "Choose the modules for the search"
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-#, fuzzy
-msgid "Search Text"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Enter the text to search for"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-#, fuzzy
-msgid "Search Result"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "The result of your search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Graphical analysis of your search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "HTML files"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "Save Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:155
-msgid "BibleTime Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:156
-#, fuzzy
-msgid "Search Text :"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:157
-#, fuzzy
-msgid "Search Type :"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:158
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:161
-msgid "Book"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:162
-msgid "Total Hits"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:186
-msgid "Created by"
-msgstr ""
-
-#: bibletime/dummy.h:112
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:112
-msgid "No scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:223
-#, fuzzy
-msgid "Choose custom range"
-msgstr "Kies lettertype"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:224
-msgid "Define range text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:225
-msgid "Range parsing results"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Range name"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Please enter a name for the new range"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-#, fuzzy
-msgid "Modules"
-msgstr "Module tekst"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-#, fuzzy
-msgid "Search result"
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Search result with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:152
-#, fuzzy
-msgid "Appending keys to the printing queue ..."
-msgstr "Schoon printer wachtrij"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:166
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:195
-msgid "Copying search result to clipboard..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:181
-#, fuzzy
-msgid "Saving the search result ..."
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:209
-#, fuzzy
-msgid "Saving the search result..."
-msgstr "Zoeken"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:260
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:267
-msgid "Key"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:261
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:264
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:268
-msgid "Key with text"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid "Save key ..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid ""
-"Choose the module you want to use for the search. The tree on the left "
-"contains all available modules, the tree on the right the modules for the "
-"search. Use the two arrow buttons to add or remove modules from the right "
-"tree."
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:79
-msgid "The file does already exist!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:80
-msgid "Do you want to overwrite it?"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:96
-msgid "Sorry! But the file couldn't be saved!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:97
-msgid "Please check permissions etc. !"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-msgid "Save search result ..."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:68
-msgid "Optionsdialog"
-msgstr "Optiesdialoog"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#: bibletime/frontend/coptionsdialog.cpp:314
-msgid "Create new profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-msgid "Please enter the name of the new profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Rename profile"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-msgid "Please enter the new name of the profile"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:170
-#, fuzzy
-msgid "Startup"
-msgstr "Maarten Luther opstart logo"
-
-#: bibletime/frontend/coptionsdialog.cpp:174
-msgid "Show tip of the day"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:184
-#, fuzzy
-msgid "Show startuplogo"
-msgstr "Maarten Luther opstart logo"
-
-#: bibletime/frontend/coptionsdialog.cpp:193
-msgid "Restore windows in workspace area"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-#, fuzzy
-msgid "Choose fonts"
-msgstr "Kies lettertype"
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid ""
-"The fonts you can choose here are used in the display windows. Use the drop-"
-"down box below to choose the area of application. Then select a font for it. "
-"Make sure the charset \"iso10646-1\" is available for the selected Unicode "
-"font.!"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:225
-msgid "The quick brown fox jumps over the lazy dog"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:238
-msgid "Colors"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:245
-#, fuzzy
-msgid "Choose colors"
-msgstr "Kies lettertype"
-
-#: bibletime/frontend/coptionsdialog.cpp:246
-msgid ""
-"Choose the colors to change the look of the display windows to your own "
-"preferences. Some options like \"Words of Jesus\" do only apply to texts "
-"which support this special feature."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:252
-msgid "Text"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:257
-#, fuzzy
-msgid "Background"
-msgstr "Achtergrond:"
-
-#: bibletime/frontend/coptionsdialog.cpp:262
-msgid "Highlighted verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:267
-#, fuzzy
-msgid "Hyperlinks"
-msgstr "Schoon printer wachtrij"
-
-#: bibletime/frontend/coptionsdialog.cpp:277
-#, fuzzy
-msgid "Strong's numbers"
-msgstr "Toon &Strong nummering"
-
-#: bibletime/frontend/coptionsdialog.cpp:282
-msgid "Morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:287
-msgid "Words of Jesus"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:297
-#, fuzzy
-msgid "Profiles"
-msgstr "Print naar bestand:"
-
-#: bibletime/frontend/coptionsdialog.cpp:302
-msgid "Manage your profiles"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:303
-msgid ""
-"Profiles define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. Don't forget "
-"that new profiles only work after you've saved something in them."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:318
-#, fuzzy
-msgid "Delete selected profile"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/frontend/coptionsdialog.cpp:322
-#, fuzzy
-msgid "Rename selected profile"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/frontend/coptionsdialog.cpp:340
-msgid "Accelerators"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:345
-msgid "Application wide"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:368
-#, fuzzy
-msgid "Bible windows"
-msgstr "Toon venster"
-
-#: bibletime/frontend/coptionsdialog.cpp:381
-#, fuzzy
-msgid "Commentary windows"
-msgstr "Commentaar"
-
-#: bibletime/frontend/coptionsdialog.cpp:394
-#, fuzzy
-msgid "Lexicon windows"
-msgstr "Toon venster"
-
-#: bibletime/frontend/coptionsdialog.cpp:408
-#, fuzzy
-msgid "Book windows"
-msgstr "Toon venster"
-
-#: bibletime/frontend/coptionsdialog.cpp:422
-msgid "Sword"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:425
-msgid "General"
-msgstr "Algemeen"
-
-#: bibletime/frontend/coptionsdialog.cpp:431
-#: bibletime/frontend/coptionsdialog.cpp:439
-msgid "Use key cache for lexicons"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:432
-msgid ""
-"BibleTime can create a key cache for lexicons, which speeds up opening large "
-"lexicon modules a lot. However these files consume some disk space (usually "
-"not much), and reside in $KDEHOME/share/apps/bibletime/cache."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:447
-msgid "Scrolling behaviour"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:448
-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/dummy.h:134 bibletime/frontend/coptionsdialog.cpp:454
-#: bibletime/tooltipdef.h:134
-msgid "Use down arrow to scroll to next verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:461
-msgid "Specify a language for biblical booknames"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:462
-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 "
-"choose. If you want to create a new locale, see http://www.crosswire.org/"
-"sword/develop for details."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:469
-msgid "Language for booknames"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:477
-msgid "English"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:495
-#: bibletime/frontend/coptionsdialog.cpp:500
-#, fuzzy
-msgid "Default modules"
-msgstr "Zoek in module(s)"
-
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid ""
-"Default modules are used, when no module is specified. This may happen with "
-"references into modules like Bibles or Lexicons."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:505
-msgid "Default Bible"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:513
-#, fuzzy
-msgid "Default Commentary"
-msgstr "Commentaar"
-
-#: bibletime/frontend/coptionsdialog.cpp:522
-msgid "Default Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:530
-msgid "Default Hebrew Strong's Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:538
-msgid "Default Greek Strong's Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:546
-msgid "Default Hebrew Morphological Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:553
-msgid "Default Greek Morphological Lexicon"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:636
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid "Filter settings"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can choose the default settings of the various filter settings. You can "
-"change the settings in each display window, too."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:643
-msgid "Show line break after each verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:648
-#, fuzzy
-msgid "Show verse numbers"
-msgstr "Toon &Strong nummering"
-
-#: bibletime/frontend/coptionsdialog.cpp:693
-msgid "Use textual variants"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:285
-#, fuzzy
-msgid "Printing..."
-msgstr "Afdrukdialoog"
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Abort printing"
-msgstr ""
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr "&Hoofd index"
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:3
-msgid ""
-"This is <B>BibleTime 1.1</B>!<BR>\n"
-"This version of BibleTime should have reached the state where it could\n"
-"be called stable, useful and user friendly!<BR>\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:9
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:13
-msgid ""
-"BibleTime 1.1 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:18
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:22
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:26
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>! \n"
-"It was written by Bob Harman and is a great help how to study the Bible.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:31
-msgid ""
-"The Bible has the power to \"comfort the afflicted\" and \"afflict the "
-"comfortable\". (Revelation 10:10)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:35
-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:39
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:43
-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:48
-msgid "That the Bible is truth. (John 17:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:52
-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:57
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:61
-msgid ""
-"It's possible to insert the text of bookmarks and references to verses or "
-"lexicon entries into the personal commentary editor by dropping them there.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:65
-msgid ""
-"By studying the Bible you will have no reason to stand ashamed before God. "
-"(2 Timothy 2:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:69
-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 optionsdialog.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:76
-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:80
-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:84
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:88
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the regular expression \"x | y | z\" for searching, which is "
-"equivalent to \"x OR y OR z\", e.g. \"pray | worship | supplicate\".\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:92
-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:96
-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:100
-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"
-"Now double click on it and drag the selected word on the foreign module in "
-"the main index.\n"
-"The search dialog will be opened with the word in the edit line.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:106
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:110
-msgid ""
-"Foreign modules (e.g. greek or hebrew) do often require a special unicode "
-"font to read them.\n"
-"Many of the fonts are available on www.crosswire.org or on the Sword CD.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:115
-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:119
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:123
-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:128
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:132
-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/dummy.h:19 bibletime/tooltipdef.h:19
-#, fuzzy
-msgid "Clear the printing queue"
-msgstr "Schoon printer wachtrij"
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-#, fuzzy
-msgid "Open the printerdialog"
-msgstr "Optiesdialoog"
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-#, fuzzy
-msgid "Search in modules"
-msgstr "Zoek in module(s)"
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-#, fuzzy
-msgid "Remove selected items"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-#, fuzzy
-msgid "Show main index"
-msgstr "&Toon hoofd index"
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr ""
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-#, fuzzy
-msgid "Show Strong's numbers"
-msgstr "Toon &Strong nummering"
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-#, fuzzy
-msgid "Tile windows"
-msgstr "Toon venster"
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-#, fuzzy
-msgid "Cascade windows"
-msgstr "Toon venster"
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-#, fuzzy
-msgid "Close all windows"
-msgstr "&Sluit alle"
-
-#: bibletime/dummy.h:37 bibletime/dummy.h:227 bibletime/tooltipdef.h:37
-#: bibletime/whatsthisdef.h:46
-msgid "Save current profile"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-msgid "Edit profiles"
-msgstr ""
-
-#: bibletime/dummy.h:39 bibletime/dummy.h:229 bibletime/tooltipdef.h:39
-#: bibletime/whatsthisdef.h:48
-msgid "Load a new profile"
-msgstr ""
-
-#: bibletime/dummy.h:40 bibletime/dummy.h:230 bibletime/tooltipdef.h:40
-#: bibletime/whatsthisdef.h:49
-msgid "Toggle fullscreen mode"
-msgstr ""
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Edit toolbar"
-msgstr ""
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "BibleTime's handbook"
-msgstr ""
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "BibleTime's installation documentation"
-msgstr ""
-
-#: bibletime/dummy.h:47 bibletime/tooltipdef.h:47
-#, fuzzy
-msgid "BibleTime's Bible study HowTo"
-msgstr "Bijbelstudie HowTo"
-
-#: bibletime/dummy.h:48 bibletime/tooltipdef.h:48
-msgid "Enter \"What's this?\" mode"
-msgstr ""
-
-#: bibletime/dummy.h:49 bibletime/tooltipdef.h:49
-msgid "Send bugreport"
-msgstr ""
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-#, fuzzy
-msgid "Show daily tips at startup"
-msgstr "&Dagelijkse tip"
-
-#: bibletime/dummy.h:51 bibletime/tooltipdef.h:51
-msgid "About BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:52 bibletime/tooltipdef.h:52
-msgid "About KDE"
-msgstr ""
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-#, fuzzy
-msgid "The main index"
-msgstr "Reset hoofdindex"
-
-#: bibletime/dummy.h:62 bibletime/tooltipdef.h:62
-#, fuzzy
-msgid "Add bookmark to printing queue"
-msgstr "Schoon printer wachtrij"
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "The working area"
-msgstr ""
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Show the next entry"
-msgstr ""
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Show the previous entry"
-msgstr ""
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-msgid "Jump to the next verse"
-msgstr ""
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-msgid "Jump to the previous verse"
-msgstr ""
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-#, fuzzy
-msgid "Show the next chapter"
-msgstr "Centreer"
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-#, fuzzy
-msgid "Show the previous chapter"
-msgstr "Lettertype voorbeeld"
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-msgid "Show the next book"
-msgstr ""
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-#, fuzzy
-msgid "Show the previous book"
-msgstr "Lettertype voorbeeld"
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of books"
-msgstr ""
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of chapters"
-msgstr ""
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "List of verses"
-msgstr ""
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "List of entries"
-msgstr ""
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Scroll through the list"
-msgstr ""
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Edit this entry"
-msgstr ""
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Save this comment"
-msgstr ""
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Delete this comment"
-msgstr ""
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-#, fuzzy
-msgid "Comment up to"
-msgstr "Commentaar"
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set bold"
-msgstr ""
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set italic"
-msgstr ""
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set underlined"
-msgstr ""
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-#, fuzzy
-msgid "Set font"
-msgstr "Kies lettertype"
-
-#: bibletime/dummy.h:90 bibletime/tooltipdef.h:90
-msgid "Set the color"
-msgstr ""
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Set the fontsize"
-msgstr ""
-
-#: bibletime/dummy.h:93 bibletime/tooltipdef.h:93
-msgid "Synchronize with Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Save as HTML"
-msgstr ""
-
-#: bibletime/dummy.h:98 bibletime/tooltipdef.h:98
-msgid "Copy to clipboard"
-msgstr ""
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-#, fuzzy
-msgid "Choose the modules to search in"
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "Add the selected module to the list"
-msgstr ""
-
-#: bibletime/dummy.h:103 bibletime/tooltipdef.h:103
-#, fuzzy
-msgid "Remove the selected module from the list"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "List of modules used for the search"
-msgstr ""
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-#, fuzzy
-msgid "Search for this text"
-msgstr "Zoeken"
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-#, fuzzy
-msgid "Search multiple words"
-msgstr "Zoek in module(s)"
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Exact match"
-msgstr ""
-
-#: bibletime/dummy.h:109 bibletime/tooltipdef.h:109
-msgid "Search with GNU regular expressions"
-msgstr ""
-
-#: bibletime/dummy.h:110 bibletime/tooltipdef.h:110
-msgid "Search case sensitive"
-msgstr ""
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Last search result"
-msgstr ""
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-#, fuzzy
-msgid "Use custom scope"
-msgstr "Kies lettertype"
-
-#: bibletime/dummy.h:115 bibletime/tooltipdef.h:115
-msgid "Add a new scope"
-msgstr ""
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Delete this search scope"
-msgstr ""
-
-#: bibletime/dummy.h:117 bibletime/dummy.h:307 bibletime/tooltipdef.h:117
-#: bibletime/whatsthisdef.h:126
-msgid "Edit and define your search scopes"
-msgstr ""
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-#, fuzzy
-msgid "Choose a search scope from the list"
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Enter your own search scope"
-msgstr ""
-
-#: bibletime/dummy.h:120 bibletime/tooltipdef.h:120
-msgid "Parsed result"
-msgstr ""
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-#, fuzzy
-msgid "Close this dialog"
-msgstr "Optiesdialoog"
-
-#: bibletime/dummy.h:123 bibletime/tooltipdef.h:123
-msgid "Used modules"
-msgstr ""
-
-#: bibletime/dummy.h:124 bibletime/tooltipdef.h:124
-msgid "Items found"
-msgstr ""
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Preview"
-msgstr "Afdrukvoorbeeld"
-
-#: bibletime/dummy.h:127 bibletime/tooltipdef.h:127
-msgid "Graphical Search Analysis"
-msgstr ""
-
-#: bibletime/dummy.h:131 bibletime/tooltipdef.h:131
-#, fuzzy
-msgid "Show daily tip"
-msgstr "&Dagelijkse tip"
-
-#: bibletime/dummy.h:132 bibletime/tooltipdef.h:132
-msgid "List of languages"
-msgstr ""
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-#, fuzzy
-msgid "Show start-up logo"
-msgstr "Maarten Luther opstart logo"
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Restore the windows in the workspace on startup"
-msgstr ""
-
-#: bibletime/dummy.h:137 bibletime/tooltipdef.h:137
-msgid "Use cache files for the lexicon entries"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "The default bible used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:139 bibletime/tooltipdef.h:139
-msgid "The default commentary used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "The default lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "The default Hebrew lexicon used in the workspace are"
-msgstr ""
-
-#: bibletime/dummy.h:142 bibletime/tooltipdef.h:142
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:143 bibletime/tooltipdef.h:143
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Set keyboard accelerators"
-msgstr ""
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-#, fuzzy
-msgid "Choose the area of application"
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:150 bibletime/dummy.h:337 bibletime/tooltipdef.h:150
-#: bibletime/whatsthisdef.h:156
-#, fuzzy
-msgid "Choose a font"
-msgstr "Kies lettertype"
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Color of the background"
-msgstr ""
-
-#: bibletime/dummy.h:153 bibletime/tooltipdef.h:153
-msgid "Color of the highlighted verse"
-msgstr ""
-
-#: bibletime/dummy.h:155 bibletime/tooltipdef.h:155
-msgid "Keyboard accelerators used by all display windows"
-msgstr ""
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Keyboard accelerators used by Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Keyboard accelerators used by commentary windows"
-msgstr ""
-
-#: bibletime/dummy.h:158 bibletime/tooltipdef.h:158
-msgid "Keyboard accelerators used by lexicon windows"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-#, fuzzy
-msgid "Start printing"
-msgstr "Schoon printer wachtrij"
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-msgid "Preview print job"
-msgstr ""
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Open help"
-msgstr ""
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "List of print items"
-msgstr ""
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Move item up"
-msgstr ""
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Move item down"
-msgstr ""
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-#, fuzzy
-msgid "Delete items"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "Insert a page break"
-msgstr ""
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Page borders"
-msgstr ""
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Left border"
-msgstr ""
-
-#: bibletime/dummy.h:175 bibletime/tooltipdef.h:175
-msgid "Right border"
-msgstr ""
-
-#: bibletime/dummy.h:176 bibletime/tooltipdef.h:176
-msgid "Upper border"
-msgstr ""
-
-#: bibletime/dummy.h:177 bibletime/tooltipdef.h:177
-msgid "Lower border"
-msgstr ""
-
-#: bibletime/dummy.h:178 bibletime/tooltipdef.h:178
-#, fuzzy
-msgid "List of print styles"
-msgstr "Naam van de stijl:"
-
-#: bibletime/dummy.h:179 bibletime/tooltipdef.h:179
-#, fuzzy
-msgid "Delete the selected style"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:180 bibletime/tooltipdef.h:180
-#, fuzzy
-msgid "Edit the selected style"
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:181 bibletime/tooltipdef.h:181
-msgid "Create a new printing style"
-msgstr ""
-
-#: bibletime/dummy.h:209 bibletime/whatsthisdef.h:28
-msgid ""
-"Clear the print queue of BibleTime. All items will be removed from the list "
-"and the print button will be disabled."
-msgstr ""
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:29
-msgid ""
-"Open the printer dialog of BibleTime.  Here you can edit the print queue and "
-"assign styles to the items."
-msgstr ""
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr ""
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:32
-msgid "Open the search dialog to search for text in one or more modules."
-msgstr ""
-
-#: bibletime/dummy.h:214 bibletime/whatsthisdef.h:33
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder, "
-"the subitems of it will be removed too."
-msgstr ""
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:34
-msgid ""
-"Reset the main index.<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:36
-#, fuzzy
-msgid "Toggle the main index view."
-msgstr "Reset hoofdindex"
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:37
-msgid "Toggle the main toolbar view."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:38
-msgid "Toggle footnotes in the modules."
-msgstr ""
-
-#: bibletime/dummy.h:220 bibletime/whatsthisdef.h:39
-#, fuzzy
-msgid "Toggle Strong's numbers in the modules."
-msgstr "Toon &Strong nummering"
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:41
-#, fuzzy
-msgid "Tile the open display windows."
-msgstr "&Sluit alle"
-
-#: bibletime/dummy.h:223 bibletime/whatsthisdef.h:42
-#, fuzzy
-msgid "Automatically tile the display windows."
-msgstr "&Sluit alle"
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:43
-#, fuzzy
-msgid "Cascade the open display windows."
-msgstr "&Sluit alle"
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:44
-msgid "Automatically cascade the opened display windows."
-msgstr ""
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr ""
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:47
-msgid "Edit profiles..."
-msgstr ""
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:52
-msgid "Open the BibleTime tool bar editor."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:53
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:55
-msgid ""
-"Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr ""
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:56
-msgid ""
-"Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The "
-"installation instructions explain how to set up BibleTime and the text "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:57
-msgid ""
-"Open KDE's helpbrowser with the Bible study HowTo included with BibleTime."
-"<BR>This HowTo is an introduction how to study the Bible in an efficient way."
-msgstr ""
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:58
-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/dummy.h:240 bibletime/whatsthisdef.h:59
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr ""
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:60
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:242 bibletime/whatsthisdef.h:61
-msgid "Show detailed information about BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:243 bibletime/whatsthisdef.h:62
-msgid "Show the \"about\" dialog of KDE 2."
-msgstr ""
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:66
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:67
-msgid ""
-"Create a new folder in the main index.<BR>If you press the right mouse "
-"button on a folder, the new folder will become a sub-folder of it."
-"<BR>Otherwise you will create a toplevel folder."
-msgstr ""
-
-#: bibletime/dummy.h:249 bibletime/whatsthisdef.h:68
-#, fuzzy
-msgid "Change the properties of the selected folder."
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:69
-msgid "Change the properties of the selected bookmark."
-msgstr ""
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:70
-msgid "Import bookmarks from a file."
-msgstr ""
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:71
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:72
-msgid ""
-"Use this to add this bookmark to BibleTime's print queue. The key, the "
-"description, and the text of the key will be used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:73
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:74
-msgid "Open a dialog to show information about the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:77
-msgid ""
-"This area is the main workspace of Bibletime.<BR>All display windows are "
-"opened in this window."
-msgstr ""
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:79
-msgid "The next entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:80
-msgid "The previous entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:81
-msgid ""
-"For Bible texts, the next verse will be highlighted.<BR>In commentaries, the "
-"next entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:263 bibletime/whatsthisdef.h:82
-msgid ""
-"For Bible texts, the previous verse will be highlighted. In commentaries,  "
-"the previous entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:83
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:84
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:85
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:86
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:87
-msgid "This list contains the books which are available in this module."
-msgstr ""
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:88
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr ""
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:89
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:90
-msgid "This list contains the entries of the current module."
-msgstr ""
-
-#: bibletime/dummy.h:272 bibletime/whatsthisdef.h:91
-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/dummy.h:273 bibletime/whatsthisdef.h:92
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-
-#: bibletime/dummy.h:274 bibletime/whatsthisdef.h:93
-msgid "Save new personal comments."
-msgstr ""
-
-#: bibletime/dummy.h:275 bibletime/whatsthisdef.h:94
-msgid "Clear the text and delete the entry from the module."
-msgstr ""
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:95
-#, fuzzy
-msgid "Toggle bold formatting of the selected text."
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:96
-#, fuzzy
-msgid "Toggle italic formatting of the selected text."
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:97
-msgid "Toggle underlined formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:279 bibletime/whatsthisdef.h:98
-msgid "Choose a new font for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:280 bibletime/whatsthisdef.h:99
-msgid "Choose a new color for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:100
-msgid "Choose a new fontsize for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:102
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:105
-msgid "Save the displayed chapter as an HTML file."
-msgstr ""
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:106
-msgid "Select all text."
-msgstr ""
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:107
-msgid "Copy the displayed text to the clipboard."
-msgstr ""
-
-#: bibletime/dummy.h:291 bibletime/whatsthisdef.h:110
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two buttons "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:111
-#, fuzzy
-msgid "Add the selected module to the list on the right."
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:112
-#, fuzzy
-msgid "Remove the selected module from the list on the right side."
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:113
-msgid "The list of modules used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:115
-msgid ""
-"The text entered in this edit box will be searched for in all selected "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:297 bibletime/whatsthisdef.h:116
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit box above "
-"is searched as a single word."
-msgstr ""
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:117
-msgid ""
-"Select this to search for exactly the same text you entered in the edit box."
-msgstr ""
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:118
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:119
-msgid "Activate this to use a case sensitive search."
-msgstr ""
-
-#: bibletime/dummy.h:302 bibletime/whatsthisdef.h:121
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr ""
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:122
-msgid ""
-"Select this if you want to use the last search result as the search scope."
-msgstr ""
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:123
-msgid "Create a new search scope."
-msgstr ""
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:124
-msgid ""
-"Use a custom scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-
-#: bibletime/dummy.h:306 bibletime/whatsthisdef.h:125
-msgid "Use this button to delete the chosen search scope."
-msgstr ""
-
-#: bibletime/dummy.h:308 bibletime/whatsthisdef.h:127
-msgid "Choose a search scope from the combo box"
-msgstr ""
-
-#: bibletime/dummy.h:309 bibletime/whatsthisdef.h:128
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:129
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:130
-msgid "Close this dialog and save the changes."
-msgstr ""
-
-#: bibletime/dummy.h:313 bibletime/whatsthisdef.h:132
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-
-#: bibletime/dummy.h:314 bibletime/whatsthisdef.h:133
-msgid "This contains the items found in the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:134
-msgid "This text box shows a preview of the chosen item."
-msgstr ""
-
-#: bibletime/dummy.h:317 bibletime/whatsthisdef.h:136
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-
-#: bibletime/dummy.h:320 bibletime/whatsthisdef.h:139
-msgid "Activate this box to see a daily tip on startup."
-msgstr ""
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:140
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:141
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr ""
-
-#: bibletime/dummy.h:323 bibletime/whatsthisdef.h:142
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr ""
-
-#: bibletime/dummy.h:324 bibletime/whatsthisdef.h:143
-msgid ""
-"Save the windows in the workspace if BibleTime is closed<BR>and restore them "
-"on the next startup. "
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:145
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This will speed up opening the lexicons a lot, but consume some disk space. "
-"Recommended."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:146
-msgid "The default Bible is used when a hyperlink into a Bible was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:147
-msgid ""
-"The default commentary is used when a hyperlink into a commentary was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:329 bibletime/whatsthisdef.h:148
-msgid "The default lexicon is used when a hyperlink into a lexicon was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:149
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon "
-"was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:150
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon was "
-"clicked"
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:151
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:152
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:154
-msgid "Select an action and change the key binding for the action."
-msgstr ""
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:155
-msgid ""
-"Use this box to select how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-
-#: bibletime/dummy.h:339 bibletime/whatsthisdef.h:158
-msgid "This is the background color used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:159
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:161
-#, fuzzy
-msgid "Set the keyboard accelerators used in all display windows"
-msgstr "&Sluit alle"
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:162
-#, fuzzy
-msgid "Set keyboard accelerators used in Bible windows"
-msgstr "&Sluit alle"
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:163
-#, fuzzy
-msgid "Set the keyboard accelerators used in commentary windows"
-msgstr "&Sluit alle"
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:164
-#, fuzzy
-msgid "Set the keyboard accelerators used in lexicon windows"
-msgstr "&Sluit alle"
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:168
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:169
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:170
-msgid "Closes this dialog without doing anything else."
-msgstr ""
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:171
-msgid "Open the online help of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:173
-msgid "This combo box contains the available print styles."
-msgstr ""
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:174
-msgid "This is the list which contains the available print items."
-msgstr ""
-
-#: bibletime/dummy.h:356 bibletime/whatsthisdef.h:175
-#, fuzzy
-msgid "Move the selected item up one item."
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:357 bibletime/whatsthisdef.h:176
-#, fuzzy
-msgid "Move the selected item down one item."
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:358 bibletime/whatsthisdef.h:177
-#, fuzzy
-msgid "Delete the selected items."
-msgstr "Verwijder geselecteerde item(s)"
-
-#: bibletime/dummy.h:359 bibletime/whatsthisdef.h:178
-msgid ""
-"Inserts a page break into the list.<BR>The printer will start a new page."
-msgstr ""
-
-#: bibletime/dummy.h:361 bibletime/whatsthisdef.h:180
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr ""
-
-#: bibletime/dummy.h:362 bibletime/whatsthisdef.h:181
-#, fuzzy
-msgid "The size of the border on the left side of the paper."
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:363 bibletime/whatsthisdef.h:182
-#, fuzzy
-msgid "The size of the border on the right side of the paper."
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:364 bibletime/whatsthisdef.h:183
-#, fuzzy
-msgid "The size of the border on the top of the paper."
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:365 bibletime/whatsthisdef.h:184
-#, fuzzy
-msgid "The size of the border on the bottom of the paper."
-msgstr "Kies het deel van de stijl:"
-
-#: bibletime/dummy.h:366 bibletime/whatsthisdef.h:185
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-
-#: bibletime/dummy.h:367 bibletime/whatsthisdef.h:186
-msgid "Remove the selected printing style from the list."
-msgstr ""
-
-#: bibletime/dummy.h:368 bibletime/whatsthisdef.h:187
-msgid "Change the properties of the selected printing style."
-msgstr ""
-
-#: bibletime/dummy.h:369 bibletime/whatsthisdef.h:188
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr ""
-
-#, fuzzy
-#~ msgid "The bible window"
-#~ msgstr "Toon venster"
-
-#, fuzzy
-#~ msgid "Print to a file"
-#~ msgstr "Print naar bestand:"
-
-#, fuzzy
-#~ msgid "The number of copies for printing."
-#~ msgstr "De algemene opties voor afdrukken"
-
-#, fuzzy
-#~ msgid "Choose the orientation of the paper."
-#~ msgstr "Kies het deel van de stijl:"
-
-#~ msgid "Printdialog"
-#~ msgstr "Afdrukdialoog"
-
-#~ msgid "The general options for printing"
-#~ msgstr "De algemene opties voor afdrukken"
-
-#~ msgid "Available printers:"
-#~ msgstr "Beschikbare printers:"
-
-#~ msgid "Host"
-#~ msgstr "Computernaam"
-
-#~ msgid "Comment"
-#~ msgstr "Commentaar"
-
-#~ msgid "Print to file:"
-#~ msgstr "Print naar bestand:"
-
-#, fuzzy
-#~ msgid "L&andscape"
-#~ msgstr "&Overlappen"
-
-#, fuzzy
-#~ msgid "Letter"
-#~ msgstr "Centreer"
-
-#, fuzzy
-#~ msgid "Foonotes:"
-#~ msgstr "&Toon voetnoten"
-
-#, fuzzy
-#~ msgid "Strong's numbers: %1<BR>"
-#~ msgstr "Toon &Strong nummering"
-
-#, fuzzy
-#~ msgid "Printing %1"
-#~ msgstr "Afdrukdialoog"
-
-#, fuzzy
-#~ msgid "Startup options"
-#~ msgstr "Schoon printer wachtrij"
-
-#, fuzzy
-#~ msgid "SWORD options"
-#~ msgstr "Schoon printer wachtrij"
-
-#, fuzzy
-#~ msgid "Display windows"
-#~ msgstr "Toon venster"
-
-#, fuzzy
-#~ msgid "Colors used in display windows"
-#~ msgstr "&Sluit alle"
-
-#, fuzzy
-#~ msgid "Accelerators used by all windows"
-#~ msgstr "&Sluit alle"
-
-#, fuzzy
-#~ msgid "Accelerators for bible windows"
-#~ msgstr "Toon venster"
-
-#~ msgid "Display window"
-#~ msgstr "Toon venster"
-
-#, fuzzy
-#~ msgid "Display window Unicode"
-#~ msgstr "Toon venster"
-
-#, fuzzy
-#~ msgid "Show a daily tip"
-#~ msgstr "&Dagelijkse tip"
-
-#~ msgid "&Show footnotes"
-#~ msgstr "&Toon voetnoten"
-
-#~ msgid "S&how Strong's numbers"
-#~ msgstr "Toon &Strong nummering"
-
-#~ msgid "handbook"
-#~ msgstr "handboek"
-
-#~ msgid "Martin Luther startup logo"
-#~ msgstr "Maarten Luther opstart logo"
-
-#~ msgid "Sponsor of www.bibletime.de"
-#~ msgstr "Sponsor van www.bibletime.de"
-
-#~ msgid "backend"
-#~ msgstr "backend"
-
-#~ msgid ""
-#~ "Leader of the SWORD project.\n"
-#~ "Lots of help with the SWORD API!"
-#~ msgstr ""
-#~ "Leider van het SWORD project.\n"
-#~ "Heel veel hulp van de SWORD API!"
-
-#, fuzzy
-#~ msgid "Module fonts"
-#~ msgstr "Module tekst"
-
-#~ msgid "Left"
-#~ msgstr "Links"
-
-#~ msgid "Center"
-#~ msgstr "Centreer"
-
-#~ msgid "Right"
-#~ msgstr "Rechts"
-
-#, fuzzy
-#~ msgid "Select all"
-#~ msgstr "&Sluit alle"
-
-#~ msgid "Translation into Brazilian Portoguese"
-#~ msgstr "Vertaling in Braziliaans Portugees"
diff --git a/bibletime-doc/po/no.gmo b/bibletime-doc/po/no.gmo
deleted file mode 100644
index dd16586..0000000
--- a/bibletime-doc/po/no.gmo
+++ /dev/null
diff --git a/bibletime-doc/po/no.po b/bibletime-doc/po/no.po
deleted file mode 100644
index 1cf425b..0000000
--- a/bibletime-doc/po/no.po
+++ /dev/null
@@ -1,3359 +0,0 @@
-msgid ""
-msgstr ""
-"POT-Creation-Date: 2002-04-07 01:40+0200\n"
-"PO-Revision-Date: 2001-06-17 20:56CET\n"
-"Last-Translator: Espen Knut Trydal <etrydal@postkassa.no>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"<<<<<<< no.poPO-Revision-Date: 2001-06-17 20:56CET\n"
-"=======POT-Creation-Date: 2001-06-17 09:52+0200\n"
-">>>>>>> 1.21Language-Team: Norsk Bokmål <->\n"
-"X-Generator: KBabel 0.8\n"
-
-#: bibletime/backend/cswordbackend.cpp:313
-#: bibletime/frontend/coptionsdialog.cpp:272
-msgid "Footnotes"
-msgstr "Fotnoter"
-
-#: bibletime/backend/cswordbackend.cpp:315
-#, fuzzy
-msgid "Strong's Numbers"
-msgstr "Strongs nummer"
-
-#: bibletime/backend/cswordbackend.cpp:317
-msgid "Headings"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:319
-msgid "Morphological Tags"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:321
-msgid "Lemmas"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:323
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:325
-#, fuzzy
-msgid "Hebrew Cantillation"
-msgstr "Orientering"
-
-#: bibletime/backend/cswordbackend.cpp:327
-msgid "Greek Accents"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:329
-msgid "Textual Variants"
-msgstr ""
-
-#: bibletime/main.cpp:110
-#, fuzzy
-msgid "Enable debug messages"
-msgstr "Slå på feilmeldinger."
-
-#: bibletime/main.cpp:111
-msgid "Ignore the startup profile saved after the last BibleTime execution."
-msgstr ""
-
-#: bibletime/main.cpp:119
-msgid "Bible study tool for KDE 2"
-msgstr "Bibelstudie verktøy for KDE 2"
-
-#: bibletime/main.cpp:121
-#, fuzzy
-msgid "(c)1999-2002, The BibleTime Team"
-msgstr "(c)1999-2001, BibleTime Teamet"
-
-#: bibletime/main.cpp:122
-#, fuzzy
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-"BibleTime er et lett forståelig og kraftig Bibelstudie verktøy for KDE 2.\n"
-"\n"
-"Vi er på jakt etter nye utviklere, oversettere og forfattere til håndboken.\n"
-"Hvis du er interessert i å bli med så send en eMail til info@bibletime.de."
-
-#: bibletime/main.cpp:130
-#, fuzzy
-msgid "Project coordinator"
-msgstr "Prosjekt koordinator, frontend, backend"
-
-#: bibletime/main.cpp:131
-#, fuzzy
-msgid "Frontend, backend"
-msgstr "Frontend, backend, forskjellige ting"
-
-#: bibletime/main.cpp:132
-#, fuzzy
-msgid "Searchdialog"
-msgstr "Søkedialog"
-
-#: bibletime/main.cpp:138
-msgid "Icons, startlogo, banners"
-msgstr ""
-
-#: bibletime/main.cpp:141
-msgid "Handbook"
-msgstr "Håndbok"
-
-#: bibletime/main.cpp:144
-msgid "Translation into Czech"
-msgstr "Oversettelse til tsjekkisk"
-
-#: bibletime/main.cpp:145
-msgid "Translation into Danish"
-msgstr "Oversettelse til dansk"
-
-#: bibletime/main.cpp:146
-msgid "Translation into Dutch"
-msgstr "Oversettelse til nederlandsk"
-
-#: bibletime/main.cpp:148
-msgid "Translation into French"
-msgstr "Oversettelse til fransk"
-
-#: bibletime/main.cpp:149
-msgid "Translation into Hungarian"
-msgstr "Oversettelse til ungarsk"
-
-#: bibletime/main.cpp:150 bibletime/main.cpp:151
-msgid "Translation into Italian"
-msgstr "Oversettelse til italiensk"
-
-#: bibletime/main.cpp:152
-msgid "Translation into Norwegian"
-msgstr "Oversettelse til norsk"
-
-#: bibletime/main.cpp:153
-msgid "Translation into Polish"
-msgstr "Oversettelse til polsk"
-
-#: bibletime/main.cpp:154
-msgid "Translation into Portoguese"
-msgstr "Oversettelse til portugisisk"
-
-#: bibletime/main.cpp:155
-#, fuzzy
-msgid "Translation into Russian"
-msgstr "Oversettelse til ungarsk"
-
-#: bibletime/main.cpp:156
-msgid "Translation into Slovak"
-msgstr "Oversettelse til slovakisk"
-
-#: bibletime/main.cpp:157
-#, fuzzy
-msgid "Translation into Spanish"
-msgstr "Oversettelse til dansk"
-
-#: bibletime/main.cpp:160
-msgid "Bible study HowTo"
-msgstr "Bibelstudie HowTo"
-
-#: bibletime/main.cpp:185
-#, fuzzy
-msgid "Starting BibleTime"
-msgstr "Om BibleTime"
-
-#: bibletime/bibletime_init.cpp:59
-#, fuzzy
-msgid "Creating BibleTime's GUI"
-msgstr "Lukk BibleTime"
-
-#: bibletime/bibletime_init.cpp:77
-msgid "Initializing menu- and toolbars"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:81
-msgid "Clear printing queue"
-msgstr "Tøm utskriftskø"
-
-#: bibletime/bibletime_init.cpp:99 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr "Tilbakestill hovedindeks"
-
-#: bibletime/bibletime_init.cpp:105
-msgid "Search in module(s)"
-msgstr "Søk i modul(er)"
-
-#: bibletime/bibletime_init.cpp:111
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:297
-msgid "Remove selected item(s)"
-msgstr "Fjern valgte element(er)"
-
-#: bibletime/bibletime_init.cpp:122
-msgid "&Show main index"
-msgstr "&Vis hovedindeks"
-
-#: bibletime/bibletime_init.cpp:137
-msgid "&Cascade"
-msgstr "&Overlapp"
-
-#: bibletime/bibletime_init.cpp:143
-msgid "&Tile"
-msgstr "&Flislegg"
-
-#: bibletime/bibletime_init.cpp:149
-msgid "&Auto cascade"
-msgstr "&Automatisk overlapp"
-
-#: bibletime/bibletime_init.cpp:155
-msgid "A&uto Tile"
-msgstr "A&utomatisk flislegg"
-
-#: bibletime/bibletime_init.cpp:161
-msgid "&Close all"
-msgstr "&Lukk alle"
-
-#: bibletime/bibletime_init.cpp:167
-#, fuzzy
-msgid "&Save profile"
-msgstr "Opprett en ny katalog"
-
-#: bibletime/bibletime_init.cpp:172
-#, fuzzy
-msgid "&Load profile"
-msgstr "Opprett en ny katalog"
-
-#: bibletime/bibletime_init.cpp:177
-#, fuzzy
-msgid "&Configure profiles"
-msgstr "Konfigurer BibleTimes farger"
-
-#: bibletime/bibletime_init.cpp:183
-#, fuzzy
-msgid "&Fullscreen mode"
-msgstr "Gjeldende modul:"
-
-#: bibletime/bibletime_init.cpp:202
-#, fuzzy
-msgid "&Handbook"
-msgstr "Håndbok"
-
-#: bibletime/bibletime_init.cpp:208
-msgid "&Installation"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:214
-#, fuzzy
-msgid "&Bible Study Howto"
-msgstr "Bibelstudie HowTo"
-
-#: bibletime/bibletime_init.cpp:229
-msgid "&Daily tip"
-msgstr "&Dagens tips"
-
-#: bibletime/bibletime_init.cpp:294
-msgid "Initializing Sword"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:341
-msgid "Initializing printing system"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:40
-msgid "style editor"
-msgstr "stil redigerer"
-
-#: bibletime/printing/cstyleeditordialog.cpp:63
-msgid "Name of style:"
-msgstr "Stilens navn:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose the part of the style:"
-msgstr "Velg del av stilen:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:73
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Header"
-msgstr "Hode"
-
-#: bibletime/printing/cstyleeditordialog.cpp:74
-#: bibletime/printing/cstyleeditordialog.cpp:293
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-#: bibletime/printing/cstyleeditordialog.cpp:297
-msgid "Module text"
-msgstr "Modultekst"
-
-#: bibletime/printing/cstyleeditordialog.cpp:81
-msgid "Enable this part"
-msgstr "Slå på denne delen"
-
-#: bibletime/printing/cstyleeditordialog.cpp:104
-msgid "Foreground:"
-msgstr "Forgrunn:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:115
-msgid "Background:"
-msgstr "Bakgrunn:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:126
-msgid "Choose font"
-msgstr "Velg skrifttype"
-
-#: bibletime/printing/cstyleeditordialog.cpp:129
-msgid "Font preview"
-msgstr "Forhåndsvisning av skrifttype"
-
-#: bibletime/printing/cstyleeditordialog.cpp:143
-msgid "Use frame"
-msgstr "Bruk ramme"
-
-#: bibletime/printing/cstyleeditordialog.cpp:154
-msgid "Line thickness (in point):"
-msgstr "Tykkelse på linje (i punkt):"
-
-#: bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr "Farge på ramme:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:170
-#, fuzzy
-msgid "Line style:"
-msgstr "Stilens navn:"
-
-#: bibletime/frontend/coptionsdialog.cpp:218
-#: bibletime/frontend/coptionsdialog.cpp:735
-#: bibletime/printing/cprintdialogpages.cpp:176
-#: bibletime/printing/cprinter.cpp:307 bibletime/printing/cprinter.cpp:316
-#: bibletime/printing/cstyle.cpp:180
-#: bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr "Standard"
-
-#: bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr "Navn:"
-
-#: bibletime/printing/cstyle.cpp:181
-msgid "Colored style for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:182
-msgid "Black&White for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:187
-msgid "unknown name"
-msgstr "ukjent navn"
-
-#: bibletime/dummy.h:166 bibletime/printing/cprintdialogpages.cpp:43
-#: bibletime/tooltipdef.h:166
-msgid "Styles"
-msgstr "Stiler"
-
-#: bibletime/printing/cprintdialogpages.cpp:48
-msgid "Margins (in millimeter)"
-msgstr "Marginer (i millimeter)"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Top"
-msgstr "&Topp"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Left"
-msgstr "&Venstre"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Right"
-msgstr "&Høyre"
-
-#: bibletime/printing/cprintdialogpages.cpp:104
-msgid "List of style items:"
-msgstr "Liste av stil elementer:"
-
-#: bibletime/printing/cprintdialogpages.cpp:192
-#, fuzzy
-msgid "Print queue"
-msgstr "Skriver"
-
-#: bibletime/printing/cprintdialogpages.cpp:203
-msgid "Choose a style"
-msgstr "Velg en stil"
-
-#: bibletime/printing/cprintdialogpages.cpp:215
-msgid "Entries which should be printed:"
-msgstr "Oppføringer som skal skrives ut:"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:239
-#: bibletime/printing/cprintitemlist.cpp:44
-msgid "Module"
-msgstr "Modul"
-
-#: bibletime/printing/cprintitemlist.cpp:45
-msgid "From"
-msgstr "Fra"
-
-#: bibletime/printing/cprintitemlist.cpp:46
-msgid "To"
-msgstr "Til"
-
-#: bibletime/printing/cprintitemlist.cpp:47
-msgid "Style"
-msgstr "Stil"
-
-#: bibletime/frontend/chtmldialog.cpp:84
-#, fuzzy
-msgid "Backward"
-msgstr "Bakgrunn"
-
-#: bibletime/frontend/chtmldialog.cpp:102
-msgid "Forward"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr "Ok"
-
-#: bibletime/frontend/chtmlwidget.cpp:264
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr "Finner ikke siden %1!"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.html *.htm *.shtml *.shtm | HTML filer\n"
-" *.* | Alle filer (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid "Save text as HTML page ..."
-msgstr "Lagre tekst som HTML ..."
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-"*.txt | Tekst fil (*.txt)\n"
-"*.* | Alle filer (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid "Save text as plain text ..."
-msgstr "Lagre tekst som ren tekst ..."
-
-#: bibletime/frontend/chtmlwidget.cpp:501
-msgid "Choose a font:"
-msgstr "Velg en skrifttype:"
-
-#: bibletime/frontend/chtmlwidget.cpp:505
-msgid "Choose font size"
-msgstr "Velg skriftstørrelse"
-
-#: bibletime/frontend/chtmlwidget.cpp:509
-msgid "Bold"
-msgstr "Fet"
-
-#: bibletime/frontend/chtmlwidget.cpp:513
-msgid "Underlined"
-msgstr "Understreket"
-
-#: bibletime/frontend/chtmlwidget.cpp:522
-msgid "Justify"
-msgstr "Juster"
-
-#: bibletime/frontend/cprofile.cpp:33
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:178
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:189
-msgid "unknown"
-msgstr "ukjent"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:214
-msgid "Bookmark to"
-msgstr "Bokmerke til"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:539
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:241
-#, fuzzy
-msgid "Language"
-msgstr "Språkliste"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:549
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:243
-msgid "Unlock key"
-msgstr "Nøkkel"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-msgid "not set"
-msgstr "ikke satt"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:532
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-msgid "Version"
-msgstr "Versjon"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:149
-msgid "Bibles"
-msgstr "Bibler"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:150
-msgid "Books"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:151
-msgid "Commentaries"
-msgstr "Kommentarer"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:152
-msgid "Lexicons"
-msgstr "Leksikon"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:269
-msgid "Caption"
-msgstr "Billedtekst"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:277
-msgid "Main index"
-msgstr "Hovedindeks"
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:278
-#: bibletime/tooltipdef.h:57
-msgid "Create a new folder"
-msgstr "Opprett en ny katalog"
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:281
-#: bibletime/tooltipdef.h:58
-msgid "Change this folder"
-msgstr "Forandre denne mappen"
-
-#: bibletime/dummy.h:59 bibletime/frontend/groupmanager/cgroupmanager.cpp:285
-#: bibletime/tooltipdef.h:59
-msgid "Change this bookmark"
-msgstr "Forandre dette bokmerket"
-
-#: bibletime/dummy.h:60 bibletime/frontend/groupmanager/cgroupmanager.cpp:288
-#: bibletime/tooltipdef.h:60
-msgid "Import bookmarks"
-msgstr "Importer bokmerker"
-
-#: bibletime/dummy.h:61 bibletime/frontend/groupmanager/cgroupmanager.cpp:291
-#: bibletime/tooltipdef.h:61
-msgid "Export bookmarks"
-msgstr "Eksporter bokmerker"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:294
-msgid "Print bookmark"
-msgstr "Skriv ut bokmerke"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-msgid "Search in selected module(s)"
-msgstr "Søk i valgte modul(er)"
-
-#: bibletime/dummy.h:63 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:63
-msgid "Unlock this module"
-msgstr "Lås opp denne modulen"
-
-#: bibletime/dummy.h:64 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:64
-msgid "About this module"
-msgstr "Om denne modulen"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Bookmark description - BibleTime"
-msgstr "Beskrivelse av bokmerket - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Please enter here the description:"
-msgstr "Skriv inn beskrivelsen her:"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Change bookmark description - BibleTime"
-msgstr "Forandre bokmerke beskrivelsen - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Please change the description of the item!"
-msgstr "Forandre beskrivelsen til elementet!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Change folder - BibleTime"
-msgstr "Forandre mappe - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Please change the name of the group!"
-msgstr "Forandre navnet på gruppen!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:536
-#, fuzzy
-msgid "Location"
-msgstr "Billedtekst"
-
-# Should this be "writeable"?
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:544
-msgid "Writable"
-msgstr "Skrivbar"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:545
-#, fuzzy
-msgid "yes"
-msgstr "Stiler"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Encoding"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:219
-#: bibletime/frontend/coptionsdialog.cpp:738
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Unicode"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "iso8859-1"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:564
-msgid "Features"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Enter name of folder - BibleTime"
-msgstr "Skriv navnet til mappen - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Please enter the name of the folder!"
-msgstr "Skriv navnet på mappen!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "BibleTime - Unlock module"
-msgstr "BibleTime - Lås opp modul"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "Enter the key to unlock the module!"
-msgstr "Skriv inn nøkkelen for å låse opp modulen!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1148
-msgid "Import bookmarks ..."
-msgstr "Importer bokmerker ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1156
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Et problem oppstod mens bokmerkene ble importert!<BR>Bokmerkeformatet på "
-"den importerte filen er nyere<BR>enn versjonen på bokmerkeformatet for denne "
-"versjonen av BibleTime!<BR><B>Importeringen av bokmerket kan muligens ikke "
-"virke korrekt!</B><BR>Vil du fortsette?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1159
-msgid "Import of bookmarks"
-msgstr "Import av bokmerker"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1173
-msgid "Export bookmarks ..."
-msgstr "Eksporter bokmerker ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Denne funksjonen vil tilbakestille hovedindekset!<BR>Dette vil lage på "
-"nytt de originale gruppene og slette alle andre elementer!<BR>Vær sikker på "
-"at ingen viktigebokmerker vil bli slettet!<BR>Vil du fortsette?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid "BibleTime - Reset main index"
-msgstr "BibleTime - Tilbakestill hovedindeks"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:85
-msgid "Lexicon window"
-msgstr "Leksikon vindu"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:88
-msgid "Entry"
-msgstr "Oppføring"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:100
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:89
-msgid "Text of entry"
-msgstr "Tekst i oppføring"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:106
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:90
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:95
-msgid "Entry with text"
-msgstr "Oppføring med tekst"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:100
-#: bibletime/frontend/presenters/cbookpresenter.cpp:98
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:103
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:92
-msgid "Selected text"
-msgstr "Valgt tekst"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:109
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:98
-msgid "Entry as plain text"
-msgstr "Oppføring som ren tekst"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:106
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:110
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:99
-msgid "Entry as HTML"
-msgstr "Oppføring som HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:112
-#: bibletime/frontend/presenters/cbookpresenter.cpp:109
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:113
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:102
-msgid "Lookup selected text in lexicon"
-msgstr "Slå opp valgte tekst i leksikon"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:114
-#: bibletime/frontend/presenters/cbookpresenter.cpp:111
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:115
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:104
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:270
-msgid "Copy..."
-msgstr "Kopier..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:115
-#: bibletime/frontend/presenters/cbookpresenter.cpp:112
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:116
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:105
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:271
-msgid "Add to printing queue..."
-msgstr "Legg til i utskriftskø..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:116
-#: bibletime/frontend/presenters/cbookpresenter.cpp:113
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:117
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:106
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:272
-msgid "Save..."
-msgstr "Lagre..."
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:259
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:267
-#, fuzzy
-msgid "Next entry"
-msgstr "Tekst i oppføring"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:260
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:270
-#, fuzzy
-msgid "Previous entry"
-msgstr "Vis den forrige oppføringen"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:92
-msgid "Bible window"
-msgstr "Bibelvindu"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:95
-msgid "Verse"
-msgstr "Vers"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:96
-msgid "Text of verse"
-msgstr "Tekst i vers"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:97
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:103
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:107
-msgid "Verse with text"
-msgstr "Vers med tekst"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:98
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:104
-msgid "Chapter"
-msgstr "Kapittel"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:108
-msgid "Chapter as plain text"
-msgstr "Kapittel som ren tekst"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:109
-msgid "Chapter as HTML"
-msgstr "Kapittel som HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:327
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:343
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:413
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:432
-#, fuzzy
-msgid "Next book"
-msgstr "Vis neste bok"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:328
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:345
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:414
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:434
-#, fuzzy
-msgid "Previous book"
-msgstr "Vis forrige bok"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:330
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:348
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:416
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:437
-#, fuzzy
-msgid "Next chapter"
-msgstr "Vis neste kapittel"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:331
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:350
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:417
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:439
-#, fuzzy
-msgid "Previous chapter"
-msgstr "Vis forrige kapittel"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:333
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:353
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:419
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:442
-#, fuzzy
-msgid "Next verse"
-msgstr "Tekst i vers"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:334
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:355
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:420
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:444
-#, fuzzy
-msgid "Previous verse"
-msgstr "Hopp til det forrige verset"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:47
-msgid "Select additional modules"
-msgstr "Velg en til modul"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:126
-msgid "NONE"
-msgstr "INGEN"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:70
-#, fuzzy
-msgid "Display options"
-msgstr "Visnings vindu"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:73
-msgid "Use linebreaks"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:74
-#, fuzzy
-msgid "Show versenumbers"
-msgstr "Vis Strongs nummer"
-
-#: bibletime/frontend/coptionsdialog.cpp:663
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:76
-msgid "Show headings"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/frontend/coptionsdialog.cpp:653
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:78
-#: bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr "Vis fotnoter"
-
-#: bibletime/frontend/coptionsdialog.cpp:658
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:80
-#, fuzzy
-msgid "Show Strong's Numbers"
-msgstr "Vis Strongs nummer"
-
-#: bibletime/frontend/coptionsdialog.cpp:668
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:83
-msgid "Show morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:673
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:85
-msgid "Show lemmas"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:678
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:87
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:683
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:89
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:688
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:91
-msgid "Show Greek accents"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:93
-msgid "Use alternative textual variant"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:80
-msgid "Synchronize..."
-msgstr "Synkroniser..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-msgid "Edit entry..."
-msgstr "Rediger oppføring..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:96
-msgid "Commentary window"
-msgstr "Kommentarvindu"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:232
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:392
-msgid "The text was not saved to the module. Save the changes now?"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:422
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:447
-msgid "Toggle synchronize button"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:511
-#, fuzzy
-msgid "Save changes to module?"
-msgstr "Søk i moduler"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:68
-msgid "Toggle tree..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:90
-#, fuzzy
-msgid "Book window"
-msgstr "Bibelvindu"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:200
-#: bibletime/frontend/presenters/cbookpresenter.cpp:208
-#, fuzzy
-msgid "Toggle tree"
-msgstr "Gjeldende modul:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr "Moduler:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr "Oppføringer funnet:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:173
-#, fuzzy
-msgid "module not set"
-msgstr "<I>modul ikke satt</I>"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:53
-msgid "Search properties"
-msgstr "Søke alternativer"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:72
-msgid "Multiple Words"
-msgstr "Flere ord"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:80
-msgid "Exact Search"
-msgstr "Eksakt søk"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:87
-msgid "Regular Expression"
-msgstr "Regulært utrykk"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:100
-msgid "Case Sensitive"
-msgstr "Forskjell på store og små bokstaver"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:104
-msgid "Search scope"
-msgstr "Områdesøk"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:108
-msgid "Search progress"
-msgstr "Søk i fremgang"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:113
-msgid "Current module:"
-msgstr "Gjeldende modul:"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:114
-msgid "Overall:"
-msgstr "Samlet:"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search Dialog"
-msgstr "Søkedialog"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search"
-msgstr "Søk"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Interrupt"
-msgstr "Avbryt"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid "Choose modules"
-msgstr "Velg moduler"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-msgid "Choose the modules for the search"
-msgstr "Velg modulene for søket"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Search Text"
-msgstr "Søketekst"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Enter the text to search for"
-msgstr "Skriv inn teksten det skal søkes etter"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "Search Result"
-msgstr "Søkeresultat"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "The result of your search"
-msgstr "Resultatet av søket"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Search Analysis"
-msgstr "Søkeanalyse"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Graphical analysis of your search result"
-msgstr "Grafisk analyse av søkeresultatet"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "HTML files"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-#, fuzzy
-msgid "Save Search Analysis"
-msgstr "Søkeanalyse"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:155
-#, fuzzy
-msgid "BibleTime Search Analysis"
-msgstr "Søkeanalyse"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:156
-#, fuzzy
-msgid "Search Text :"
-msgstr "Søketekst"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:157
-#, fuzzy
-msgid "Search Type :"
-msgstr "Søketekst"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:158
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Områdesøk"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:161
-msgid "Book"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:162
-msgid "Total Hits"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:186
-msgid "Created by"
-msgstr ""
-
-#: bibletime/dummy.h:112
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:112
-msgid "No scope"
-msgstr "Intet områdesøk"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr "Siste resultat"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr "Bruk områdesøk"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:223
-msgid "Choose custom range"
-msgstr "Velg egendefinert område"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr "Rediger grenser"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr "Det Gamle Testamentet"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr "Moses/Pentateuch/Tora"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr "Historie"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr "Profeter"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr "Det Nye Testamentet"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr "Evangeliene"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr "Brev/Epistlene"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr "Paulus' brev"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:224
-msgid "Define range text"
-msgstr "Definer tekstområde"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:225
-msgid "Range parsing results"
-msgstr "Tekstområde som vil gjelde"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Range name"
-msgstr "Område navn"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Please enter a name for the new range"
-msgstr "Skriv inn et navn for det nye området"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr "Moduler"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr "Søkeresultat"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Search result with text"
-msgstr "Søkeresultat med tekst"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:152
-#, fuzzy
-msgid "Appending keys to the printing queue ..."
-msgstr "Legg til i utskriftskø..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:166
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:195
-#, fuzzy
-msgid "Copying search result to clipboard..."
-msgstr "Kopier til utklippstavle"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:181
-#, fuzzy
-msgid "Saving the search result ..."
-msgstr "Lagre søkeresultat ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:209
-#, fuzzy
-msgid "Saving the search result..."
-msgstr "Lagre søkeresultat ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:260
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:267
-msgid "Key"
-msgstr "Nøkkel"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:261
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:264
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:268
-msgid "Key with text"
-msgstr "Nøkkel med tekst"
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.txt | Tekst filer\n"
-" *.* | Alle filer (*.*)"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid "Save key ..."
-msgstr "Lagre nøkkel ..."
-
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid ""
-"Choose the module you want to use for the search. The tree on the left "
-"contains all available modules, the tree on the right the modules for the "
-"search. Use the two arrow buttons to add or remove modules from the right "
-"tree."
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:79
-msgid "The file does already exist!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:80
-msgid "Do you want to overwrite it?"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:96
-msgid "Sorry! But the file couldn't be saved!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:97
-msgid "Please check permissions etc. !"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-msgid "Save search result ..."
-msgstr "Lagre søkeresultat ..."
-
-#: bibletime/frontend/coptionsdialog.cpp:68
-msgid "Optionsdialog"
-msgstr "Alternativdialog"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#: bibletime/frontend/coptionsdialog.cpp:314
-#, fuzzy
-msgid "Create new profile"
-msgstr "Opprett en ny katalog"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#, fuzzy
-msgid "Please enter the name of the new profile"
-msgstr "Skriv navnet på mappen!"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Rename profile"
-msgstr "Fjern valgte elementer"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Please enter the new name of the profile"
-msgstr "Skriv navnet på mappen!"
-
-#: bibletime/frontend/coptionsdialog.cpp:170
-#, fuzzy
-msgid "Startup"
-msgstr "Vis oppstartslogo"
-
-#: bibletime/frontend/coptionsdialog.cpp:174
-msgid "Show tip of the day"
-msgstr "Vis dagens tips"
-
-#: bibletime/frontend/coptionsdialog.cpp:184
-msgid "Show startuplogo"
-msgstr "Vis oppstartslogo"
-
-#: bibletime/frontend/coptionsdialog.cpp:193
-msgid "Restore windows in workspace area"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-#, fuzzy
-msgid "Choose fonts"
-msgstr "Velg skrifttype"
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid ""
-"The fonts you can choose here are used in the display windows. Use the drop-"
-"down box below to choose the area of application. Then select a font for it. "
-"Make sure the charset \"iso10646-1\" is available for the selected Unicode "
-"font.!"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:225
-#, fuzzy
-msgid "The quick brown fox jumps over the lazy dog"
-msgstr "Den raske brune reven hoppet over den late hunden"
-
-#: bibletime/frontend/coptionsdialog.cpp:238
-msgid "Colors"
-msgstr "Farger"
-
-#: bibletime/frontend/coptionsdialog.cpp:245
-#, fuzzy
-msgid "Choose colors"
-msgstr "Velg moduler"
-
-#: bibletime/frontend/coptionsdialog.cpp:246
-msgid ""
-"Choose the colors to change the look of the display windows to your own "
-"preferences. Some options like \"Words of Jesus\" do only apply to texts "
-"which support this special feature."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:252
-msgid "Text"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:257
-msgid "Background"
-msgstr "Bakgrunn"
-
-#: bibletime/frontend/coptionsdialog.cpp:262
-#, fuzzy
-msgid "Highlighted verse"
-msgstr "Gjeldende vers"
-
-#: bibletime/frontend/coptionsdialog.cpp:267
-#, fuzzy
-msgid "Hyperlinks"
-msgstr "Start utskrift"
-
-#: bibletime/frontend/coptionsdialog.cpp:277
-msgid "Strong's numbers"
-msgstr "Strongs nummer"
-
-#: bibletime/frontend/coptionsdialog.cpp:282
-msgid "Morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:287
-msgid "Words of Jesus"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:297
-#, fuzzy
-msgid "Profiles"
-msgstr "Rediger oppføring..."
-
-#: bibletime/frontend/coptionsdialog.cpp:302
-#, fuzzy
-msgid "Manage your profiles"
-msgstr "Konfigurer BibleTimes farger"
-
-#: bibletime/frontend/coptionsdialog.cpp:303
-msgid ""
-"Profiles define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. Don't forget "
-"that new profiles only work after you've saved something in them."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:318
-#, fuzzy
-msgid "Delete selected profile"
-msgstr "Slett det valgte elementet."
-
-#: bibletime/frontend/coptionsdialog.cpp:322
-#, fuzzy
-msgid "Rename selected profile"
-msgstr "Fjern valgte elementer"
-
-#: bibletime/frontend/coptionsdialog.cpp:340
-msgid "Accelerators"
-msgstr "Hurtigtaster"
-
-#: bibletime/frontend/coptionsdialog.cpp:345
-msgid "Application wide"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:368
-#, fuzzy
-msgid "Bible windows"
-msgstr "Bibelvindu"
-
-#: bibletime/frontend/coptionsdialog.cpp:381
-#, fuzzy
-msgid "Commentary windows"
-msgstr "Kommentarvindu"
-
-#: bibletime/frontend/coptionsdialog.cpp:394
-#, fuzzy
-msgid "Lexicon windows"
-msgstr "Leksikon vindu"
-
-#: bibletime/frontend/coptionsdialog.cpp:408
-#, fuzzy
-msgid "Book windows"
-msgstr "Bibelvindu"
-
-#: bibletime/frontend/coptionsdialog.cpp:422
-msgid "Sword"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:425
-msgid "General"
-msgstr "Generelt"
-
-#: bibletime/frontend/coptionsdialog.cpp:431
-#: bibletime/frontend/coptionsdialog.cpp:439
-msgid "Use key cache for lexicons"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:432
-msgid ""
-"BibleTime can create a key cache for lexicons, which speeds up opening large "
-"lexicon modules a lot. However these files consume some disk space (usually "
-"not much), and reside in $KDEHOME/share/apps/bibletime/cache."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:447
-msgid "Scrolling behaviour"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:448
-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/dummy.h:134 bibletime/frontend/coptionsdialog.cpp:454
-#: bibletime/tooltipdef.h:134
-msgid "Use down arrow to scroll to next verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:461
-#, fuzzy
-msgid "Specify a language for biblical booknames"
-msgstr "Språk for navn på bøkene"
-
-#: bibletime/frontend/coptionsdialog.cpp:462
-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 "
-"choose. If you want to create a new locale, see http://www.crosswire.org/"
-"sword/develop for details."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:469
-msgid "Language for booknames"
-msgstr "Språk for navn på bøkene"
-
-#: bibletime/frontend/coptionsdialog.cpp:477
-msgid "English"
-msgstr "Engelsk"
-
-#: bibletime/frontend/coptionsdialog.cpp:495
-#: bibletime/frontend/coptionsdialog.cpp:500
-#, fuzzy
-msgid "Default modules"
-msgstr "Brukte moduler"
-
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid ""
-"Default modules are used, when no module is specified. This may happen with "
-"references into modules like Bibles or Lexicons."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:505
-msgid "Default Bible"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:513
-#, fuzzy
-msgid "Default Commentary"
-msgstr "Kommentarer"
-
-#: bibletime/frontend/coptionsdialog.cpp:522
-#, fuzzy
-msgid "Default Lexicon"
-msgstr "Leksikon"
-
-#: bibletime/frontend/coptionsdialog.cpp:530
-#, fuzzy
-msgid "Default Hebrew Strong's Lexicon"
-msgstr "Leksikon"
-
-#: bibletime/frontend/coptionsdialog.cpp:538
-#, fuzzy
-msgid "Default Greek Strong's Lexicon"
-msgstr "Leksikon"
-
-#: bibletime/frontend/coptionsdialog.cpp:546
-#, fuzzy
-msgid "Default Hebrew Morphological Lexicon"
-msgstr "Leksikon"
-
-#: bibletime/frontend/coptionsdialog.cpp:553
-#, fuzzy
-msgid "Default Greek Morphological Lexicon"
-msgstr "Leksikon"
-
-#: bibletime/frontend/coptionsdialog.cpp:636
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid "Filter settings"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can choose the default settings of the various filter settings. You can "
-"change the settings in each display window, too."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:643
-msgid "Show line break after each verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:648
-#, fuzzy
-msgid "Show verse numbers"
-msgstr "Vis Strongs nummer"
-
-#: bibletime/frontend/coptionsdialog.cpp:693
-msgid "Use textual variants"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Printing..."
-msgstr "Skriver ut..."
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Abort printing"
-msgstr "Avbryt utskrift"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr "&Hovedindeks"
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr "&Vindu"
-
-#: bibletime/tips-dummy.cpp:3
-msgid ""
-"This is <B>BibleTime 1.1</B>!<BR>\n"
-"This version of BibleTime should have reached the state where it could\n"
-"be called stable, useful and user friendly!<BR>\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:9
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:13
-msgid ""
-"BibleTime 1.1 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:18
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:22
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:26
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>! \n"
-"It was written by Bob Harman and is a great help how to study the Bible.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:31
-msgid ""
-"The Bible has the power to \"comfort the afflicted\" and \"afflict the "
-"comfortable\". (Revelation 10:10)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:35
-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:39
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:43
-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:48
-msgid "That the Bible is truth. (John 17:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:52
-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:57
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:61
-msgid ""
-"It's possible to insert the text of bookmarks and references to verses or "
-"lexicon entries into the personal commentary editor by dropping them there.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:65
-msgid ""
-"By studying the Bible you will have no reason to stand ashamed before God. "
-"(2 Timothy 2:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:69
-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 optionsdialog.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:76
-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:80
-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:84
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:88
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the regular expression \"x | y | z\" for searching, which is "
-"equivalent to \"x OR y OR z\", e.g. \"pray | worship | supplicate\".\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:92
-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:96
-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:100
-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"
-"Now double click on it and drag the selected word on the foreign module in "
-"the main index.\n"
-"The search dialog will be opened with the word in the edit line.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:106
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:110
-msgid ""
-"Foreign modules (e.g. greek or hebrew) do often require a special unicode "
-"font to read them.\n"
-"Many of the fonts are available on www.crosswire.org or on the Sword CD.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:115
-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:119
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:123
-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:128
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:132
-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/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr "Tøm utskriftskøen"
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr "�ne utskriftsdialogen"
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr "Lukk BibleTime"
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr "Søk i moduler"
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr "Fjern valgte elementer"
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr "Vis hovedindeks"
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr "Vis verktøylinje"
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr "Vis Strongs nummer"
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr "Flislegg vinduer"
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr "Automatisk flislegg vinduer"
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr "Overlapp vinduer"
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr "Automatisk overlapp vinduer"
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr "Lukk alle vinduer"
-
-#: bibletime/dummy.h:37 bibletime/dummy.h:227 bibletime/tooltipdef.h:37
-#: bibletime/whatsthisdef.h:46
-msgid "Save current profile"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-#, fuzzy
-msgid "Edit profiles"
-msgstr "Rediger oppføring..."
-
-#: bibletime/dummy.h:39 bibletime/dummy.h:229 bibletime/tooltipdef.h:39
-#: bibletime/whatsthisdef.h:48
-#, fuzzy
-msgid "Load a new profile"
-msgstr "Opprett en ny katalog"
-
-#: bibletime/dummy.h:40 bibletime/dummy.h:230 bibletime/tooltipdef.h:40
-#: bibletime/whatsthisdef.h:49
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Gjeldende modul:"
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Edit toolbar"
-msgstr "Rediger verktøylinjen"
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "BibleTime's handbook"
-msgstr "BibleTime's håndbok"
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "BibleTime's installation documentation"
-msgstr ""
-
-#: bibletime/dummy.h:47 bibletime/tooltipdef.h:47
-#, fuzzy
-msgid "BibleTime's Bible study HowTo"
-msgstr "Bibelstudie HowTo"
-
-#: bibletime/dummy.h:48 bibletime/tooltipdef.h:48
-msgid "Enter \"What's this?\" mode"
-msgstr "Gå inn i \"Hva er dette?\" modus"
-
-#: bibletime/dummy.h:49 bibletime/tooltipdef.h:49
-msgid "Send bugreport"
-msgstr "Send feilmelding"
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-#, fuzzy
-msgid "Show daily tips at startup"
-msgstr "Vis dagens tips"
-
-#: bibletime/dummy.h:51 bibletime/tooltipdef.h:51
-msgid "About BibleTime"
-msgstr "Om BibleTime"
-
-#: bibletime/dummy.h:52 bibletime/tooltipdef.h:52
-msgid "About KDE"
-msgstr "Om KDE"
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "The main index"
-msgstr "Hovedindekset"
-
-#: bibletime/dummy.h:62 bibletime/tooltipdef.h:62
-msgid "Add bookmark to printing queue"
-msgstr "Legg til et bokmerke til utskriftskøen"
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "The working area"
-msgstr "Arbeidsområdet"
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Show the next entry"
-msgstr "Vis den neste oppføringen"
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Show the previous entry"
-msgstr "Vis den forrige oppføringen"
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-#, fuzzy
-msgid "Jump to the next verse"
-msgstr "Hopp til det neste verset"
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-#, fuzzy
-msgid "Jump to the previous verse"
-msgstr "Hopp til det forrige verset"
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-#, fuzzy
-msgid "Show the next chapter"
-msgstr "Vis neste kapittel"
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-#, fuzzy
-msgid "Show the previous chapter"
-msgstr "Vis forrige kapittel"
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-#, fuzzy
-msgid "Show the next book"
-msgstr "Vis neste bok"
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-#, fuzzy
-msgid "Show the previous book"
-msgstr "Vis forrige bok"
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of books"
-msgstr "Bokliste"
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of chapters"
-msgstr "Kapittelliste"
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "List of verses"
-msgstr "Verseliste"
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "List of entries"
-msgstr "Oppføringsliste"
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Scroll through the list"
-msgstr "Bla igjennom listen"
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Edit this entry"
-msgstr "Rediger denne oppføringen"
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Save this comment"
-msgstr "Lagre denne kommentaren"
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Delete this comment"
-msgstr "Slett denne kommentaren"
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Comment up to"
-msgstr "Kommenter opp til"
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set bold"
-msgstr "Sett som fet"
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set italic"
-msgstr "Sett som kursiv"
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set underlined"
-msgstr "Sett som understreket"
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set font"
-msgstr "Velg skrifttype"
-
-#: bibletime/dummy.h:90 bibletime/tooltipdef.h:90
-msgid "Set the color"
-msgstr "Velg farge"
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Set the fontsize"
-msgstr "Velg skriftstørrelse"
-
-#: bibletime/dummy.h:93 bibletime/tooltipdef.h:93
-msgid "Synchronize with Bible windows"
-msgstr "Synkroniser med Bibelvinduene"
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Save as HTML"
-msgstr "Lagre som HTML"
-
-#: bibletime/dummy.h:98 bibletime/tooltipdef.h:98
-msgid "Copy to clipboard"
-msgstr "Kopier til utklippstavle"
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-#, fuzzy
-msgid "Choose the modules to search in"
-msgstr "Velg modulene for søket"
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "Add the selected module to the list"
-msgstr "Lagre den valgte modulen til listen"
-
-#: bibletime/dummy.h:103 bibletime/tooltipdef.h:103
-msgid "Remove the selected module from the list"
-msgstr "Slett den valgte modulen fra listen"
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "List of modules used for the search"
-msgstr "Liste av moduler brukt i søket"
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-#, fuzzy
-msgid "Search for this text"
-msgstr "Søk etter denne teksten"
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search multiple words"
-msgstr "Søk med flere ord"
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Exact match"
-msgstr "Eksakt treff"
-
-#: bibletime/dummy.h:109 bibletime/tooltipdef.h:109
-msgid "Search with GNU regular expressions"
-msgstr "Søk med GNU regulære utrykk"
-
-#: bibletime/dummy.h:110 bibletime/tooltipdef.h:110
-msgid "Search case sensitive"
-msgstr "Søk med forskjell på store og små bokstaver"
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Last search result"
-msgstr "Forrige søkeresultat"
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-#, fuzzy
-msgid "Use custom scope"
-msgstr "Bruk eget søkeområde"
-
-#: bibletime/dummy.h:115 bibletime/tooltipdef.h:115
-msgid "Add a new scope"
-msgstr "Legg til et nytt søkeområde"
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Delete this search scope"
-msgstr "Slett dette søkeområdet"
-
-#: bibletime/dummy.h:117 bibletime/dummy.h:307 bibletime/tooltipdef.h:117
-#: bibletime/whatsthisdef.h:126
-msgid "Edit and define your search scopes"
-msgstr "Rediger og definer dine søkeområder"
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Choose a search scope from the list"
-msgstr "Velg et søkeområde fra listen"
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Enter your own search scope"
-msgstr "Skriv inn ditt eget søkeområde"
-
-#: bibletime/dummy.h:120 bibletime/tooltipdef.h:120
-msgid "Parsed result"
-msgstr "Tolket resultat"
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Close this dialog"
-msgstr "Lukk denne dialogen"
-
-#: bibletime/dummy.h:123 bibletime/tooltipdef.h:123
-msgid "Used modules"
-msgstr "Brukte moduler"
-
-#: bibletime/dummy.h:124 bibletime/tooltipdef.h:124
-msgid "Items found"
-msgstr "Elementer funnet"
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Preview"
-msgstr "Forhåndsvis"
-
-#: bibletime/dummy.h:127 bibletime/tooltipdef.h:127
-#, fuzzy
-msgid "Graphical Search Analysis"
-msgstr "Grafisk analyse"
-
-#: bibletime/dummy.h:131 bibletime/tooltipdef.h:131
-msgid "Show daily tip"
-msgstr "Vis dagens tips"
-
-#: bibletime/dummy.h:132 bibletime/tooltipdef.h:132
-msgid "List of languages"
-msgstr "Språkliste"
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-#, fuzzy
-msgid "Show start-up logo"
-msgstr "Vis oppstartslogo"
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Restore the windows in the workspace on startup"
-msgstr ""
-
-#: bibletime/dummy.h:137 bibletime/tooltipdef.h:137
-msgid "Use cache files for the lexicon entries"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "The default bible used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:139 bibletime/tooltipdef.h:139
-msgid "The default commentary used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "The default lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "The default Hebrew lexicon used in the workspace are"
-msgstr ""
-
-#: bibletime/dummy.h:142 bibletime/tooltipdef.h:142
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:143 bibletime/tooltipdef.h:143
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Set keyboard accelerators"
-msgstr "Definer hurtigtaster"
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "Choose the area of application"
-msgstr "Velg området av programmet"
-
-#: bibletime/dummy.h:150 bibletime/dummy.h:337 bibletime/tooltipdef.h:150
-#: bibletime/whatsthisdef.h:156
-msgid "Choose a font"
-msgstr "Velg en skrifttype"
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Color of the background"
-msgstr "Bakgrunnsfarge"
-
-#: bibletime/dummy.h:153 bibletime/tooltipdef.h:153
-msgid "Color of the highlighted verse"
-msgstr "Farge på det gjeldende verset"
-
-#: bibletime/dummy.h:155 bibletime/tooltipdef.h:155
-#, fuzzy
-msgid "Keyboard accelerators used by all display windows"
-msgstr "Dette er bakgrunnsfargen som blir brukt i visnings vinduene."
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Keyboard accelerators used by Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Keyboard accelerators used by commentary windows"
-msgstr ""
-
-#: bibletime/dummy.h:158 bibletime/tooltipdef.h:158
-msgid "Keyboard accelerators used by lexicon windows"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Start printing"
-msgstr "Start utskrift"
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-#, fuzzy
-msgid "Preview print job"
-msgstr "Forhåndsvis med:"
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Open help"
-msgstr "�ne hjelp"
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "List of print items"
-msgstr "Liste av utskriftselementer"
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Move item up"
-msgstr "Flytt element opp"
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Move item down"
-msgstr "Flytt element ned"
-
-# Should it be item instead of items?
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Delete items"
-msgstr "Slett element"
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "Insert a page break"
-msgstr "Sett inn sideskift"
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Page borders"
-msgstr "Rammer"
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Left border"
-msgstr "Venstre ramme"
-
-#: bibletime/dummy.h:175 bibletime/tooltipdef.h:175
-msgid "Right border"
-msgstr "Høyre ramme"
-
-#: bibletime/dummy.h:176 bibletime/tooltipdef.h:176
-msgid "Upper border"
-msgstr "�re ramme"
-
-#: bibletime/dummy.h:177 bibletime/tooltipdef.h:177
-msgid "Lower border"
-msgstr "Nedre ramme"
-
-#: bibletime/dummy.h:178 bibletime/tooltipdef.h:178
-#, fuzzy
-msgid "List of print styles"
-msgstr "Liste av utskriftselementer"
-
-#: bibletime/dummy.h:179 bibletime/tooltipdef.h:179
-#, fuzzy
-msgid "Delete the selected style"
-msgstr "Slett det valgte elementet."
-
-#: bibletime/dummy.h:180 bibletime/tooltipdef.h:180
-#, fuzzy
-msgid "Edit the selected style"
-msgstr "Slett det valgte elementet."
-
-#: bibletime/dummy.h:181 bibletime/tooltipdef.h:181
-msgid "Create a new printing style"
-msgstr "Lag en ny utskrftsstil"
-
-# Is it necessary to include that the print button
-# will be disabled?
-#: bibletime/dummy.h:209 bibletime/whatsthisdef.h:28
-#, fuzzy
-msgid ""
-"Clear the print queue of BibleTime. All items will be removed from the list "
-"and the print button will be disabled."
-msgstr ""
-"Slett utskriftskøen til BibleTime. Alle elementer vil bli fjernet fra "
-"listen, og utskriftsknappen vil bli slått av."
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:29
-#, fuzzy
-msgid ""
-"Open the printer dialog of BibleTime.  Here you can edit the print queue and "
-"assign styles to the items."
-msgstr ""
-"�ne utskriftsdialogen til BibleTime hvor du kan redigere utskriftskøen og "
-"velge stil for elementene."
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr "Lukk BibleTime og lagre innstillingene."
-
-# Should "search text" be just "search" or
-# "search after text"?
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:32
-#, fuzzy
-msgid "Open the search dialog to search for text in one or more modules."
-msgstr "�ne søkedialogen for å søke etter tekst i en eller flere moduler."
-
-# Should the comma in ", too" be erased?
-#: bibletime/dummy.h:214 bibletime/whatsthisdef.h:33
-#, fuzzy
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder, "
-"the subitems of it will be removed too."
-msgstr ""
-"Fjern de valgte elementene fra hovedindekset.<BR>Hvis du fjerner en mappe "
-"vil underelementene bli fjernet også."
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:34
-#, fuzzy
-msgid ""
-"Reset the main index.<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-"Tilbakestill hovedindekset<BR>Alle bokmerker og mapper vil bli slettet og "
-"standard mapper vil bli gjenopprettet."
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:36
-#, fuzzy
-msgid "Toggle the main index view."
-msgstr "Hovedindekset"
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:37
-msgid "Toggle the main toolbar view."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:38
-msgid "Toggle footnotes in the modules."
-msgstr ""
-
-# Look at comment :209
-#: bibletime/dummy.h:220 bibletime/whatsthisdef.h:39
-#, fuzzy
-msgid "Toggle Strong's numbers in the modules."
-msgstr "Vis eller skjul Strongs nummer avhengig av nåværende tilstand."
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:41
-#, fuzzy
-msgid "Tile the open display windows."
-msgstr "Lukk alle åpne vinduer"
-
-#: bibletime/dummy.h:223 bibletime/whatsthisdef.h:42
-#, fuzzy
-msgid "Automatically tile the display windows."
-msgstr "Automatisk flislegg vinduer"
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:43
-#, fuzzy
-msgid "Cascade the open display windows."
-msgstr "Lukk alle åpne vinduer"
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:44
-#, fuzzy
-msgid "Automatically cascade the opened display windows."
-msgstr "Automatisk overlapp vinduer"
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr "Lukk alle åpne vinduer"
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:47
-#, fuzzy
-msgid "Edit profiles..."
-msgstr "Rediger oppføring..."
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:52
-msgid "Open the BibleTime tool bar editor."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:53
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-"�ne BibleTImes alternativdialog der du kan sette de fleste innstillingene."
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:55
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr "�ne KDEs hjelpebehandler med BibleTimes håndbok."
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:56
-msgid ""
-"Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The "
-"installation instructions explain how to set up BibleTime and the text "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:57
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with the Bible study HowTo included with BibleTime."
-"<BR>This HowTo is an introduction how to study the Bible in an efficient way."
-msgstr "�ne KDEs hjelpebehandler med BibleTimes håndbok."
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:58
-#, fuzzy
-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 ""
-"Gå inn i<B>\"Hva er dette?\"</B> modus.<BR>Alle viktige elementer i "
-"BibleTimes GUI tilbyr en \"Hva er dette?\" hjelp."
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:59
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr "Send en feilmelding til utviklerene av BibleTime!"
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:60
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-"Vis dagens tips.<BR>Tipsene inneholder viktige Bibel-sitater og hjelpsomme "
-"brukstips for BibleTime."
-
-#: bibletime/dummy.h:242 bibletime/whatsthisdef.h:61
-msgid "Show detailed information about BibleTime."
-msgstr "Vis detaljert informasjon om BibleTime."
-
-#: bibletime/dummy.h:243 bibletime/whatsthisdef.h:62
-#, fuzzy
-msgid "Show the \"about\" dialog of KDE 2."
-msgstr "Vis den generelle om dialogen til KDE 2."
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:66
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-"Dette er hovedindekset til BibleTIme.<BR>Bruk den til å behandle de "
-"installerte modulene, til å arbeide med bokmerker, til å åpne vinduer etc."
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:67
-#, fuzzy
-msgid ""
-"Create a new folder in the main index.<BR>If you press the right mouse "
-"button on a folder, the new folder will become a sub-folder of it."
-"<BR>Otherwise you will create a toplevel folder."
-msgstr ""
-"Lag en ny mappe i hovedindekset.<BR>Hvis du trykket på den høyre mus knappen "
-"på en mappe vil den nye mappen bli underordnet den.<BR>Hvis ikke vil du lage "
-"en mappe under toppnivået."
-
-#: bibletime/dummy.h:249 bibletime/whatsthisdef.h:68
-msgid "Change the properties of the selected folder."
-msgstr "Endre på egenskapene til den valgte mappen."
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:69
-msgid "Change the properties of the selected bookmark."
-msgstr "Endre på egenskapene til det valgte bokmerket. "
-
-# Should this be bookmarks?
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:70
-#, fuzzy
-msgid "Import bookmarks from a file."
-msgstr "Importer bokmerke fra en fil."
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:71
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-"Eksporter bokmerker til en fil så du eller andre<BR>brukere kan importere "
-"dem senere."
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:72
-#, fuzzy
-msgid ""
-"Use this to add this bookmark to BibleTime's print queue. The key, the "
-"description, and the text of the key will be used for printing."
-msgstr ""
-"Bruk denne til å legge dette bokmerket til i BibleTimes utskriftskø. "
-"Nøkkelen, beskrivelsen og teksten til nøkkelen vil bli brukt i utskriften."
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:73
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr "�ne en liten dialog hvor du kan låse opp den valgte modulen."
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:74
-msgid "Open a dialog to show information about the selected module."
-msgstr "�ne en dialog som viser informasjon om den valgte modulen."
-
-# Grammar error? "This area contains is ..."
-# I think either "contains" or (which I would
-# prefer) "is". And here BibleTime is with a non-
-# capital T.
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:77
-#, fuzzy
-msgid ""
-"This area is the main workspace of Bibletime.<BR>All display windows are "
-"opened in this window."
-msgstr "Dette området er arbeidsområdet til BibleTime."
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:79
-msgid "The next entry of the module will be shown."
-msgstr "Den neste oppføringen i modulen vil bli vist."
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:80
-msgid "The previous entry of the module will be shown."
-msgstr "Den forrige oppføringen i modulen vil bli vist."
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:81
-#, fuzzy
-msgid ""
-"For Bible texts, the next verse will be highlighted.<BR>In commentaries, the "
-"next entry will be shown."
-msgstr ""
-"Hvis du ser på teksten til en Bibel vil det neste verset bli gjeldende."
-"<BR>Hvis du leser en kommentar vil den neste oppføringen bli vist."
-
-#: bibletime/dummy.h:263 bibletime/whatsthisdef.h:82
-#, fuzzy
-msgid ""
-"For Bible texts, the previous verse will be highlighted. In commentaries,  "
-"the previous entry will be shown."
-msgstr ""
-"Hvis du ser på teksten til en Bibel vil det forrige verset bli gjeldende."
-"<BR>Hvis du leser en kommentar vil den forrige oppføringen bli vist."
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:83
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-"Vis det neste kapittelet til modulen. Det gjeldende verset vil bli satt til "
-"\"1\"."
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:84
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-"Vis det forrige kapittelet til modulen. Det gjeldende verset vil bli satt "
-"til \"1\"."
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:85
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-"Vis den neste boken i denne modulen. Det gjeldende kapittelet og verset vil "
-"bli satt til \"1\"."
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:86
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-"Vis den forrige boken i denne modulen. Det gjeldende kapittelet og verset "
-"vil bli satt til \"1\"."
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:87
-msgid "This list contains the books which are available in this module."
-msgstr "Denne listen inneholder bøkene som er tilgjengelige i denne modulen."
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:88
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr ""
-"Denne listen inneholder kapittelene som er tilgjengelige i den gjeldende "
-"boken."
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:89
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-"Denne listen inneholder versene som er tilgjengelige i det gjeldende "
-"kapittelet."
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:90
-msgid "This list contains the entries of the current module."
-msgstr "Denne listen inneholder oppføringene til den gjeldende modulen."
-
-#: bibletime/dummy.h:272 bibletime/whatsthisdef.h:91
-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 ""
-"Denne knappen blar igjennom oppføringene i listen. Trykk på knappen og flytt "
-"musen for å øke eller minske elementet."
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:92
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr "Velg lese-skrive modus eller bare lese modus for skrivbare moduler."
-
-#: bibletime/dummy.h:274 bibletime/whatsthisdef.h:93
-#, fuzzy
-msgid "Save new personal comments."
-msgstr "Lagre den personlige kommentaren."
-
-# Should "text" be "text window"?
-#: bibletime/dummy.h:275 bibletime/whatsthisdef.h:94
-msgid "Clear the text and delete the entry from the module."
-msgstr "Tøm tekstvinduet og slett oppføringen fra modulen."
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:95
-#, fuzzy
-msgid "Toggle bold formatting of the selected text."
-msgstr "Velg mellom fet eller ikke-fet formatering av den valgte teksten."
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:96
-#, fuzzy
-msgid "Toggle italic formatting of the selected text."
-msgstr ""
-"Velg mellom kursiv eller ikke-kursiv formatering av den valgte teksten."
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:97
-#, fuzzy
-msgid "Toggle underlined formatting of the selected text."
-msgstr ""
-"Velg mellom understreket eller ikke-understreket formatering av den valgte "
-"teksten."
-
-#: bibletime/dummy.h:279 bibletime/whatsthisdef.h:98
-msgid "Choose a new font for the selected text."
-msgstr "Velg en ny skrifttype for den valgte teksten."
-
-#: bibletime/dummy.h:280 bibletime/whatsthisdef.h:99
-msgid "Choose a new color for the selected text."
-msgstr "Velg en ny farge for den valgte teksten."
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:100
-msgid "Choose a new fontsize for the selected text."
-msgstr "Velg en ny skriftstørrelse for den valgte teksten."
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:102
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-"Synkroniser det viste verset for denne modulen med det aktive Bibel-vinduet."
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:105
-#, fuzzy
-msgid "Save the displayed chapter as an HTML file."
-msgstr "Lagre det viste kapittelet som en HTML fil."
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:106
-msgid "Select all text."
-msgstr "Merk all tekst."
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:107
-msgid "Copy the displayed text to the clipboard."
-msgstr "Kopier den viste teksten til utklippstavlen."
-
-#: bibletime/dummy.h:291 bibletime/whatsthisdef.h:110
-#, fuzzy
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two buttons "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-"Velg modulene som skal bli brukt i søket.<BR>Bruk de to knappene på høyre "
-"side til å legge til eller slette modulene til listen av de som skal brukes."
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:111
-#, fuzzy
-msgid "Add the selected module to the list on the right."
-msgstr "Legg den valgte modulen til i listen til venstre."
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:112
-#, fuzzy
-msgid "Remove the selected module from the list on the right side."
-msgstr "Slett den valgte modulen fra listen på venstre side."
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:113
-msgid "The list of modules used for the search."
-msgstr "Liste av moduler som skal brukes i søket."
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:115
-#, fuzzy
-msgid ""
-"The text entered in this edit box will be searched for in all selected "
-"modules."
-msgstr ""
-"Teksten som er skrevet inn i denne boksen vil bli søkt etter i alle moduler."
-
-# In the previous comment you used "edit box".
-# Here it is "edit line". Shouldn't the same be used?
-#: bibletime/dummy.h:297 bibletime/whatsthisdef.h:116
-#, fuzzy
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit box above "
-"is searched as a single word."
-msgstr ""
-"Velg dette for å søke etter flere ord.<BR>Hvert ord i denne boksen blir søkt "
-"etter som om det var et enkelt ord."
-
-# edit line or box?
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:117
-#, fuzzy
-msgid ""
-"Select this to search for exactly the same text you entered in the edit box."
-msgstr ""
-"Velg dette for å søke etter den eksakt samme teksten som du skrev inn i "
-"søkeboksen."
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:118
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-"Velg dette for å søke med å bruke standard GNU regulære utrykk.<BR>Les "
-"håndboken for å få en forklaring på hvordan å bruke dette."
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:119
-#, fuzzy
-msgid "Activate this to use a case sensitive search."
-msgstr "Aktiver dette for å søke med forskjell på STORE og små bokstaver."
-
-#: bibletime/dummy.h:302 bibletime/whatsthisdef.h:121
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr "Velg dette hvis du vil søke gjennom alle delene av modulen(e)."
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:122
-#, fuzzy
-msgid ""
-"Select this if you want to use the last search result as the search scope."
-msgstr ""
-"Velg dette hvis du vil bruke det siste søkeresultatet fra hver modul som "
-"søkeområde."
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:123
-msgid "Create a new search scope."
-msgstr "Lag et nytt søkeområde."
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:124
-#, fuzzy
-msgid ""
-"Use a custom scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-"Bruk et eget søkeområde for søket.<BR>Et standard sett av søkeområder "
-"eksisterer."
-
-#: bibletime/dummy.h:306 bibletime/whatsthisdef.h:125
-msgid "Use this button to delete the chosen search scope."
-msgstr "Bruk denne knappen til å slette det valgte søkeområdet."
-
-#: bibletime/dummy.h:308 bibletime/whatsthisdef.h:127
-msgid "Choose a search scope from the combo box"
-msgstr "Velg et søkeområde fra kombo-boksen."
-
-#: bibletime/dummy.h:309 bibletime/whatsthisdef.h:128
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-"Skriv inn ditt eget søkeområde.<BR>For å definere et område bruk \"-\" (f."
-"eks. 1. Mosebok-2. Mosebok),<BR>for å skille forskjellige områder eller "
-"nøkler bruk semikolon (f.eks. 1. Mosebok;Matteus)."
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:129
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-"Denne listen inneholder de tolkede resultatene av søkeområdet som du skrev "
-"inn. Dette resultatet vil bli brukt i søket."
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:130
-msgid "Close this dialog and save the changes."
-msgstr "Lukk denne dialogen og lagre endringene."
-
-#: bibletime/dummy.h:313 bibletime/whatsthisdef.h:132
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-"Liste av moduler som skal brukes i dette søket.<BR>Trykk på en modul for å "
-"se søkeresultatet på høyre side."
-
-#: bibletime/dummy.h:314 bibletime/whatsthisdef.h:133
-msgid "This contains the items found in the selected module."
-msgstr "Denne inneholder elementene som er funnet i den valgte modulen."
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:134
-msgid "This text box shows a preview of the chosen item."
-msgstr "Denne tekstboksen forhåndsviser det valgte elementet."
-
-#: bibletime/dummy.h:317 bibletime/whatsthisdef.h:136
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-"Grafisk analyse av søkeresultatet.<BR>Søylene viser antall elementer funnet "
-"i hver bok av Bibelen eller kommentaren."
-
-#: bibletime/dummy.h:320 bibletime/whatsthisdef.h:139
-msgid "Activate this box to see a daily tip on startup."
-msgstr "Aktiver denne boksen for å se dagens tips ved oppstart."
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:140
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr "Inneholder språkene som kan bli brukt som internasjonale boknavn."
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:141
-#, fuzzy
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr "Aktiver denne boksen for å se dagens tips ved oppstart."
-
-#: bibletime/dummy.h:323 bibletime/whatsthisdef.h:142
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr ""
-
-#: bibletime/dummy.h:324 bibletime/whatsthisdef.h:143
-msgid ""
-"Save the windows in the workspace if BibleTime is closed<BR>and restore them "
-"on the next startup. "
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:145
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This will speed up opening the lexicons a lot, but consume some disk space. "
-"Recommended."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:146
-msgid "The default Bible is used when a hyperlink into a Bible was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:147
-msgid ""
-"The default commentary is used when a hyperlink into a commentary was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:329 bibletime/whatsthisdef.h:148
-msgid "The default lexicon is used when a hyperlink into a lexicon was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:149
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon "
-"was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:150
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon was "
-"clicked"
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:151
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:152
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:154
-#, fuzzy
-msgid "Select an action and change the key binding for the action."
-msgstr "Velg en hendelse og endre på hurtigtastene for denne hendelsen."
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:155
-#, fuzzy
-msgid ""
-"Use this box to select how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-"Velg i denne boksen hvordan skrifttypen er brukt og forandre skrifttypen i "
-"skrift velgeren."
-
-#: bibletime/dummy.h:339 bibletime/whatsthisdef.h:158
-msgid "This is the background color used in display windows."
-msgstr "Dette er bakgrunnsfargen som blir brukt i visnings vinduene."
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:159
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr "Dette er fargen på det gjeldende verset i visnings vinduene."
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:161
-#, fuzzy
-msgid "Set the keyboard accelerators used in all display windows"
-msgstr "Dette er bakgrunnsfargen som blir brukt i visnings vinduene."
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:162
-#, fuzzy
-msgid "Set keyboard accelerators used in Bible windows"
-msgstr "Definer hurtigtaster"
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:163
-#, fuzzy
-msgid "Set the keyboard accelerators used in commentary windows"
-msgstr "Definer hurtigtaster"
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:164
-#, fuzzy
-msgid "Set the keyboard accelerators used in lexicon windows"
-msgstr "Definer hurtigtaster"
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:168
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-"Start utskrfts prosessen.<BR>Elementene i denne listen vil bli skrevet ut "
-"ved bruk av de tilordnede stilene."
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:169
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-"Skriv ut til en midlertidig fil og åpne en postscript-fremviser til å "
-"forhåndsvise utskrifts resultatet."
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:170
-#, fuzzy
-msgid "Closes this dialog without doing anything else."
-msgstr ""
-"Lukker denne dialogen uten å gjøre noenting med verken elementene eller "
-"skriveren."
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:171
-msgid "Open the online help of BibleTime."
-msgstr "�ner hjelpefunksjonen til BibleTime."
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:173
-#, fuzzy
-msgid "This combo box contains the available print styles."
-msgstr "Denne kombo-boksen inneholder de tilgjengelige utskriftsstilene."
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:174
-msgid "This is the list which contains the available print items."
-msgstr "Dette er listen som inneholder de tilgjengelige utskrifts elementene."
-
-#: bibletime/dummy.h:356 bibletime/whatsthisdef.h:175
-#, fuzzy
-msgid "Move the selected item up one item."
-msgstr "Flytt det valgte elementet ett element lavere."
-
-#: bibletime/dummy.h:357 bibletime/whatsthisdef.h:176
-#, fuzzy
-msgid "Move the selected item down one item."
-msgstr "Flytt det valgte elementet ett element høyere."
-
-#: bibletime/dummy.h:358 bibletime/whatsthisdef.h:177
-msgid "Delete the selected items."
-msgstr "Slett det valgte elementet."
-
-#: bibletime/dummy.h:359 bibletime/whatsthisdef.h:178
-#, fuzzy
-msgid ""
-"Inserts a page break into the list.<BR>The printer will start a new page."
-msgstr ""
-"Sett inn et sideskift i listen.<BR>Skriveren vil begynne på en ny side."
-
-#: bibletime/dummy.h:361 bibletime/whatsthisdef.h:180
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr "Denne gruppen inneholder rammene på siden målt i millimeter."
-
-#: bibletime/dummy.h:362 bibletime/whatsthisdef.h:181
-#, fuzzy
-msgid "The size of the border on the left side of the paper."
-msgstr "Størrelsen på rammen på venstre side på papirarket."
-
-#: bibletime/dummy.h:363 bibletime/whatsthisdef.h:182
-#, fuzzy
-msgid "The size of the border on the right side of the paper."
-msgstr "Størrelsen på rammen på høyre side på papirarket."
-
-#: bibletime/dummy.h:364 bibletime/whatsthisdef.h:183
-#, fuzzy
-msgid "The size of the border on the top of the paper."
-msgstr "Størrelsen på rammen på toppen av papirarket."
-
-#: bibletime/dummy.h:365 bibletime/whatsthisdef.h:184
-#, fuzzy
-msgid "The size of the border on the bottom of the paper."
-msgstr "Størrelsen på rammen på bunnen av papirarket."
-
-#: bibletime/dummy.h:366 bibletime/whatsthisdef.h:185
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-"Denne listen inneholder de tilgjengelige utskriftsstilene.<BR>Lag dine egne "
-"ved å bruke \"Ny stil\" knappen."
-
-#: bibletime/dummy.h:367 bibletime/whatsthisdef.h:186
-msgid "Remove the selected printing style from the list."
-msgstr "Fjern den valgte utskriftsstilen fra listen."
-
-#: bibletime/dummy.h:368 bibletime/whatsthisdef.h:187
-msgid "Change the properties of the selected printing style."
-msgstr "Endre på egenskapene til den valgte utskriftsstilen."
-
-#: bibletime/dummy.h:369 bibletime/whatsthisdef.h:188
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr "Lag en ny utskriftsstil.<BR>Den nye stilen vil bli lagt til i listen."
-
-#~ msgid "Save verse with text as ..."
-#~ msgstr "Lagre vers med tekst som ..."
-
-#~ msgid "The bible window"
-#~ msgstr "Bibelvinduet"
-
-#~ msgid "The commentary window"
-#~ msgstr "Kommentarvinduet"
-
-#~ msgid "The lexicon window"
-#~ msgstr "Leksikonvinduet"
-
-#~ msgid "The list of printers"
-#~ msgstr "Liste av skrivere"
-
-#, fuzzy
-#~ msgid "Print to a file"
-#~ msgstr "Skriv til fil"
-
-#~ msgid "Browse for the file"
-#~ msgstr "Bla igjennom etter filen"
-
-#, fuzzy
-#~ msgid "Number of copies"
-#~ msgstr "&Antall kopier"
-
-#~ msgid "Paper type"
-#~ msgstr "Papirtype"
-
-#~ msgid "Paper size"
-#~ msgstr "Papirstørrelse"
-
-#~ msgid "This is the Bible display window"
-#~ msgstr "Dette er Bibel visnings vinduet."
-
-#~ msgid "This is the commentary display window."
-#~ msgstr "Dette er kommentar visnings vinduet."
-
-#~ msgid "This is the lexicon display window."
-#~ msgstr "Dette er leksikon visnings vinduet."
-
-#~ msgid ""
-#~ "This is the list of available printers of your system.<BR>Please select "
-#~ "the printer you want to use for printing."
-#~ msgstr ""
-#~ "Dette er listen av tilgjengelige skrivere til systemet ditt.<BR>Velg den "
-#~ "skriveren du vil bruke til utskrift."
-
-#, fuzzy
-#~ msgid "Print to a postscript file on disk."
-#~ msgstr "Skriv til en postscript-fil til disk."
-
-#, fuzzy
-#~ msgid "Browse for the file you want to print to."
-#~ msgstr "Bla igjennom etter filen du vil skrive til."
-
-#, fuzzy
-#~ msgid "The number of copies for printing."
-#~ msgstr "Antall kopier av utskrift."
-
-#, fuzzy
-#~ msgid "Choose the orientation of the paper."
-#~ msgstr "Velg orienteringen til papiret."
-
-#, fuzzy
-#~ msgid "Print on the paper using \"Portrait\" orientation."
-#~ msgstr "Skriv ut på papir ved å bruke \"Portrett\" som orientering."
-
-#, fuzzy
-#~ msgid "Print on the paper using \"Landscape\" orientation."
-#~ msgstr "Skriv ut på papir ved å bruke \"Landskap\" som orientering."
-
-#~ msgid "The type of the paper which is used for printing."
-#~ msgstr "Type papir som blir brukt ved utskrift."
-
-#, fuzzy
-#~ msgid "The size of the paper used."
-#~ msgstr "Størrelsen på det brukte papiret."
-
-#~ msgid "Search result for \"%1\" in module \"%2\"\n"
-#~ msgstr "Søk i resultat for \"%1\" i modul \"%2\"\n"
-
-#~ msgid "Printdialog"
-#~ msgstr "Utskriftsdialog"
-
-#~ msgid "The general options for printing"
-#~ msgstr "De generelle alternativene for utskrift"
-
-#~ msgid "Available printers:"
-#~ msgstr "Tilgjengelige skrivere:"
-
-#~ msgid "Host"
-#~ msgstr "Vert"
-
-#~ msgid "Comment"
-#~ msgstr "Kommentar"
-
-#~ msgid "Print to file:"
-#~ msgstr "Skriv til fil:"
-
-#~ msgid "&Number of copies"
-#~ msgstr "&Antall kopier"
-
-#~ msgid "Por&trait"
-#~ msgstr "Por&trett"
-
-#~ msgid "L&andscape"
-#~ msgstr "L&andskap"
-
-#~ msgid "Paper t&ype"
-#~ msgstr "Papirt&ype"
-
-#~ msgid "Size: 8888mm x 8888mm"
-#~ msgstr "Størrelse: 8888mm x 8888mm"
-
-#~ msgid "Preview application:"
-#~ msgstr "Forhåndsvis med:"
-
-#~ msgid "*.ps | Postscript files"
-#~ msgstr "*.ps | Postscript filer"
-
-#~ msgid "A4"
-#~ msgstr "A4"
-
-#~ msgid "A5"
-#~ msgstr "A5"
-
-#~ msgid "Letter"
-#~ msgstr "Letter"
-
-#~ msgid "Legal"
-#~ msgstr "Legal"
-
-#~ msgid "Executive"
-#~ msgstr "Executive"
-
-#~ msgid "Layout specific settings"
-#~ msgstr "Utseende spesifikke instillinger"
-
-#~ msgid "Entries"
-#~ msgstr "Oppføringer"
-
-#~ msgid "Management of BibleTime's printing queue"
-#~ msgstr "Administrering av BibleTimes utskriftskø"
-
-#~ msgid "Size: %1mm x %2mm"
-#~ msgstr "Størrelse: %1mm x %2mm"
-
-#~ msgid "Useful tips for BibleTime"
-#~ msgstr "Nyttige tips for BibleTime"
-
-#~ msgid "Run on startup"
-#~ msgstr "Kjør ved oppstart"
-
-#, fuzzy
-#~ msgid "Language:"
-#~ msgstr "Språkliste"
-
-#, fuzzy
-#~ msgid "Foonotes:"
-#~ msgstr "Fotnoter"
-
-#~ msgid "Strong's numbers: %1<BR>"
-#~ msgstr "Strongs nummer: %1<BR>"
-
-#~ msgid "Unlock key:"
-#~ msgstr "Nøkkel:"
-
-#~ msgid "Version:"
-#~ msgstr "Versjon:"
-
-#, fuzzy
-#~ msgid "Not necessary"
-#~ msgstr "<I>Ikke nødvendig!</I>"
-
-#~ msgid "Datapath"
-#~ msgstr "Datasti"
-
-#~ msgid ""
-#~ "<qt><B>The file does already exist!</B><BR>Do you want to overwrite it?</"
-#~ "qt>"
-#~ msgstr ""
-#~ "<qt><B>Filen eksisterer allerede!</B><BR>Vil du overskrive den?</qt>"
-
-#~ msgid "BibleTime - Save file as ..."
-#~ msgstr "BibleTime - Lagre fil som ..."
-
-#~ msgid "Printing %1"
-#~ msgstr "Skriver ut %1"
-
-#, fuzzy
-#~ msgid "Startup options"
-#~ msgstr "Start utskrift"
-
-#, fuzzy
-#~ msgid "SWORD options"
-#~ msgstr "Start utskrift"
-
-#, fuzzy
-#~ msgid "Configure BibleTime's key bindings"
-#~ msgstr "Konfigurer BibleTimes hurtigtaster"
-
-#, fuzzy
-#~ msgid "Display windows"
-#~ msgstr "Visnings vindu"
-
-#, fuzzy
-#~ msgid "General settings for display windows"
-#~ msgstr "Lukk alle åpne vinduer"
-
-#, fuzzy
-#~ msgid "Colors used in display windows"
-#~ msgstr "Lukk alle åpne vinduer"
-
-#~ msgid "Choose fonts for BibleTime"
-#~ msgstr "Velg skrifttyper for BibleTime"
-
-#~ msgid "Choose the area of application and set the font for it"
-#~ msgstr "Velg en del av applikasjonen og velg skrifttypen for denne"
-
-#, fuzzy
-#~ msgid "Accelerators used by all windows"
-#~ msgstr "Lukk alle vinduer"
-
-#, fuzzy
-#~ msgid "Accelerators for bible windows"
-#~ msgstr "Bibelvinduet"
-
-#, fuzzy
-#~ msgid "Accelerators for commentary windows"
-#~ msgstr "Kommentarvinduet"
-
-#, fuzzy
-#~ msgid "Accelerators for lexicon windows"
-#~ msgstr "Leksikonvinduet"
-
-#, fuzzy
-#~ msgid "Initializing keyboard accelerators"
-#~ msgstr "Definer hurtigtaster"
-
-#~ msgid "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-#~ msgstr "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-
-#~ msgid "Display window"
-#~ msgstr "Visnings vindu"
-
-#, fuzzy
-#~ msgid "Display window Unicode"
-#~ msgstr "Visnings vindu"
-
-#, fuzzy
-#~ msgid ""
-#~ "* | Text files\n"
-#~ " *.* | All files (*.*)"
-#~ msgstr ""
-#~ "*.txt | Tekst filer\n"
-#~ " *.* | Alle filer (*.*)"
-
-#~ msgid "Show a daily tip"
-#~ msgstr "Vis dagens tips"
-
-#~ msgid "List of modules"
-#~ msgstr "Modulliste"
-
-#~ msgid "Show a preview"
-#~ msgstr "Forhåndsvis"
-
-#~ msgid "Copies"
-#~ msgstr "Kopier"
-
-#~ msgid "List of styles"
-#~ msgstr "Stilliste"
-
-#~ msgid "Delete the chosen printing style"
-#~ msgstr "Slett den valgte utskriftsstilen"
-
-#~ msgid "Edit the chosen printing style"
-#~ msgstr "Rediger den valgte utskriftsstilen"
-
-# Should "..depending on the current state"
-# be removed?
-#~ msgid "Show or hide the main index depending on current state."
-#~ msgstr "Vis eller skjul hovedindekset avhengig av nåværende tilstand."
-
-# Look at comment :209
-#~ msgid "Show or hide the main toolbar depending on current state."
-#~ msgstr "Vis eller skjul hovedverktøylinjen avhengig av nåværende tilstand."
-
-# Look at comment :209
-#~ msgid ""
-#~ "Show or hide the footnotes in the modules deoending on current state."
-#~ msgstr "Vis eller skjul fotnotene avhengig av nåværende tilstand."
-
-#~ msgid "Arrange the opened display windows in a tile pattern."
-#~ msgstr "Flislegg de åpnede vinduene."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a tile pattern if "
-#~ "it's necessary."
-#~ msgstr "De åpnede vinduene vil automatisk bli flislagt hvis nødvendig."
-
-#~ msgid "Arrange the open display windows in a cascade pattern."
-#~ msgstr "Overlapp de åpnede vinduene."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a cascade pattern "
-#~ "if it's necessary."
-#~ msgstr ""
-#~ "De åpnede vinduene vil automatisk overlappe hverandre hvis nødvendig."
-
-#~ msgid "Open a dialog where you can edit the toolbar of BibleTime."
-#~ msgstr "�ne en dialog der du kan redigere verktøylinjen til BibleTime."
-
-#~ msgid "Activate this to see a startup logo on each startup of BibleTime."
-#~ msgstr ""
-#~ "Aktiver dette for å se en oppstartslogo ved hver oppstart av BibleTime."
-
-#~ msgid "This list contains the modules using foreign fonts."
-#~ msgstr ""
-#~ "Denne listen inneholder modulene som bruker utenlandske skrifttyper."
-
-#~ msgid "&Show footnotes"
-#~ msgstr "&Vis fotnoter"
-
-#~ msgid "S&how Strong's numbers"
-#~ msgstr "V&is Strongs nummer"
-
-#, fuzzy
-#~ msgid "Frontend"
-#~ msgstr "Skrifttype:"
-
-#~ msgid "handbook"
-#~ msgstr "håndbok"
-
-#~ msgid "Martin Luther startup logo"
-#~ msgstr "Martin Luther oppstartslogo"
-
-#~ msgid "Sponsor of www.bibletime.de"
-#~ msgstr "Sponsoren til www.bibletime.de"
-
-#~ msgid "backend"
-#~ msgstr "backend"
-
-# In my opinion this is a little unclear,
-# has he given or recieved help? (ok,
-# it is not so difficult to imagine but you get
-# my point?)
-#~ msgid ""
-#~ "Leader of the SWORD project.\n"
-#~ "Lots of help with the SWORD API!"
-#~ msgstr ""
-#~ "Lederen av SWORD prosjektet\n"
-#~ "Mye hjelp med SWORD APIen!"
-
-#~ msgid "Module fonts"
-#~ msgstr "Skrifttype for modulene"
-
-#~ msgid "Configure the fonts used for modules"
-#~ msgstr "Konfigurer skrifttypene som skal brukes for modulene"
-
-#~ msgid "Result with text"
-#~ msgstr "Resultat med tekst"
-
-#~ msgid "Left"
-#~ msgstr "Venstre"
-
-#~ msgid "Center"
-#~ msgstr "Sentrert"
-
-#~ msgid "Right"
-#~ msgstr "Høyre"
-
-#~ msgid "&Bottom"
-#~ msgstr "&Bunn"
-
-#~ msgid "Select all"
-#~ msgstr "Velg alt"
-
-#~ msgid "Configure BibleTime's general options"
-#~ msgstr "Konfigurer BibleTimes generelle alternativer"
-
-#~ msgid ""
-#~ "<DIV align=\"center\"><B>Missing tips!</B></DIV><BR><BR>Your installation "
-#~ "is missing the daily tips.\t\tPlease make sure all files of BibleTime are"
-#~ "\t\tinstalled and that the permissions of $KDEDIR are correct!<BR><BR>\t"
-#~ "\tIf you can't solve this problem please contact the team of BibleTime at"
-#~ "\t\t<A HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-#~ msgstr ""
-#~ "<DIV align=\"center\"><B>Tipsene mangler!</B></DIV><BR><BR>Installasjonen "
-#~ "din mangler tipsdatabasen.\t\tForsikre deg om at alle filene til "
-#~ "BibleTime er\t\tinstallert og at tilgangen til $KDEDIR er korrekt!<BR><BR>"
-#~ "\t\tHvis du ikke klarer å løse problemet så kan du kontakte BibleTime "
-#~ "teamet på\t\t<A HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-
-#~ msgid "Foonotes: %1<BR>"
-#~ msgstr "Fotnoter: %1<BR>"
-
-#~ msgid "BibleTime - Help window"
-#~ msgstr "BibleTime - Hjelpevindu"
diff --git a/bibletime-doc/po/pl.po b/bibletime-doc/po/pl.po
deleted file mode 100644
index 31e59a5..0000000
--- a/bibletime-doc/po/pl.po
+++ /dev/null
@@ -1,2129 +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-06-10 20:57+0200\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=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr ""
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:72
-msgid "Clear printing queue"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:87 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:92
-msgid "Search in module(s)"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:97
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:312
-msgid "Remove selected item(s)"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:102
-msgid "&Show footnotes"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:107
-msgid "S&how Strong's numbers"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:116
-msgid "&Show main index"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:128
-msgid "&Cascade"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:133
-msgid "&Tile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:138
-msgid "&Auto cascade"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:143
-msgid "A&uto Tile"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:148
-msgid "&Close all"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:169
-msgid "&Daily tip"
-msgstr ""
-
-#: bibletime/main.cpp:70
-msgid "Enable debug messages."
-msgstr ""
-
-#: bibletime/main.cpp:78
-msgid "Bible study tool for KDE 2"
-msgstr ""
-
-#: bibletime/main.cpp:80
-msgid "(c)1999-2001, The BibleTime Team"
-msgstr ""
-
-#: bibletime/main.cpp:81
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for new developers, translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-
-#: bibletime/main.cpp:87
-msgid "Project coordinator, frontend, backend"
-msgstr ""
-
-#: bibletime/main.cpp:88
-msgid "Frontend, backend, misc things"
-msgstr ""
-
-#: bibletime/main.cpp:91
-msgid "Handbook"
-msgstr ""
-
-#: bibletime/main.cpp:94
-msgid "Translation into Hungarian"
-msgstr ""
-
-#: bibletime/main.cpp:95 bibletime/main.cpp:104
-msgid "Translation into Italian"
-msgstr ""
-
-#: bibletime/main.cpp:96
-msgid "Translation into Polish"
-msgstr ""
-
-#: bibletime/main.cpp:97
-msgid "Translation into Danish"
-msgstr ""
-
-#: bibletime/main.cpp:98
-msgid "Translation into Norwegian"
-msgstr ""
-
-#: bibletime/main.cpp:99
-msgid "Translation into Brazilian Portoguese"
-msgstr ""
-
-#: bibletime/main.cpp:100
-msgid "Translation into Dutch"
-msgstr ""
-
-#: bibletime/main.cpp:101
-msgid "Translation into French"
-msgstr ""
-
-#: bibletime/main.cpp:102
-msgid "Translation into Czech"
-msgstr ""
-
-#: bibletime/main.cpp:103 bibletime/main.cpp:105
-msgid "Translation into Portoguese"
-msgstr ""
-
-#: bibletime/main.cpp:106
-msgid "Translation into Slovak"
-msgstr ""
-
-#: bibletime/main.cpp:109
-msgid "Bible study HowTo"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:56
-#: bibletime/main.cpp:110
-msgid "Optionsdialog"
-msgstr ""
-
-#: bibletime/main.cpp:111
-msgid "handbook"
-msgstr ""
-
-#: bibletime/main.cpp:112
-msgid "Martin Luther startup logo"
-msgstr ""
-
-#: bibletime/main.cpp:113
-msgid "Sponsor of www.bibletime.de"
-msgstr ""
-
-#: bibletime/main.cpp:114
-msgid "backend"
-msgstr ""
-
-#: bibletime/main.cpp:115
-msgid ""
-"Leader of the SWORD project.\n"
-"Lots of help with the SWORD API!"
-msgstr ""
-
-#: bibletime/bibletime.cpp:175 bibletime/bibletime.cpp:190
-#: bibletime/bibletime_slots.cpp:98 bibletime/bibletime_slots.cpp:107
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:95
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:297
-msgid "Display window"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:288
-msgid "Printing..."
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:288
-msgid "Abort printing"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:313
-#, c-format, ycp-format
-msgid "Printing %1"
-msgstr ""
-
-#: bibletime/printing/cstylelist.cpp:46
-msgid "Name:"
-msgstr ""
-
-#: bibletime/printing/cprinter.cpp:310 bibletime/printing/cprinter.cpp:341
-#: bibletime/printing/cprinter.cpp:519 bibletime/printing/cprinter.cpp:527
-#: bibletime/printing/cprinterdialog.cpp:616
-#: bibletime/printing/cstyleeditordialog.cpp:182
-#: bibletime/printing/cstylelist.cpp:130
-msgid "Standard"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:42
-msgid "unknown name"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-#: bibletime/printing/cprintitemlist.cpp:48
-msgid "Module"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:49
-msgid "From"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:50
-msgid "To"
-msgstr ""
-
-#: bibletime/printing/cprintitemlist.cpp:51
-msgid "Style"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:43
-msgid "style editor"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:67
-msgid "Name of style:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-msgid "Choose the part of the style:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:77
-#: bibletime/printing/cstyleeditordialog.cpp:281
-msgid "Header"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:593
-#: bibletime/printing/cstyleeditordialog.cpp:78
-#: bibletime/printing/cstyleeditordialog.cpp:285
-msgid "Description"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:79
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Module text"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:85
-msgid "Enable this part"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:468
-#: bibletime/printing/cstyleeditordialog.cpp:96
-msgid "Left"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:470
-#: bibletime/printing/cstyleeditordialog.cpp:97
-msgid "Center"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:472
-#: bibletime/printing/cstyleeditordialog.cpp:98
-msgid "Right"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:109
-msgid "Foreground:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:120
-msgid "Background:"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:131
-msgid "Choose font"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:134
-msgid "Font preview"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:148
-msgid "Use frame"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:158
-msgid "Line thickness (in point):"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:166
-msgid "Frame color:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:64
-msgid "Printdialog"
-msgstr ""
-
-#: bibletime/dummy.h:123 bibletime/printing/cprinterdialog.cpp:65
-#: bibletime/tooltipdef.h:123
-msgid "Preview"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:166
-#: bibletime/printing/cprinterdialog.cpp:89
-msgid "General"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:89
-msgid "The general options for printing"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:92
-msgid "Available printers:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:97
-msgid "Printer"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:98
-msgid "Host"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:99
-msgid "Comment"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:106
-msgid "Print to file:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-#: bibletime/printing/cprinterdialog.cpp:120
-msgid "Search"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:141
-msgid "&Number of copies"
-msgstr ""
-
-#: bibletime/dummy.h:153 bibletime/printing/cprinterdialog.cpp:149
-#: bibletime/tooltipdef.h:153
-msgid "Orientation"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:153
-msgid "Por&trait"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:157
-msgid "L&andscape"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:173
-msgid "Paper t&ype"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:177
-msgid "Size: 8888mm x 8888mm"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:196
-msgid "Preview application:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:292
-msgid "*.ps | Postscript files"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:335
-msgid "A4"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:336
-msgid "A5"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:337
-msgid "Letter"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:338
-msgid "Legal"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:339
-msgid "Executive"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:370
-msgid "Layout specific settings"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:373
-msgid "Margins (in millimeter)"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:381
-msgid "&Top"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:382
-msgid "&Bottom"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:383
-msgid "&Left"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:384
-msgid "&Right"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:433
-msgid "List of style items:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:471
-msgid "Entries"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:471
-msgid "Management of BibleTime's printing queue"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:481
-msgid "Choose a style"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:493
-msgid "Entries which should be printed:"
-msgstr ""
-
-#: bibletime/printing/cprinterdialog.cpp:540
-#, c-format, ycp-format
-msgid "Size: %1mm x %2mm"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:63
-msgid "Synchronize..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:68
-msgid "Edit entry..."
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:78
-msgid "Commentary window"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:81
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:66
-msgid "Entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:82
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:67
-msgid "Text of entry"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:83
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:88
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:68
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:73
-msgid "Entry with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:75
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:70
-msgid "Selected text"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:91
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:76
-msgid "Entry as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:92
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:77
-msgid "Entry as HTML"
-msgstr ""
-
-#: bibletime/dummy.h:95 bibletime/frontend/presenters/cbiblepresenter.cpp:86
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:94
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:79
-#: bibletime/tooltipdef.h:95
-msgid "Select all"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:87
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:95
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:80
-msgid "Lookup selected text in lexicon"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:89
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:97
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:82
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:401
-msgid "Copy..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:90
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:98
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:83
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:402
-msgid "Add to printing queue..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:91
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:403
-msgid "Save..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:67
-msgid "Bible window"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:70
-msgid "Verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:71
-msgid "Text of verse"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:72
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:78
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:82
-msgid "Verse with text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:73
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:79
-msgid "Chapter"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:83
-msgid "Chapter as plain text"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:84
-msgid "Chapter as HTML"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:225
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:300
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:300
-msgid "Save verse with text as ..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-msgid "Select additional modules"
-msgstr ""
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:51
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:121
-msgid "NONE"
-msgstr ""
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:63
-msgid "Lexicon window"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:76
-msgid "Accelerators"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:76
-msgid "Configure BibleTime's key bindings"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:86
-msgid "Choose fonts for BibleTime"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:90
-msgid "Choose the area of application and set the font for it"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:101
-msgid "The quick brown fox jumped over the lazy dog"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:109
-msgid "Module fonts"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:109
-msgid "Configure the fonts used for modules"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:134
-msgid "Colors"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:134
-msgid "Configure BibleTime's colors"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:141
-msgid "Background"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:158
-msgid "Highlighted Verse"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:166
-msgid "Configure BibleTime's general options"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:170
-msgid "Show tip of the day"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:187
-msgid "Language for booknames"
-msgstr ""
-
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:192
-msgid "English"
-msgstr ""
-
-#: bibletime/dummy.h:130
-#: bibletime/frontend/optionsdialog/coptionsdialog.cpp:211
-#: bibletime/tooltipdef.h:130
-msgid "Show startuplogo"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:172
-msgid "<I>module not set</I>"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-msgid "Search Dialog"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:51
-msgid "Interrupt"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:94
-msgid "Choose modules"
-msgstr ""
-
-#: bibletime/dummy.h:99 bibletime/frontend/searchdialog/csearchdialog.cpp:94
-#: bibletime/tooltipdef.h:99
-msgid "Choose the modules for the search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:98
-msgid "Search Text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:98
-msgid "Enter the text to search for"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:102
-msgid "Search Result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:102
-msgid "The result of your search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:106
-msgid "Search Analysis"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:106
-msgid "Graphical analysis of your search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialoganalysis.cpp:316
-#, ycp-format
-msgid "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:57
-msgid "Search properties"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:75
-msgid "Multiple Words"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:83
-msgid "Exact Search"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:90
-msgid "Regular Expression"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:103
-msgid "Case Sensitive"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:107
-msgid "Search scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:111
-msgid "Search progress"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:116
-msgid "Current module:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:117
-msgid "Overall:"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-msgid "Search result with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Result with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:203
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:240
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:273
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:318
-#, ycp-format
-msgid "Search result for \"%1\" in module \"%2\"\n"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:232
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:312
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:549
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:580
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:232
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:312
-msgid "Save search result ..."
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:391
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:398
-msgid "Key"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:392
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:395
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:399
-msgid "Key with text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:549
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:580
-msgid "Save key ..."
-msgstr ""
-
-#: bibletime/dummy.h:110
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:110
-msgid "No scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:216
-msgid "Choose custom range"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:217
-msgid "Define range text"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:218
-msgid "Range parsing results"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:282
-msgid "Range name"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:282
-msgid "Please enter a name for the new range"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:68
-msgid "Useful tips for BibleTime"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:100
-msgid "Run on startup"
-msgstr ""
-
-#: bibletime/frontend/ctipwindow.cpp:120
-msgid ""
-"<DIV align=\"center\"><B>Missing tips!</B></DIV><BR><BR>Your installation is "
-"missing the daily tips.\t\tPlease make sure all files of BibleTime are\t"
-"\tinstalled and that the permissions of $KDEDIR are correct!<BR><BR>\t\tIf "
-"you can't solve this problem please contact the team of BibleTime at\t\t<A "
-"HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:198
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:218
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:218
-msgid "Save text as HTML page ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:225
-msgid "Save text as plain text ..."
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:453
-msgid "Choose a font:"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:457
-msgid "Choose font size"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:461
-msgid "Bold"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:465
-msgid "Underlined"
-msgstr ""
-
-#: bibletime/frontend/chtmlwidget.cpp:474
-msgid "Justify"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:182
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:193
-msgid "unknown"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:220
-msgid "Bookmark to"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-#, ycp-format
-msgid "Foonotes: %1<BR>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:247
-#, ycp-format
-msgid "Strong's numbers: %1<BR>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:249
-msgid "Unlock key:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:249
-msgid "not set"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:251
-msgid "Version:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:253
-msgid "Font:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:170
-msgid "Bibles"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:173
-msgid "Commentaries"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:176
-msgid "Lexicons"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:284
-msgid "Caption"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:292
-msgid "Main index"
-msgstr ""
-
-#: bibletime/dummy.h:51 bibletime/frontend/groupmanager/cgroupmanager.cpp:293
-#: bibletime/tooltipdef.h:51
-msgid "Create a new folder"
-msgstr ""
-
-#: bibletime/dummy.h:52 bibletime/frontend/groupmanager/cgroupmanager.cpp:296
-#: bibletime/tooltipdef.h:52
-msgid "Change this folder"
-msgstr ""
-
-#: bibletime/dummy.h:53 bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-#: bibletime/tooltipdef.h:53
-msgid "Change this bookmark"
-msgstr ""
-
-#: bibletime/dummy.h:54 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:54
-msgid "Import bookmarks"
-msgstr ""
-
-#: bibletime/dummy.h:55 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:55
-msgid "Export bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:309
-msgid "Print bookmark"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:315
-msgid "Search in selected module(s)"
-msgstr ""
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:318
-#: bibletime/tooltipdef.h:57
-msgid "Unlock this module"
-msgstr ""
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:321
-#: bibletime/tooltipdef.h:58
-msgid "About this module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:377
-msgid "Bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:377
-msgid "Please enter here the description:"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:415
-msgid "Change bookmark description - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:415
-msgid "Please change the description of the item!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:426
-msgid "Change folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:426
-msgid "Please change the name of the group!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:563
-msgid "<I>Not necessary!</I>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:575
-msgid "Datapath"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:577
-msgid "Version"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:579
-msgid "Unlock key"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:581
-msgid "Writable"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:589
-msgid "Footnotes"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:591
-msgid "Strong's numbers"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:937
-msgid "Enter name of folder - BibleTime"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:937
-msgid "Please enter the name of the folder!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1021
-msgid "BibleTime - Unlock module"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1021
-msgid "Enter the key to unlock the module!"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1178
-msgid "Import bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1186
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1189
-msgid "Import of bookmarks"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1203
-msgid "Export bookmarks ..."
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1553
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1553
-msgid "BibleTime - Reset main index"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:78
-msgid ""
-"<qt><B>The file does already exist!</B><BR>Do you want to overwrite it?</qt>"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:78
-msgid "BibleTime - Save file as ..."
-msgstr ""
-
-#: bibletime/frontend/chtmldialog.cpp:35 bibletime/frontend/chtmldialog.cpp:43
-msgid "BibleTime - Help window"
-msgstr ""
-
-#: bibletime/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr ""
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr ""
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr ""
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr ""
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr ""
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr ""
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr ""
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr ""
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr ""
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-msgid "Edit toolbar"
-msgstr ""
-
-#: bibletime/dummy.h:41 bibletime/tooltipdef.h:41
-msgid "BibleTime's handbook"
-msgstr ""
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Enter \"What's this?\" mode"
-msgstr ""
-
-#: bibletime/dummy.h:43 bibletime/tooltipdef.h:43
-msgid "Send bugreport"
-msgstr ""
-
-#: bibletime/dummy.h:44 bibletime/tooltipdef.h:44
-msgid "Show a daily tip"
-msgstr ""
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "About BibleTime"
-msgstr ""
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "About KDE"
-msgstr ""
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-msgid "The main index"
-msgstr ""
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "Add bookmark to printing queue"
-msgstr ""
-
-#: bibletime/dummy.h:61 bibletime/tooltipdef.h:61
-msgid "The working area"
-msgstr ""
-
-#: bibletime/dummy.h:63 bibletime/tooltipdef.h:63
-msgid "The bible window"
-msgstr ""
-
-#: bibletime/dummy.h:64 bibletime/tooltipdef.h:64
-msgid "The commentary window"
-msgstr ""
-
-#: bibletime/dummy.h:65 bibletime/tooltipdef.h:65
-msgid "The lexicon window"
-msgstr ""
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "Show the next entry"
-msgstr ""
-
-#: bibletime/dummy.h:68 bibletime/tooltipdef.h:68
-msgid "Show the previous entry"
-msgstr ""
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Jump to next verse"
-msgstr ""
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Jump to previous verse"
-msgstr ""
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-msgid "Show next chapter"
-msgstr ""
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-msgid "Show previous chapter"
-msgstr ""
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-msgid "Show next book"
-msgstr ""
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-msgid "Show previous book"
-msgstr ""
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-msgid "List of books"
-msgstr ""
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-msgid "List of chapters"
-msgstr ""
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of verses"
-msgstr ""
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of entries"
-msgstr ""
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "Scroll through the list"
-msgstr ""
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "Edit this entry"
-msgstr ""
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Save this comment"
-msgstr ""
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Delete this comment"
-msgstr ""
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Comment up to"
-msgstr ""
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Set bold"
-msgstr ""
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Set italic"
-msgstr ""
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set underlined"
-msgstr ""
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set font"
-msgstr ""
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set the color"
-msgstr ""
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set the fontsize"
-msgstr ""
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Synchronize with Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:94 bibletime/tooltipdef.h:94
-msgid "Save as HTML"
-msgstr ""
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Copy to clipboard"
-msgstr ""
-
-#: bibletime/dummy.h:100 bibletime/tooltipdef.h:100
-msgid "Add the selected module to the list"
-msgstr ""
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-msgid "Remove the selected module from the list"
-msgstr ""
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "List of modules used for the search"
-msgstr ""
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "Search this text"
-msgstr ""
-
-#: bibletime/dummy.h:105 bibletime/tooltipdef.h:105
-msgid "Search multiple words"
-msgstr ""
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-msgid "Exact match"
-msgstr ""
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search with GNU regular expressions"
-msgstr ""
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Search case sensitive"
-msgstr ""
-
-#: bibletime/dummy.h:111 bibletime/tooltipdef.h:111
-msgid "Last search result"
-msgstr ""
-
-#: bibletime/dummy.h:112 bibletime/tooltipdef.h:112
-msgid "Use own scope"
-msgstr ""
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Add a new scope"
-msgstr ""
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-msgid "Delete this search scope"
-msgstr ""
-
-#: bibletime/dummy.h:115 bibletime/dummy.h:297 bibletime/tooltipdef.h:115
-#: bibletime/whatsthisdef.h:123
-msgid "Edit and define your search scopes"
-msgstr ""
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Choose a search scope from the list"
-msgstr ""
-
-#: bibletime/dummy.h:117 bibletime/tooltipdef.h:117
-msgid "Enter your own search scope"
-msgstr ""
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Parsed result"
-msgstr ""
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Close this dialog"
-msgstr ""
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Used modules"
-msgstr ""
-
-#: bibletime/dummy.h:122 bibletime/tooltipdef.h:122
-msgid "Items found"
-msgstr ""
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Graphical analysis"
-msgstr ""
-
-#: bibletime/dummy.h:128 bibletime/tooltipdef.h:128
-msgid "Show daily tip"
-msgstr ""
-
-#: bibletime/dummy.h:129 bibletime/tooltipdef.h:129
-msgid "List of languages"
-msgstr ""
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-msgid "Set keyboard accelerators"
-msgstr ""
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Choose the area of application"
-msgstr ""
-
-#: bibletime/dummy.h:136 bibletime/dummy.h:317 bibletime/tooltipdef.h:136
-#: bibletime/whatsthisdef.h:143
-msgid "Choose a font"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "List of modules"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "Color of the background"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "Color of the highlighted verse"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid "Start printing"
-msgstr ""
-
-#: bibletime/dummy.h:145 bibletime/tooltipdef.h:145
-msgid "Show a preview"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Open help"
-msgstr ""
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "The list of printers"
-msgstr ""
-
-#: bibletime/dummy.h:150 bibletime/tooltipdef.h:150
-msgid "Print into a file"
-msgstr ""
-
-#: bibletime/dummy.h:151 bibletime/tooltipdef.h:151
-msgid "Browse for the file"
-msgstr ""
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Copies"
-msgstr ""
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Paper type"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Paper size"
-msgstr ""
-
-#: bibletime/dummy.h:159 bibletime/tooltipdef.h:159
-msgid "Styles"
-msgstr ""
-
-#: bibletime/dummy.h:160 bibletime/tooltipdef.h:160
-msgid "List of print items"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Move item up"
-msgstr ""
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-msgid "Move item down"
-msgstr ""
-
-#: bibletime/dummy.h:163 bibletime/tooltipdef.h:163
-msgid "Delete items"
-msgstr ""
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Insert a page break"
-msgstr ""
-
-#: bibletime/dummy.h:166 bibletime/tooltipdef.h:166
-msgid "Page borders"
-msgstr ""
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "Left border"
-msgstr ""
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Right border"
-msgstr ""
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Upper border"
-msgstr ""
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Lower border"
-msgstr ""
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "List of styles"
-msgstr ""
-
-#: bibletime/dummy.h:172 bibletime/tooltipdef.h:172
-msgid "Delete the chosen printing style"
-msgstr ""
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Edit the chosen printing style"
-msgstr ""
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Create a new printing style"
-msgstr ""
-
-#: bibletime/dummy.h:202 bibletime/whatsthisdef.h:28
-msgid ""
-"Clear the printing queue of BibleTime. All items will be removed from the "
-"list, the print button will be disabled."
-msgstr ""
-
-#: bibletime/dummy.h:203 bibletime/whatsthisdef.h:29
-msgid ""
-"Open the printerdialog of BibleTime where you can edit the printing queue "
-"and assign styles to the items."
-msgstr ""
-
-#: bibletime/dummy.h:204 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr ""
-
-#: bibletime/dummy.h:206 bibletime/whatsthisdef.h:32
-msgid "Open the search dialog to search text in one or more modules."
-msgstr ""
-
-#: bibletime/dummy.h:207 bibletime/whatsthisdef.h:33
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder the "
-"subitems of it will be removed, too."
-msgstr ""
-
-#: bibletime/dummy.h:208 bibletime/whatsthisdef.h:34
-msgid ""
-"Reset the main index<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:36
-msgid "Show or hide the main index depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:37
-msgid "Show or hide the main toolbar depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:212 bibletime/whatsthisdef.h:38
-msgid "Show or hide the footnotes in the modules deoending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:39
-msgid ""
-"Show or hide Strong's numbers in the modules depending on current state."
-msgstr ""
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:41
-msgid "Arrange the opened display windows in a tile pattern."
-msgstr ""
-
-#: bibletime/dummy.h:216 bibletime/whatsthisdef.h:42
-msgid ""
-"The open display windows will automatically arranged in a tile pattern if "
-"it's necessary."
-msgstr ""
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:43
-msgid "Arrange the open display windows in a cascade pattern."
-msgstr ""
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:44
-msgid ""
-"The open display windows will automatically arranged in a cascade pattern if "
-"it's necessary."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr ""
-
-#: bibletime/dummy.h:221 bibletime/whatsthisdef.h:47
-msgid "Open a dialog where you can edit the toolbar of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:48
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr ""
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:50
-msgid "Open KDE's helpbrowser with BibleTime's handbook."
-msgstr ""
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:51
-msgid ""
-"Switch into the <B>\"What's this?\"</B> mode.<BR>All important elements of "
-"BibleTime's GUI offer a \"What's this?\" help."
-msgstr ""
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:52
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr ""
-
-#: bibletime/dummy.h:227 bibletime/whatsthisdef.h:53
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:54
-msgid "Show detailed information about BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:229 bibletime/whatsthisdef.h:55
-msgid "Show the general about dialog of KDE 2."
-msgstr ""
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:59
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:60
-msgid ""
-"Create a new folder in the main index.<BR>If you pressed the right mouse "
-"button on a folder the new folder will be a sub-item of it.<BR>Otherwise you "
-"will create a toplevel folder."
-msgstr ""
-
-#: bibletime/dummy.h:235 bibletime/whatsthisdef.h:61
-msgid "Change the properties of the selected folder."
-msgstr ""
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:62
-msgid "Change the properties of the selected bookmark."
-msgstr ""
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:63
-msgid "Import bookmark from a file."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:64
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:65
-msgid ""
-"Use this to add this bookmark to BibleTime's printing queue. The key, the "
-"description and the text of the key will be used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:66
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:67
-msgid "Open a dialog to show information about the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:244 bibletime/whatsthisdef.h:70
-msgid ""
-"This area contains is the working place of Bibletime.<BR>All display windows "
-"are opened in this place."
-msgstr ""
-
-#: bibletime/dummy.h:246 bibletime/whatsthisdef.h:72
-msgid "This is the Bible display window"
-msgstr ""
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:73
-msgid "This is the commentary display window."
-msgstr ""
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:74
-msgid "This is the lexicon display window."
-msgstr ""
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:76
-msgid "The next entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:77
-msgid "The previous entry of the module will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:78
-msgid ""
-"If you view the text of a Bible the next verse will be highlighted.<BR>If "
-"you read a commentary the next entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:79
-msgid ""
-"If you view the text of a Bible the previous verse will be highlighted. If "
-"you read a commentary the next entry will be shown."
-msgstr ""
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:80
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:81
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr ""
-
-#: bibletime/dummy.h:256 bibletime/whatsthisdef.h:82
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:257 bibletime/whatsthisdef.h:83
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:84
-msgid "This list contains the books which are available in this module."
-msgstr ""
-
-#: bibletime/dummy.h:259 bibletime/whatsthisdef.h:85
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr ""
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:86
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:87
-msgid "This list contains the entries of the current module."
-msgstr ""
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:88
-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/dummy.h:263 bibletime/whatsthisdef.h:89
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr ""
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:90
-msgid "Save the personal comment."
-msgstr ""
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:91
-msgid "Clear the text and delete the entry from the module."
-msgstr ""
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:92
-msgid "Switch between bold and non-bold formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:93
-msgid "Switch between italic and non-italic formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:94
-msgid ""
-"Switch between underlined and non-undelined formatting of the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:95
-msgid "Choose a new font for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:96
-msgid "Choose a new color for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:97
-msgid "Choose a new fontsize for the selected text."
-msgstr ""
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:99
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr ""
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:102
-msgid "Save the displayed chapter as a HTML file."
-msgstr ""
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:103
-msgid "Select all text."
-msgstr ""
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:104
-msgid "Copy the displayed text to the clipboard."
-msgstr ""
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:107
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two button "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-
-#: bibletime/dummy.h:282 bibletime/whatsthisdef.h:108
-msgid "Add the selected module to the list on the left."
-msgstr ""
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:109
-msgid "Remove the selected module from the list on the left side."
-msgstr ""
-
-#: bibletime/dummy.h:284 bibletime/whatsthisdef.h:110
-msgid "The list of modules used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:112
-msgid "The text entered in this edit box will be searched in all modules."
-msgstr ""
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:113
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit line is "
-"searched as a single word."
-msgstr ""
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:114
-msgid ""
-"Select this to search for exactly the same text you entered in the edit line."
-msgstr ""
-
-#: bibletime/dummy.h:289 bibletime/whatsthisdef.h:115
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-
-#: bibletime/dummy.h:290 bibletime/whatsthisdef.h:116
-msgid "Activate this to use case sensitive search."
-msgstr ""
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:118
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr ""
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:119
-msgid ""
-"Select this if you want to use the last search result of each module as "
-"search scope."
-msgstr ""
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:120
-msgid "Create a new search scope."
-msgstr ""
-
-#: bibletime/dummy.h:295 bibletime/whatsthisdef.h:121
-msgid ""
-"Use an own scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:122
-msgid "Use this button to delete the chosen search scope."
-msgstr ""
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:124
-msgid "Choose a search scope from the combo box"
-msgstr ""
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:125
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:126
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-
-#: bibletime/dummy.h:301 bibletime/whatsthisdef.h:127
-msgid "Close this dialog and save the changes."
-msgstr ""
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:129
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:130
-msgid "This contains the items found in the selected module."
-msgstr ""
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:131
-msgid "This text box shows a preview of the chosen item."
-msgstr ""
-
-#: bibletime/dummy.h:307 bibletime/whatsthisdef.h:133
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:136
-msgid "Activate this box to see a daily tip on startup."
-msgstr ""
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:137
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-
-#: bibletime/dummy.h:312 bibletime/whatsthisdef.h:138
-msgid "Activate this to see a startup logo on each startup of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:141
-msgid "Select a action and change the key binding for the action."
-msgstr ""
-
-#: bibletime/dummy.h:316 bibletime/whatsthisdef.h:142
-msgid ""
-"Select in this box how the font is used and change the font in the font "
-"chooser."
-msgstr ""
-
-#: bibletime/dummy.h:319 bibletime/whatsthisdef.h:145
-msgid "This list contains the modules using foreign fonts."
-msgstr ""
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:147
-msgid "This is the background color used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:148
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr ""
-
-#: bibletime/dummy.h:325 bibletime/whatsthisdef.h:151
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:152
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:153
-msgid ""
-"Closes this dialog without doing anything with the items or the printer."
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:154
-msgid "Open the online help of BibleTime."
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:156
-msgid ""
-"This is the list of available printers of your system.<BR>Please select the "
-"printer you want to use for printing."
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:157
-msgid "Print into a postscript file on disk."
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:158
-msgid "Browse for the file you want to print into."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:159
-msgid "The number of copies used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:334 bibletime/whatsthisdef.h:160
-msgid "Choose the orientation of the used paper."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:161
-msgid "Print on the paper using \"Portrait\" as orientation."
-msgstr ""
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:162
-msgid "Print on the paper using \"Landscape\" as orientation."
-msgstr ""
-
-#: bibletime/dummy.h:337 bibletime/whatsthisdef.h:163
-msgid "The type of the paper which is used for printing."
-msgstr ""
-
-#: bibletime/dummy.h:338 bibletime/whatsthisdef.h:164
-msgid "The size of the used paper."
-msgstr ""
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:166
-msgid "This combo box contains the available printing styles."
-msgstr ""
-
-#: bibletime/dummy.h:341 bibletime/whatsthisdef.h:167
-msgid "This is the list which contains the available print items."
-msgstr ""
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:168
-msgid "Move the selected item one item above."
-msgstr ""
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:169
-msgid "Move the selected item one item below."
-msgstr ""
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:170
-msgid "Delete the selected items."
-msgstr ""
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:171
-msgid "Inserts a page break into the list.<BR>The printer will start new page."
-msgstr ""
-
-#: bibletime/dummy.h:347 bibletime/whatsthisdef.h:173
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr ""
-
-#: bibletime/dummy.h:348 bibletime/whatsthisdef.h:174
-msgid "The size of the border on the left side of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:175
-msgid "The size of the border on the right side of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:176
-msgid "The size of the border on the top of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:177
-msgid "The size of the border on the bottom of the paper sheet."
-msgstr ""
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:178
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-
-#: bibletime/dummy.h:353 bibletime/whatsthisdef.h:179
-msgid "Remove the selected printing style from the list."
-msgstr ""
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:180
-msgid "Change the properties of the selected printing style."
-msgstr ""
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:181
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr ""
diff --git a/bibletime-doc/po/sk.gmo b/bibletime-doc/po/sk.gmo
deleted file mode 100644
index 0817ede..0000000
--- a/bibletime-doc/po/sk.gmo
+++ /dev/null
diff --git a/bibletime-doc/po/sk.po b/bibletime-doc/po/sk.po
deleted file mode 100644
index 49c6f36..0000000
--- a/bibletime-doc/po/sk.po
+++ /dev/null
@@ -1,3335 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: BibleTime 1\n"
-"POT-Creation-Date: 2002-04-07 01:40+0200\n"
-"PO-Revision-Date: 2001-05-24 12:39GMT\n"
-"Last-Translator: Joachim Ansorg <jansorg@gmx.de>\n"
-"Language-Team: Deutsch <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.1\n"
-
-#: bibletime/backend/cswordbackend.cpp:313
-#: bibletime/frontend/coptionsdialog.cpp:272
-msgid "Footnotes"
-msgstr "Poznámky pod čiarov"
-
-#: bibletime/backend/cswordbackend.cpp:315
-#, fuzzy
-msgid "Strong's Numbers"
-msgstr "Strongové čísla"
-
-#: bibletime/backend/cswordbackend.cpp:317
-msgid "Headings"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:319
-msgid "Morphological Tags"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:321
-msgid "Lemmas"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:323
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:325
-#, fuzzy
-msgid "Hebrew Cantillation"
-msgstr "Orientácia"
-
-#: bibletime/backend/cswordbackend.cpp:327
-msgid "Greek Accents"
-msgstr ""
-
-#: bibletime/backend/cswordbackend.cpp:329
-msgid "Textual Variants"
-msgstr ""
-
-#: bibletime/main.cpp:110
-#, fuzzy
-msgid "Enable debug messages"
-msgstr "Povoľ správy na ladenie programu"
-
-#: bibletime/main.cpp:111
-msgid "Ignore the startup profile saved after the last BibleTime execution."
-msgstr ""
-
-#: bibletime/main.cpp:119
-msgid "Bible study tool for KDE 2"
-msgstr "Nástroj pre biblické štúdium pre KDE2"
-
-#: bibletime/main.cpp:121
-#, fuzzy
-msgid "(c)1999-2002, The BibleTime Team"
-msgstr "(c)1999-2001, The BibleTime Team"
-
-#: bibletime/main.cpp:122
-#, fuzzy
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n"
-"\n"
-"We are looking for translators and handbook authors.\n"
-"If you'd like to join use send an eMail to info@bibletime.de."
-msgstr ""
-"Bibletime je ľahko použiteľný ale výkonný nástroj pre biblické štúdium pre "
-"KDE2 \n"
-"\n"
-"Hľadáme nových vývojárov, prekladateľov a autorov príručky\n"
-"Ak sa chcete k nám pripojiť pošlite eMail na info@bibletime.de."
-
-#: bibletime/main.cpp:130
-#, fuzzy
-msgid "Project coordinator"
-msgstr "Koordinátor projektu, frontend, backend"
-
-#: bibletime/main.cpp:131
-#, fuzzy
-msgid "Frontend, backend"
-msgstr "Frontend, backend, a iné veci"
-
-#: bibletime/main.cpp:132
-#, fuzzy
-msgid "Searchdialog"
-msgstr "Vyhľadávanie"
-
-#: bibletime/main.cpp:138
-msgid "Icons, startlogo, banners"
-msgstr ""
-
-#: bibletime/main.cpp:141
-msgid "Handbook"
-msgstr "Príručka"
-
-#: bibletime/main.cpp:144
-msgid "Translation into Czech"
-msgstr "Preklad do češtiny"
-
-#: bibletime/main.cpp:145
-msgid "Translation into Danish"
-msgstr "Preklad do dánštiny"
-
-#: bibletime/main.cpp:146
-msgid "Translation into Dutch"
-msgstr "Preklad do holandštiny"
-
-#: bibletime/main.cpp:148
-msgid "Translation into French"
-msgstr "Preklad do francúštiny"
-
-#: bibletime/main.cpp:149
-msgid "Translation into Hungarian"
-msgstr "Preklad do maďarčiny"
-
-#: bibletime/main.cpp:150 bibletime/main.cpp:151
-msgid "Translation into Italian"
-msgstr "Preklad do taliančiny"
-
-#: bibletime/main.cpp:152
-msgid "Translation into Norwegian"
-msgstr "Preklad do francúštiny"
-
-#: bibletime/main.cpp:153
-msgid "Translation into Polish"
-msgstr "Preklad do polštiny"
-
-#: bibletime/main.cpp:154
-msgid "Translation into Portoguese"
-msgstr "Preklad do portugalštiny"
-
-#: bibletime/main.cpp:155
-#, fuzzy
-msgid "Translation into Russian"
-msgstr "Preklad do maďarčiny"
-
-#: bibletime/main.cpp:156
-msgid "Translation into Slovak"
-msgstr "Preklad do slovenského jazyka"
-
-#: bibletime/main.cpp:157
-#, fuzzy
-msgid "Translation into Spanish"
-msgstr "Preklad do dánštiny"
-
-#: bibletime/main.cpp:160
-msgid "Bible study HowTo"
-msgstr "Biblické štúdium Ako..."
-
-#: bibletime/main.cpp:185
-#, fuzzy
-msgid "Starting BibleTime"
-msgstr "O BibleTime"
-
-#: bibletime/bibletime_init.cpp:59
-#, fuzzy
-msgid "Creating BibleTime's GUI"
-msgstr "Ukonči BibleTime"
-
-#: bibletime/bibletime_init.cpp:77
-msgid "Initializing menu- and toolbars"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:81
-msgid "Clear printing queue"
-msgstr "Vyčisti tlačovú frontu"
-
-#: bibletime/bibletime_init.cpp:99 bibletime/dummy.h:25
-#: bibletime/tooltipdef.h:25
-msgid "Reset main index"
-msgstr "Znovu nastav hlavný index"
-
-#: bibletime/bibletime_init.cpp:105
-msgid "Search in module(s)"
-msgstr "Hľadaj v modul(e/och)"
-
-#: bibletime/bibletime_init.cpp:111
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:297
-msgid "Remove selected item(s)"
-msgstr "Zmaž vybrané položky"
-
-#: bibletime/bibletime_init.cpp:122
-msgid "&Show main index"
-msgstr "&Zobraz hlavný index"
-
-#: bibletime/bibletime_init.cpp:137
-msgid "&Cascade"
-msgstr "&Kaskáda"
-
-#: bibletime/bibletime_init.cpp:143
-msgid "&Tile"
-msgstr "&Dláždenie"
-
-#: bibletime/bibletime_init.cpp:149
-msgid "&Auto cascade"
-msgstr "&Automatická kaskáda"
-
-#: bibletime/bibletime_init.cpp:155
-msgid "A&uto Tile"
-msgstr "A&utomatické dlaždenie"
-
-#: bibletime/bibletime_init.cpp:161
-msgid "&Close all"
-msgstr "Všetko &zavri"
-
-#: bibletime/bibletime_init.cpp:167
-#, fuzzy
-msgid "&Save profile"
-msgstr "Vytvor novú zložku"
-
-#: bibletime/bibletime_init.cpp:172
-#, fuzzy
-msgid "&Load profile"
-msgstr "Vytvor novú zložku"
-
-#: bibletime/bibletime_init.cpp:177
-#, fuzzy
-msgid "&Configure profiles"
-msgstr "Nastavte farby v BibleTime"
-
-#: bibletime/bibletime_init.cpp:183
-#, fuzzy
-msgid "&Fullscreen mode"
-msgstr "Aktuálny modul:"
-
-#: bibletime/bibletime_init.cpp:202
-#, fuzzy
-msgid "&Handbook"
-msgstr "Príručka"
-
-#: bibletime/bibletime_init.cpp:208
-msgid "&Installation"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:214
-#, fuzzy
-msgid "&Bible Study Howto"
-msgstr "Biblické štúdium Ako..."
-
-#: bibletime/bibletime_init.cpp:229
-msgid "&Daily tip"
-msgstr "Tip na &deň"
-
-#: bibletime/bibletime_init.cpp:294
-msgid "Initializing Sword"
-msgstr ""
-
-#: bibletime/bibletime_init.cpp:341
-msgid "Initializing printing system"
-msgstr ""
-
-#: bibletime/printing/cstyleeditordialog.cpp:40
-msgid "style editor"
-msgstr "editor štýlu"
-
-#: bibletime/printing/cstyleeditordialog.cpp:63
-msgid "Name of style:"
-msgstr "Meno štýlu"
-
-#: bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose the part of the style:"
-msgstr "Zvoľ časť štýlu:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:73
-#: bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Header"
-msgstr "Hlavička"
-
-#: bibletime/printing/cstyleeditordialog.cpp:74
-#: bibletime/printing/cstyleeditordialog.cpp:293
-msgid "Description"
-msgstr "Popis"
-
-#: bibletime/printing/cstyleeditordialog.cpp:75
-#: bibletime/printing/cstyleeditordialog.cpp:297
-msgid "Module text"
-msgstr "Text modulu"
-
-#: bibletime/printing/cstyleeditordialog.cpp:81
-msgid "Enable this part"
-msgstr "Povoľ túto časť"
-
-#: bibletime/printing/cstyleeditordialog.cpp:104
-msgid "Foreground:"
-msgstr "Popredie:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:115
-msgid "Background:"
-msgstr "Pozadie:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:126
-msgid "Choose font"
-msgstr "Vyber písmo"
-
-#: bibletime/printing/cstyleeditordialog.cpp:129
-msgid "Font preview"
-msgstr "Náhľad na písmo"
-
-#: bibletime/printing/cstyleeditordialog.cpp:143
-msgid "Use frame"
-msgstr "Použi rámec"
-
-#: bibletime/printing/cstyleeditordialog.cpp:154
-msgid "Line thickness (in point):"
-msgstr "Hrúbka čiary (v bodoch):"
-
-#: bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr "Farba rámca:"
-
-#: bibletime/printing/cstyleeditordialog.cpp:170
-#, fuzzy
-msgid "Line style:"
-msgstr "Meno štýlu"
-
-#: bibletime/frontend/coptionsdialog.cpp:218
-#: bibletime/frontend/coptionsdialog.cpp:735
-#: bibletime/printing/cprintdialogpages.cpp:176
-#: bibletime/printing/cprinter.cpp:307 bibletime/printing/cprinter.cpp:316
-#: bibletime/printing/cstyle.cpp:180
-#: bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr "Štandard"
-
-#: bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr "Meno:"
-
-#: bibletime/printing/cstyle.cpp:181
-msgid "Colored style for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:182
-msgid "Black&White for larger test portions"
-msgstr ""
-
-#: bibletime/printing/cstyle.cpp:187
-msgid "unknown name"
-msgstr "neznámy"
-
-#: bibletime/dummy.h:166 bibletime/printing/cprintdialogpages.cpp:43
-#: bibletime/tooltipdef.h:166
-msgid "Styles"
-msgstr "Štýly"
-
-#: bibletime/printing/cprintdialogpages.cpp:48
-msgid "Margins (in millimeter)"
-msgstr "Ohraničenie (v milimetroch)"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Top"
-msgstr "&Hore"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Left"
-msgstr "&Vľavo"
-
-#: bibletime/printing/cprintdialogpages.cpp:55
-msgid "&Right"
-msgstr "Vp&ravo"
-
-#: bibletime/printing/cprintdialogpages.cpp:104
-msgid "List of style items:"
-msgstr "Zoznam položiek štýlu:"
-
-#: bibletime/printing/cprintdialogpages.cpp:192
-#, fuzzy
-msgid "Print queue"
-msgstr "Tlačiareň"
-
-#: bibletime/printing/cprintdialogpages.cpp:203
-msgid "Choose a style"
-msgstr "Výber štýlu"
-
-#: bibletime/printing/cprintdialogpages.cpp:215
-msgid "Entries which should be printed:"
-msgstr "Záznamy, ktoré by mali byť vytlačené:"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:239
-#: bibletime/printing/cprintitemlist.cpp:44
-msgid "Module"
-msgstr "Modul"
-
-#: bibletime/printing/cprintitemlist.cpp:45
-msgid "From"
-msgstr "Od"
-
-#: bibletime/printing/cprintitemlist.cpp:46
-msgid "To"
-msgstr "Do:"
-
-#: bibletime/printing/cprintitemlist.cpp:47
-msgid "Style"
-msgstr "Štýl"
-
-#: bibletime/frontend/chtmldialog.cpp:84
-#, fuzzy
-msgid "Backward"
-msgstr "Pozadie"
-
-#: bibletime/frontend/chtmldialog.cpp:102
-msgid "Forward"
-msgstr ""
-
-#: bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr "Ok"
-
-#: bibletime/frontend/chtmlwidget.cpp:264
-#, ycp-format
-msgid "Unable to find the page %1!"
-msgstr "Nie je možné nájsť stránku %1!"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid ""
-"*.html *.htm *.shtml *.shtm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.html *.htm *.shtml *.shtm | HTML súbory\n"
-" *.* | Všetky súbory (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:284
-msgid "Save text as HTML page ..."
-msgstr "Ulož text ako HTML stránku..."
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid ""
-"*.txt | Text file (*.txt)\n"
-"*.* | All files (*.*)"
-msgstr ""
-"*.txt | Textový súbor (*.txt)\n"
-"*.* | Všetky súbory (*.*)"
-
-#: bibletime/frontend/chtmlwidget.cpp:291
-msgid "Save text as plain text ..."
-msgstr "Ulož text ako obyčajný text..."
-
-#: bibletime/frontend/chtmlwidget.cpp:501
-msgid "Choose a font:"
-msgstr "Vyberte typ písma:"
-
-#: bibletime/frontend/chtmlwidget.cpp:505
-msgid "Choose font size"
-msgstr "Vyberte veľkosť typu písma"
-
-#: bibletime/frontend/chtmlwidget.cpp:509
-msgid "Bold"
-msgstr "Tučné"
-
-#: bibletime/frontend/chtmlwidget.cpp:513
-msgid "Underlined"
-msgstr "Podčiarknuté"
-
-#: bibletime/frontend/chtmlwidget.cpp:522
-msgid "Justify"
-msgstr "Zarovnaj"
-
-#: bibletime/frontend/cprofile.cpp:33
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:178
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:189
-msgid "unknown"
-msgstr "neznámy"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:214
-msgid "Bookmark to"
-msgstr "Záložka k"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:539
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:241
-#, fuzzy
-msgid "Language"
-msgstr "Zoznam jazykov"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:549
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:243
-msgid "Unlock key"
-msgstr "Kľúč k odomknutiu"
-
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:244
-msgid "not set"
-msgstr "nenastavené"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:532
-#: bibletime/frontend/groupmanager/cgroupmanageritem.cpp:246
-msgid "Version"
-msgstr "Verzia"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:149
-msgid "Bibles"
-msgstr "Biblie"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:150
-msgid "Books"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:151
-msgid "Commentaries"
-msgstr "Komentáre"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:152
-msgid "Lexicons"
-msgstr "Lexikóny"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:269
-msgid "Caption"
-msgstr "Titulok"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:277
-msgid "Main index"
-msgstr "Hlavný index"
-
-#: bibletime/dummy.h:57 bibletime/frontend/groupmanager/cgroupmanager.cpp:278
-#: bibletime/tooltipdef.h:57
-msgid "Create a new folder"
-msgstr "Vytvor novú zložku"
-
-#: bibletime/dummy.h:58 bibletime/frontend/groupmanager/cgroupmanager.cpp:281
-#: bibletime/tooltipdef.h:58
-msgid "Change this folder"
-msgstr "Zmeň túto zložku"
-
-#: bibletime/dummy.h:59 bibletime/frontend/groupmanager/cgroupmanager.cpp:285
-#: bibletime/tooltipdef.h:59
-msgid "Change this bookmark"
-msgstr "Zmeň záložku"
-
-#: bibletime/dummy.h:60 bibletime/frontend/groupmanager/cgroupmanager.cpp:288
-#: bibletime/tooltipdef.h:60
-msgid "Import bookmarks"
-msgstr "Importuj záložky"
-
-#: bibletime/dummy.h:61 bibletime/frontend/groupmanager/cgroupmanager.cpp:291
-#: bibletime/tooltipdef.h:61
-msgid "Export bookmarks"
-msgstr "Exportuj záložky"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:294
-msgid "Print bookmark"
-msgstr "Vytlač záložku"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:300
-msgid "Search in selected module(s)"
-msgstr "Hľadaj vo zvolenom module"
-
-#: bibletime/dummy.h:63 bibletime/frontend/groupmanager/cgroupmanager.cpp:303
-#: bibletime/tooltipdef.h:63
-msgid "Unlock this module"
-msgstr "Odomkni tento modul"
-
-#: bibletime/dummy.h:64 bibletime/frontend/groupmanager/cgroupmanager.cpp:306
-#: bibletime/tooltipdef.h:64
-msgid "About this module"
-msgstr "O tomto module"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Bookmark description - BibleTime"
-msgstr "Popis záložiek - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:376
-msgid "Please enter here the description:"
-msgstr "Prosím vložte sem popis:"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Change bookmark description - BibleTime"
-msgstr "Zmeňte popis záložiek - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:406
-msgid "Please change the description of the item!"
-msgstr "Zmeňte prosím popis položky!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Change folder - BibleTime"
-msgstr "Zmeňte zložku - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:417
-msgid "Please change the name of the group!"
-msgstr "Zmeňte prosím meno skupiny!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:536
-#, fuzzy
-msgid "Location"
-msgstr "Titulok"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:544
-msgid "Writable"
-msgstr "Zapisovatené"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:545
-#, fuzzy
-msgid "yes"
-msgstr "Štýly"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Encoding"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:219
-#: bibletime/frontend/coptionsdialog.cpp:738
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "Unicode"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:551
-msgid "iso8859-1"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:564
-msgid "Features"
-msgstr ""
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Enter name of folder - BibleTime"
-msgstr "Vlož meno zložky - BibleTime"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:907
-msgid "Please enter the name of the folder!"
-msgstr "Prosím vložte meno zložky!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "BibleTime - Unlock module"
-msgstr "BibleTime - Odomknutie modulu"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:991
-msgid "Enter the key to unlock the module!"
-msgstr "Vlož klúč k odoknutiu modulu!"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1148
-msgid "Import bookmarks ..."
-msgstr "Importuj záložky ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1156
-msgid ""
-"<qt>A problem occurred while importing bookmarks!<BR>The bookmarks format of "
-"the imported file is newer<BR>than the bookmarks format version of this "
-"version of BibleTime!<BR><B>Importing the bookmarks may not work correctly!</"
-"B><BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Objavila sa chyba pri importovaní záložiek!<BR>Formát záložiek  z "
-"importovaného súboru je novší<BR>ako formát založiek tejto verzie BibleTime!"
-"<BR><B>Importové záložky nemusia fungovať správne!</B><BR>Chcete pokračovať?"
-"</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1159
-msgid "Import of bookmarks"
-msgstr "Importuj záložky"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1173
-msgid "Export bookmarks ..."
-msgstr "Exportuj záložky ..."
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid ""
-"<qt>This function will reset the main index!<BR>This will recreate the "
-"original groups and delete all other items!<BR>Be sure no important "
-"bookmarks will be deleted!<BR>Do you want to continue?</qt>"
-msgstr ""
-"<qt>Táto funkcia znovu nastaví manažéra skupiny!<BR>To opäť vytvorí "
-"originálne skupiny a zmaže ostatné položky!<BR> Uistite sa, či tým nezmažete "
-"dôležité záložky atď!<BR>Prajete si pokračovať?</qt>"
-
-#: bibletime/frontend/groupmanager/cgroupmanager.cpp:1516
-msgid "BibleTime - Reset main index"
-msgstr "BibleTime - Znovu nastav hlavný index"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:85
-msgid "Lexicon window"
-msgstr "Okno lexikónu"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:99
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:88
-msgid "Entry"
-msgstr "Záznam"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:100
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:89
-msgid "Text of entry"
-msgstr "Text záznamu"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:101
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:106
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:90
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:95
-msgid "Entry with text"
-msgstr "Záznam s textom"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:100
-#: bibletime/frontend/presenters/cbookpresenter.cpp:98
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:103
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:92
-msgid "Selected text"
-msgstr "Zvolený text"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:109
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:98
-msgid "Entry as plain text"
-msgstr "Záznam ako obyčejný text"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:106
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:110
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:99
-msgid "Entry as HTML"
-msgstr "Záznam ako HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:112
-#: bibletime/frontend/presenters/cbookpresenter.cpp:109
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:113
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:102
-msgid "Lookup selected text in lexicon"
-msgstr "Hľadaj vyznačený text v lexikóne"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:114
-#: bibletime/frontend/presenters/cbookpresenter.cpp:111
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:115
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:104
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:134
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:270
-msgid "Copy..."
-msgstr "Kopíruj..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:115
-#: bibletime/frontend/presenters/cbookpresenter.cpp:112
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:116
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:105
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:135
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:271
-msgid "Add to printing queue..."
-msgstr "Pridaj do tlačovej fronty..."
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:116
-#: bibletime/frontend/presenters/cbookpresenter.cpp:113
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:117
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:106
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:136
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:272
-msgid "Save..."
-msgstr "Ulož..."
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:259
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:267
-#, fuzzy
-msgid "Next entry"
-msgstr "Text záznamu"
-
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:260
-#: bibletime/frontend/presenters/clexiconpresenter.cpp:270
-#, fuzzy
-msgid "Previous entry"
-msgstr "Zobraz predchádzajúci záznam"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:92
-msgid "Bible window"
-msgstr "Okno Biblie"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:95
-msgid "Verse"
-msgstr "verš"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:96
-msgid "Text of verse"
-msgstr "text verša"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:97
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:103
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:107
-msgid "Verse with text"
-msgstr "verš s textom"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:98
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:104
-msgid "Chapter"
-msgstr "kapitolu"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:108
-msgid "Chapter as plain text"
-msgstr "kapitolu ako obyčajný text"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:109
-msgid "Chapter as HTML"
-msgstr "kapitolu ako HTML"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:327
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:343
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:413
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:432
-#, fuzzy
-msgid "Next book"
-msgstr "Zobraz ďalšiu knihu"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:328
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:345
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:414
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:434
-#, fuzzy
-msgid "Previous book"
-msgstr "Zobraz predchádzajúcu knihu"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:330
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:348
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:416
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:437
-#, fuzzy
-msgid "Next chapter"
-msgstr "Zobraz nasledujúcu kapitolu"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:331
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:350
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:417
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:439
-#, fuzzy
-msgid "Previous chapter"
-msgstr "Zobraz predchádzajúcu kapitolu"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:333
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:353
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:419
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:442
-#, fuzzy
-msgid "Next verse"
-msgstr "text verša"
-
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:334
-#: bibletime/frontend/presenters/cbiblepresenter.cpp:355
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:420
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:444
-#, fuzzy
-msgid "Previous verse"
-msgstr "Skoč na predchádzajúci verš"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:47
-msgid "Select additional modules"
-msgstr "Zvoľ dodatočné moduly"
-
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:49
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:72
-#: bibletime/frontend/presenters/cmodulechooserbutton.cpp:126
-msgid "NONE"
-msgstr "Nič"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:70
-#, fuzzy
-msgid "Display options"
-msgstr "Zobraz okno"
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:73
-msgid "Use linebreaks"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:74
-#, fuzzy
-msgid "Show versenumbers"
-msgstr "Zobraz Strongové čísla"
-
-#: bibletime/frontend/coptionsdialog.cpp:663
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:76
-msgid "Show headings"
-msgstr ""
-
-#: bibletime/dummy.h:29 bibletime/frontend/coptionsdialog.cpp:653
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:78
-#: bibletime/tooltipdef.h:29
-msgid "Show footnotes"
-msgstr "Zobraz poznámky pod čiarov"
-
-#: bibletime/frontend/coptionsdialog.cpp:658
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:80
-#, fuzzy
-msgid "Show Strong's Numbers"
-msgstr "Zobraz Strongové čísla"
-
-#: bibletime/frontend/coptionsdialog.cpp:668
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:83
-msgid "Show morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:673
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:85
-msgid "Show lemmas"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:678
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:87
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:683
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:89
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:688
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:91
-msgid "Show Greek accents"
-msgstr ""
-
-#: bibletime/frontend/presenters/cdisplaysettingsbutton.cpp:93
-msgid "Use alternative textual variant"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:80
-msgid "Synchronize..."
-msgstr "Synchronizuj..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:85
-msgid "Edit entry..."
-msgstr "Uprav záznam..."
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:96
-msgid "Commentary window"
-msgstr "Okno komentárov"
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:232
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:392
-msgid "The text was not saved to the module. Save the changes now?"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:422
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:447
-msgid "Toggle synchronize button"
-msgstr ""
-
-#: bibletime/frontend/presenters/ccommentarypresenter.cpp:511
-#, fuzzy
-msgid "Save changes to module?"
-msgstr "Hľadaj v moduloch"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:68
-msgid "Toggle tree..."
-msgstr ""
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:90
-#, fuzzy
-msgid "Book window"
-msgstr "Okno Biblie"
-
-#: bibletime/frontend/presenters/cbookpresenter.cpp:200
-#: bibletime/frontend/presenters/cbookpresenter.cpp:208
-#, fuzzy
-msgid "Toggle tree"
-msgstr "Aktuálny modul:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:52
-msgid "Modules:"
-msgstr "Moduly:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:55
-msgid "Entries found:"
-msgstr "Nájdené záznamy:"
-
-#: bibletime/frontend/searchdialog/csearchdialogresult.cpp:173
-#, fuzzy
-msgid "module not set"
-msgstr "<I>module nie je nastavený</I>"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:53
-msgid "Search properties"
-msgstr "Možnosti vyhľadávania:"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:72
-msgid "Multiple Words"
-msgstr "Zložené slová"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:80
-msgid "Exact Search"
-msgstr "Presné hľadanie"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:87
-msgid "Regular Expression"
-msgstr "Regulárny výraz"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:100
-msgid "Case Sensitive"
-msgstr "Rozlišovať veľkosť písmen"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:104
-msgid "Search scope"
-msgstr "Rozsah vyhľadávania"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:108
-msgid "Search progress"
-msgstr "Priebeh vyhľadávania:"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:113
-msgid "Current module:"
-msgstr "Aktuálny modul:"
-
-#: bibletime/frontend/searchdialog/csearchdialogtext.cpp:114
-msgid "Overall:"
-msgstr "Celkovo:"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search Dialog"
-msgstr "Vyhľadávanie"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Search"
-msgstr "Hľadaj"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:54
-msgid "Interrupt"
-msgstr "Preručenie"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid "Choose modules"
-msgstr "Vyberte moduly"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:84
-msgid "Choose the modules for the search"
-msgstr "Vložte moduly na prehľadávanie"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Search Text"
-msgstr "Hľadaj text"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:88
-msgid "Enter the text to search for"
-msgstr "Vlož text, ktorý bude vyhľadávaný"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "Search Result"
-msgstr "Výsledky hľadania"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:92
-msgid "The result of your search"
-msgstr "Výsledky vášho hľadania"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Search Analysis"
-msgstr "Analýza hľadania"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:96
-msgid "Graphical analysis of your search result"
-msgstr "Grafické analýzy výsledkov vášho hľadania"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-msgid "HTML files"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:127
-#, fuzzy
-msgid "Save Search Analysis"
-msgstr "Analýza hľadania"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:155
-#, fuzzy
-msgid "BibleTime Search Analysis"
-msgstr "Analýza hľadania"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:156
-#, fuzzy
-msgid "Search Text :"
-msgstr "Hľadaj text"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:157
-#, fuzzy
-msgid "Search Type :"
-msgstr "Hľadaj text"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:158
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Rozsah vyhľadávania"
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:161
-msgid "Book"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:162
-msgid "Total Hits"
-msgstr ""
-
-#: bibletime/frontend/searchdialog/csearchdialog.cpp:186
-msgid "Created by"
-msgstr ""
-
-#: bibletime/dummy.h:112
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:44
-#: bibletime/tooltipdef.h:112
-msgid "No scope"
-msgstr "Bez rozsahu"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:48
-msgid "Last result"
-msgstr "Posledné výsledky"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:52
-msgid "Use scope"
-msgstr "Použi rozsah"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:63
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:223
-msgid "Choose custom range"
-msgstr "Vyberte vlastný oblasť"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:67
-msgid "Edit ranges"
-msgstr "Upravenie rozsahu"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:96
-msgid "Old testament"
-msgstr "Starý zákon"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:97
-msgid "Moses/Pentateuch/Torah"
-msgstr "Mojžišove knihy/Pentateuch/Tóra"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:98
-msgid "History"
-msgstr "História"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:99
-msgid "Prophets"
-msgstr "Proroci"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:100
-msgid "New testament"
-msgstr "Nový zákon"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:101
-msgid "Gospels"
-msgstr "Evanjeliá"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:102
-msgid "Letters/Epistels"
-msgstr "Listy/Epištoly"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:103
-msgid "Paul's Epistels"
-msgstr "Pavlove Epištoly"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:224
-msgid "Define range text"
-msgstr "Definutje rozsah textu"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:225
-msgid "Range parsing results"
-msgstr "Rozsah analyzovania výsledkov"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Range name"
-msgstr "Meno rozsahu"
-
-#: bibletime/frontend/searchdialog/csearchdialogscope.cpp:289
-msgid "Please enter a name for the new range"
-msgstr "Vložte meno nového rozsahu"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:117
-msgid "Modules"
-msgstr "Moduly"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:124
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:128
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:131
-msgid "Search result"
-msgstr "Výsledky hľadania"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:125
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:132
-msgid "Search result with text"
-msgstr "Výsledky hľadania v texte"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:152
-#, fuzzy
-msgid "Appending keys to the printing queue ..."
-msgstr "Pridaj do tlačovej fronty..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:166
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:195
-#, fuzzy
-msgid "Copying search result to clipboard..."
-msgstr "Kopíruj do schránky"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:181
-#, fuzzy
-msgid "Saving the search result ..."
-msgstr "Ulož výsledky hľadania..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:209
-#, fuzzy
-msgid "Saving the search result..."
-msgstr "Ulož výsledky hľadania..."
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:260
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:267
-msgid "Key"
-msgstr "referenciu"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:261
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:264
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:268
-msgid "Key with text"
-msgstr "referenciu s textom"
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-"*.txt | Textové súbory\n"
-" *.* | Všetky súbory (*.*)"
-
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:385
-#: bibletime/frontend/searchdialog/csearchdialogresultview.cpp:414
-msgid "Save key ..."
-msgstr "Ulož referenciu..."
-
-#: bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp:50
-msgid ""
-"Choose the module you want to use for the search. The tree on the left "
-"contains all available modules, the tree on the right the modules for the "
-"search. Use the two arrow buttons to add or remove modules from the right "
-"tree."
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:79
-msgid "The file does already exist!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:80
-msgid "Do you want to overwrite it?"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:96
-msgid "Sorry! But the file couldn't be saved!"
-msgstr ""
-
-#: bibletime/frontend/ctoolclass.cpp:97
-msgid "Please check permissions etc. !"
-msgstr ""
-
-#: bibletime/frontend/cexportmanager.cpp:41
-#: bibletime/frontend/cexportmanager.cpp:55
-#: bibletime/frontend/cexportmanager.cpp:93
-msgid "Save search result ..."
-msgstr "Ulož výsledky hľadania..."
-
-#: bibletime/frontend/coptionsdialog.cpp:68
-msgid "Optionsdialog"
-msgstr "Nastavenia"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#: bibletime/frontend/coptionsdialog.cpp:314
-#, fuzzy
-msgid "Create new profile"
-msgstr "Vytvor novú zložku"
-
-#: bibletime/frontend/coptionsdialog.cpp:122
-#, fuzzy
-msgid "Please enter the name of the new profile"
-msgstr "Prosím vložte meno zložky!"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Rename profile"
-msgstr "Zmaž vybrané položky"
-
-#: bibletime/frontend/coptionsdialog.cpp:146
-#, fuzzy
-msgid "Please enter the new name of the profile"
-msgstr "Prosím vložte meno zložky!"
-
-#: bibletime/frontend/coptionsdialog.cpp:170
-#, fuzzy
-msgid "Startup"
-msgstr "Zobraz štartovacie logo"
-
-#: bibletime/frontend/coptionsdialog.cpp:174
-msgid "Show tip of the day"
-msgstr "Ukáž tip dňa"
-
-#: bibletime/frontend/coptionsdialog.cpp:184
-msgid "Show startuplogo"
-msgstr "Zobraz štartovacie logo"
-
-#: bibletime/frontend/coptionsdialog.cpp:193
-msgid "Restore windows in workspace area"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-#, fuzzy
-msgid "Choose fonts"
-msgstr "Vyber písmo"
-
-#: bibletime/frontend/coptionsdialog.cpp:210
-msgid ""
-"The fonts you can choose here are used in the display windows. Use the drop-"
-"down box below to choose the area of application. Then select a font for it. "
-"Make sure the charset \"iso10646-1\" is available for the selected Unicode "
-"font.!"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:225
-#, fuzzy
-msgid "The quick brown fox jumps over the lazy dog"
-msgstr "Rýchla červená líška preskočila lenivého psa."
-
-#: bibletime/frontend/coptionsdialog.cpp:238
-msgid "Colors"
-msgstr "Farby"
-
-#: bibletime/frontend/coptionsdialog.cpp:245
-#, fuzzy
-msgid "Choose colors"
-msgstr "Vyberte moduly"
-
-#: bibletime/frontend/coptionsdialog.cpp:246
-msgid ""
-"Choose the colors to change the look of the display windows to your own "
-"preferences. Some options like \"Words of Jesus\" do only apply to texts "
-"which support this special feature."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:252
-msgid "Text"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:257
-msgid "Background"
-msgstr "Pozadie"
-
-#: bibletime/frontend/coptionsdialog.cpp:262
-#, fuzzy
-msgid "Highlighted verse"
-msgstr "Označený verš"
-
-#: bibletime/frontend/coptionsdialog.cpp:267
-#, fuzzy
-msgid "Hyperlinks"
-msgstr "Spusti tlač"
-
-#: bibletime/frontend/coptionsdialog.cpp:277
-msgid "Strong's numbers"
-msgstr "Strongové čísla"
-
-#: bibletime/frontend/coptionsdialog.cpp:282
-msgid "Morphologic tags"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:287
-msgid "Words of Jesus"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:297
-#, fuzzy
-msgid "Profiles"
-msgstr "Uprav záznam..."
-
-#: bibletime/frontend/coptionsdialog.cpp:302
-#, fuzzy
-msgid "Manage your profiles"
-msgstr "Nastavte farby v BibleTime"
-
-#: bibletime/frontend/coptionsdialog.cpp:303
-msgid ""
-"Profiles define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. Don't forget "
-"that new profiles only work after you've saved something in them."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:318
-#, fuzzy
-msgid "Delete selected profile"
-msgstr "Zmaže vybrané položky."
-
-#: bibletime/frontend/coptionsdialog.cpp:322
-#, fuzzy
-msgid "Rename selected profile"
-msgstr "Zmaž vybrané položky"
-
-#: bibletime/frontend/coptionsdialog.cpp:340
-msgid "Accelerators"
-msgstr "Nastaviť klávesy"
-
-#: bibletime/frontend/coptionsdialog.cpp:345
-msgid "Application wide"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:368
-#, fuzzy
-msgid "Bible windows"
-msgstr "Okno Biblie"
-
-#: bibletime/frontend/coptionsdialog.cpp:381
-#, fuzzy
-msgid "Commentary windows"
-msgstr "Okno komentárov"
-
-#: bibletime/frontend/coptionsdialog.cpp:394
-#, fuzzy
-msgid "Lexicon windows"
-msgstr "Okno lexikónu"
-
-#: bibletime/frontend/coptionsdialog.cpp:408
-#, fuzzy
-msgid "Book windows"
-msgstr "Okno Biblie"
-
-#: bibletime/frontend/coptionsdialog.cpp:422
-msgid "Sword"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:425
-msgid "General"
-msgstr "Všeobecné"
-
-#: bibletime/frontend/coptionsdialog.cpp:431
-#: bibletime/frontend/coptionsdialog.cpp:439
-msgid "Use key cache for lexicons"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:432
-msgid ""
-"BibleTime can create a key cache for lexicons, which speeds up opening large "
-"lexicon modules a lot. However these files consume some disk space (usually "
-"not much), and reside in $KDEHOME/share/apps/bibletime/cache."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:447
-msgid "Scrolling behaviour"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:448
-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/dummy.h:134 bibletime/frontend/coptionsdialog.cpp:454
-#: bibletime/tooltipdef.h:134
-msgid "Use down arrow to scroll to next verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:461
-#, fuzzy
-msgid "Specify a language for biblical booknames"
-msgstr "Jazyk pre názvy kníh"
-
-#: bibletime/frontend/coptionsdialog.cpp:462
-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 "
-"choose. If you want to create a new locale, see http://www.crosswire.org/"
-"sword/develop for details."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:469
-msgid "Language for booknames"
-msgstr "Jazyk pre názvy kníh"
-
-#: bibletime/frontend/coptionsdialog.cpp:477
-msgid "English"
-msgstr "Anglický jazyk"
-
-#: bibletime/frontend/coptionsdialog.cpp:495
-#: bibletime/frontend/coptionsdialog.cpp:500
-#, fuzzy
-msgid "Default modules"
-msgstr "Použité moduly"
-
-#: bibletime/frontend/coptionsdialog.cpp:500
-msgid ""
-"Default modules are used, when no module is specified. This may happen with "
-"references into modules like Bibles or Lexicons."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:505
-msgid "Default Bible"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:513
-#, fuzzy
-msgid "Default Commentary"
-msgstr "Komentáre"
-
-#: bibletime/frontend/coptionsdialog.cpp:522
-#, fuzzy
-msgid "Default Lexicon"
-msgstr "Lexikóny"
-
-#: bibletime/frontend/coptionsdialog.cpp:530
-#, fuzzy
-msgid "Default Hebrew Strong's Lexicon"
-msgstr "Lexikóny"
-
-#: bibletime/frontend/coptionsdialog.cpp:538
-#, fuzzy
-msgid "Default Greek Strong's Lexicon"
-msgstr "Lexikóny"
-
-#: bibletime/frontend/coptionsdialog.cpp:546
-#, fuzzy
-msgid "Default Hebrew Morphological Lexicon"
-msgstr "Lexikóny"
-
-#: bibletime/frontend/coptionsdialog.cpp:553
-#, fuzzy
-msgid "Default Greek Morphological Lexicon"
-msgstr "Lexikóny"
-
-#: bibletime/frontend/coptionsdialog.cpp:636
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid "Filter settings"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:639
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can choose the default settings of the various filter settings. You can "
-"change the settings in each display window, too."
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:643
-msgid "Show line break after each verse"
-msgstr ""
-
-#: bibletime/frontend/coptionsdialog.cpp:648
-#, fuzzy
-msgid "Show verse numbers"
-msgstr "Zobraz Strongové čísla"
-
-#: bibletime/frontend/coptionsdialog.cpp:693
-msgid "Use textual variants"
-msgstr ""
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Printing..."
-msgstr "Tlačenie..."
-
-#: bibletime/bibletime_slots.cpp:285
-msgid "Abort printing"
-msgstr "Zruš tlač"
-
-#: bibletime/rc-dummy.cpp:2
-msgid "&Main index"
-msgstr "&Hlavný index"
-
-#: bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:3
-msgid ""
-"This is <B>BibleTime 1.1</B>!<BR>\n"
-"This version of BibleTime should have reached the state where it could\n"
-"be called stable, useful and user friendly!<BR>\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:9
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:13
-msgid ""
-"BibleTime 1.1 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:18
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:22
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:26
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>! \n"
-"It was written by Bob Harman and is a great help how to study the Bible.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:31
-msgid ""
-"The Bible has the power to \"comfort the afflicted\" and \"afflict the "
-"comfortable\". (Revelation 10:10)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:35
-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:39
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:43
-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:48
-msgid "That the Bible is truth. (John 17:17)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:52
-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:57
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:61
-msgid ""
-"It's possible to insert the text of bookmarks and references to verses or "
-"lexicon entries into the personal commentary editor by dropping them there.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:65
-msgid ""
-"By studying the Bible you will have no reason to stand ashamed before God. "
-"(2 Timothy 2:15)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:69
-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 optionsdialog.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:76
-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:80
-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:84
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:88
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the regular expression \"x | y | z\" for searching, which is "
-"equivalent to \"x OR y OR z\", e.g. \"pray | worship | supplicate\".\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:92
-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:96
-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:100
-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"
-"Now double click on it and drag the selected word on the foreign module in "
-"the main index.\n"
-"The search dialog will be opened with the word in the edit line.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:106
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:110
-msgid ""
-"Foreign modules (e.g. greek or hebrew) do often require a special unicode "
-"font to read them.\n"
-"Many of the fonts are available on www.crosswire.org or on the Sword CD.\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:115
-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:119
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:123
-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:128
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-
-#: bibletime/tips-dummy.cpp:132
-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/dummy.h:19 bibletime/tooltipdef.h:19
-msgid "Clear the printing queue"
-msgstr "Vyčisti tlačovú frontu"
-
-#: bibletime/dummy.h:20 bibletime/tooltipdef.h:20
-msgid "Open the printerdialog"
-msgstr "Otvor dialóg pre tlač"
-
-#: bibletime/dummy.h:21 bibletime/tooltipdef.h:21
-msgid "Close BibleTime"
-msgstr "Ukonči BibleTime"
-
-#: bibletime/dummy.h:23 bibletime/tooltipdef.h:23
-msgid "Search in modules"
-msgstr "Hľadaj v moduloch"
-
-#: bibletime/dummy.h:24 bibletime/tooltipdef.h:24
-msgid "Remove selected items"
-msgstr "Zmaž vybrané položky"
-
-#: bibletime/dummy.h:27 bibletime/tooltipdef.h:27
-msgid "Show main index"
-msgstr "Zobraz hlavný index"
-
-#: bibletime/dummy.h:28 bibletime/tooltipdef.h:28
-msgid "Show tooolbar"
-msgstr "Zobraz panel nástrojov"
-
-#: bibletime/dummy.h:30 bibletime/tooltipdef.h:30
-msgid "Show Strong's numbers"
-msgstr "Zobraz Strongové čísla"
-
-#: bibletime/dummy.h:32 bibletime/tooltipdef.h:32
-msgid "Tile windows"
-msgstr "Dláždi okná"
-
-#: bibletime/dummy.h:33 bibletime/tooltipdef.h:33
-msgid "Automatically tile windows"
-msgstr "Automaticky dláždi okná"
-
-#: bibletime/dummy.h:34 bibletime/tooltipdef.h:34
-msgid "Cascade windows"
-msgstr "Kaskáduj okná"
-
-#: bibletime/dummy.h:35 bibletime/tooltipdef.h:35
-msgid "Automatically cascade windows"
-msgstr "Automaticky kaskáduj okná"
-
-#: bibletime/dummy.h:36 bibletime/tooltipdef.h:36
-msgid "Close all windows"
-msgstr "Zavri všetky okná"
-
-#: bibletime/dummy.h:37 bibletime/dummy.h:227 bibletime/tooltipdef.h:37
-#: bibletime/whatsthisdef.h:46
-msgid "Save current profile"
-msgstr ""
-
-#: bibletime/dummy.h:38 bibletime/tooltipdef.h:38
-#, fuzzy
-msgid "Edit profiles"
-msgstr "Uprav záznam..."
-
-#: bibletime/dummy.h:39 bibletime/dummy.h:229 bibletime/tooltipdef.h:39
-#: bibletime/whatsthisdef.h:48
-#, fuzzy
-msgid "Load a new profile"
-msgstr "Vytvor novú zložku"
-
-#: bibletime/dummy.h:40 bibletime/dummy.h:230 bibletime/tooltipdef.h:40
-#: bibletime/whatsthisdef.h:49
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Aktuálny modul:"
-
-#: bibletime/dummy.h:42 bibletime/tooltipdef.h:42
-msgid "Edit toolbar"
-msgstr "Uprav panel nástrojov"
-
-#: bibletime/dummy.h:45 bibletime/tooltipdef.h:45
-msgid "BibleTime's handbook"
-msgstr "Príručka k BibleTime"
-
-#: bibletime/dummy.h:46 bibletime/tooltipdef.h:46
-msgid "BibleTime's installation documentation"
-msgstr ""
-
-#: bibletime/dummy.h:47 bibletime/tooltipdef.h:47
-#, fuzzy
-msgid "BibleTime's Bible study HowTo"
-msgstr "Biblické štúdium Ako..."
-
-#: bibletime/dummy.h:48 bibletime/tooltipdef.h:48
-msgid "Enter \"What's this?\" mode"
-msgstr "Vstúp do módu \"Čo je toto?\""
-
-#: bibletime/dummy.h:49 bibletime/tooltipdef.h:49
-msgid "Send bugreport"
-msgstr "Pošli správu o chybe"
-
-#: bibletime/dummy.h:50 bibletime/tooltipdef.h:50
-#, fuzzy
-msgid "Show daily tips at startup"
-msgstr "Zobraz tip dňa"
-
-#: bibletime/dummy.h:51 bibletime/tooltipdef.h:51
-msgid "About BibleTime"
-msgstr "O BibleTime"
-
-#: bibletime/dummy.h:52 bibletime/tooltipdef.h:52
-msgid "About KDE"
-msgstr "O KDE"
-
-#: bibletime/dummy.h:56 bibletime/tooltipdef.h:56
-msgid "The main index"
-msgstr "Hlavný index"
-
-#: bibletime/dummy.h:62 bibletime/tooltipdef.h:62
-msgid "Add bookmark to printing queue"
-msgstr "Pridaj záložku do tlačovej fronty"
-
-#: bibletime/dummy.h:67 bibletime/tooltipdef.h:67
-msgid "The working area"
-msgstr "Pracovná oblasť"
-
-#: bibletime/dummy.h:69 bibletime/tooltipdef.h:69
-msgid "Show the next entry"
-msgstr "Zobraz ďalší záznam"
-
-#: bibletime/dummy.h:70 bibletime/tooltipdef.h:70
-msgid "Show the previous entry"
-msgstr "Zobraz predchádzajúci záznam"
-
-#: bibletime/dummy.h:71 bibletime/tooltipdef.h:71
-#, fuzzy
-msgid "Jump to the next verse"
-msgstr "Skoč na ďalší verš"
-
-#: bibletime/dummy.h:72 bibletime/tooltipdef.h:72
-#, fuzzy
-msgid "Jump to the previous verse"
-msgstr "Skoč na predchádzajúci verš"
-
-#: bibletime/dummy.h:73 bibletime/tooltipdef.h:73
-#, fuzzy
-msgid "Show the next chapter"
-msgstr "Zobraz nasledujúcu kapitolu"
-
-#: bibletime/dummy.h:74 bibletime/tooltipdef.h:74
-#, fuzzy
-msgid "Show the previous chapter"
-msgstr "Zobraz predchádzajúcu kapitolu"
-
-#: bibletime/dummy.h:75 bibletime/tooltipdef.h:75
-#, fuzzy
-msgid "Show the next book"
-msgstr "Zobraz ďalšiu knihu"
-
-#: bibletime/dummy.h:76 bibletime/tooltipdef.h:76
-#, fuzzy
-msgid "Show the previous book"
-msgstr "Zobraz predchádzajúcu knihu"
-
-#: bibletime/dummy.h:77 bibletime/tooltipdef.h:77
-msgid "List of books"
-msgstr "Zoznam kníh"
-
-#: bibletime/dummy.h:78 bibletime/tooltipdef.h:78
-msgid "List of chapters"
-msgstr "Zoznam kapitol"
-
-#: bibletime/dummy.h:79 bibletime/tooltipdef.h:79
-msgid "List of verses"
-msgstr "Zoznam veršov"
-
-#: bibletime/dummy.h:80 bibletime/tooltipdef.h:80
-msgid "List of entries"
-msgstr "Zoznam záznamov"
-
-#: bibletime/dummy.h:81 bibletime/tooltipdef.h:81
-msgid "Scroll through the list"
-msgstr "Posun cez zoznam"
-
-#: bibletime/dummy.h:82 bibletime/tooltipdef.h:82
-msgid "Edit this entry"
-msgstr "Uprav tento záznam"
-
-#: bibletime/dummy.h:83 bibletime/tooltipdef.h:83
-msgid "Save this comment"
-msgstr "Ulož tento komentár"
-
-#: bibletime/dummy.h:84 bibletime/tooltipdef.h:84
-msgid "Delete this comment"
-msgstr "Zmaž tento komentár"
-
-#: bibletime/dummy.h:85 bibletime/tooltipdef.h:85
-msgid "Comment up to"
-msgstr "Komentuj po:"
-
-#: bibletime/dummy.h:86 bibletime/tooltipdef.h:86
-msgid "Set bold"
-msgstr "Vyznač tucným"
-
-#: bibletime/dummy.h:87 bibletime/tooltipdef.h:87
-msgid "Set italic"
-msgstr "Vyznač kurzívou"
-
-#: bibletime/dummy.h:88 bibletime/tooltipdef.h:88
-msgid "Set underlined"
-msgstr "Podčiarkni"
-
-#: bibletime/dummy.h:89 bibletime/tooltipdef.h:89
-msgid "Set font"
-msgstr "Vyberte typ písma"
-
-#: bibletime/dummy.h:90 bibletime/tooltipdef.h:90
-msgid "Set the color"
-msgstr "Vyberte farby"
-
-#: bibletime/dummy.h:91 bibletime/tooltipdef.h:91
-msgid "Set the fontsize"
-msgstr "Zvoľte veľkosť písma"
-
-#: bibletime/dummy.h:93 bibletime/tooltipdef.h:93
-msgid "Synchronize with Bible windows"
-msgstr "Synchronizuj s oknom biblie"
-
-#: bibletime/dummy.h:96 bibletime/tooltipdef.h:96
-msgid "Save as HTML"
-msgstr "Ulož ako HTML..."
-
-#: bibletime/dummy.h:98 bibletime/tooltipdef.h:98
-msgid "Copy to clipboard"
-msgstr "Kopíruj do schránky"
-
-#: bibletime/dummy.h:101 bibletime/tooltipdef.h:101
-#, fuzzy
-msgid "Choose the modules to search in"
-msgstr "Vložte moduly na prehľadávanie"
-
-#: bibletime/dummy.h:102 bibletime/tooltipdef.h:102
-msgid "Add the selected module to the list"
-msgstr "Pridaj zovolený modul do zoznamu"
-
-#: bibletime/dummy.h:103 bibletime/tooltipdef.h:103
-msgid "Remove the selected module from the list"
-msgstr "Odstráň zvolený modul zo zoznamu"
-
-#: bibletime/dummy.h:104 bibletime/tooltipdef.h:104
-msgid "List of modules used for the search"
-msgstr "Zoznam modulov, ktoré sa použijú pri hľadaní"
-
-#: bibletime/dummy.h:106 bibletime/tooltipdef.h:106
-#, fuzzy
-msgid "Search for this text"
-msgstr "Prehľadaj tento text"
-
-#: bibletime/dummy.h:107 bibletime/tooltipdef.h:107
-msgid "Search multiple words"
-msgstr "Hľadaj zložené slová"
-
-#: bibletime/dummy.h:108 bibletime/tooltipdef.h:108
-msgid "Exact match"
-msgstr "Presné hľadanie"
-
-#: bibletime/dummy.h:109 bibletime/tooltipdef.h:109
-msgid "Search with GNU regular expressions"
-msgstr "Hľadaj s regulárnymi výrazmi"
-
-#: bibletime/dummy.h:110 bibletime/tooltipdef.h:110
-msgid "Search case sensitive"
-msgstr "Rozlišovať veľkosť písmen"
-
-#: bibletime/dummy.h:113 bibletime/tooltipdef.h:113
-msgid "Last search result"
-msgstr "Posledné výsledky hľadania"
-
-#: bibletime/dummy.h:114 bibletime/tooltipdef.h:114
-#, fuzzy
-msgid "Use custom scope"
-msgstr "Použi vlastný rozsah"
-
-#: bibletime/dummy.h:115 bibletime/tooltipdef.h:115
-msgid "Add a new scope"
-msgstr "Pridaj nový rozsah"
-
-#: bibletime/dummy.h:116 bibletime/tooltipdef.h:116
-msgid "Delete this search scope"
-msgstr "Odstráň tento rozsah"
-
-#: bibletime/dummy.h:117 bibletime/dummy.h:307 bibletime/tooltipdef.h:117
-#: bibletime/whatsthisdef.h:126
-msgid "Edit and define your search scopes"
-msgstr "Upravte a definujte svoj rozsah hľadania"
-
-#: bibletime/dummy.h:118 bibletime/tooltipdef.h:118
-msgid "Choose a search scope from the list"
-msgstr "Vyberte rozsah hľadania zo zoznamu"
-
-#: bibletime/dummy.h:119 bibletime/tooltipdef.h:119
-msgid "Enter your own search scope"
-msgstr "Vložte soj vlastný rozsah hľadania"
-
-#: bibletime/dummy.h:120 bibletime/tooltipdef.h:120
-msgid "Parsed result"
-msgstr "Analyzuj výsledky"
-
-#: bibletime/dummy.h:121 bibletime/tooltipdef.h:121
-msgid "Close this dialog"
-msgstr "Ukonči dialóg"
-
-#: bibletime/dummy.h:123 bibletime/tooltipdef.h:123
-msgid "Used modules"
-msgstr "Použité moduly"
-
-#: bibletime/dummy.h:124 bibletime/tooltipdef.h:124
-msgid "Items found"
-msgstr "Nájdené položky"
-
-#: bibletime/dummy.h:125 bibletime/tooltipdef.h:125
-msgid "Preview"
-msgstr "Náhľad"
-
-#: bibletime/dummy.h:127 bibletime/tooltipdef.h:127
-#, fuzzy
-msgid "Graphical Search Analysis"
-msgstr "Graficka analýza"
-
-#: bibletime/dummy.h:131 bibletime/tooltipdef.h:131
-msgid "Show daily tip"
-msgstr "Zobraz tip dňa"
-
-#: bibletime/dummy.h:132 bibletime/tooltipdef.h:132
-msgid "List of languages"
-msgstr "Zoznam jazykov"
-
-#: bibletime/dummy.h:133 bibletime/tooltipdef.h:133
-#, fuzzy
-msgid "Show start-up logo"
-msgstr "Zobraz štartovacie logo"
-
-#: bibletime/dummy.h:135 bibletime/tooltipdef.h:135
-msgid "Restore the windows in the workspace on startup"
-msgstr ""
-
-#: bibletime/dummy.h:137 bibletime/tooltipdef.h:137
-msgid "Use cache files for the lexicon entries"
-msgstr ""
-
-#: bibletime/dummy.h:138 bibletime/tooltipdef.h:138
-msgid "The default bible used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:139 bibletime/tooltipdef.h:139
-msgid "The default commentary used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:140 bibletime/tooltipdef.h:140
-msgid "The default lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:141 bibletime/tooltipdef.h:141
-msgid "The default Hebrew lexicon used in the workspace are"
-msgstr ""
-
-#: bibletime/dummy.h:142 bibletime/tooltipdef.h:142
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:143 bibletime/tooltipdef.h:143
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:144 bibletime/tooltipdef.h:144
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-
-#: bibletime/dummy.h:147 bibletime/tooltipdef.h:147
-msgid "Set keyboard accelerators"
-msgstr "Nastav klávesové skratky"
-
-#: bibletime/dummy.h:149 bibletime/tooltipdef.h:149
-msgid "Choose the area of application"
-msgstr "Zvoľte oblasť aplikácie"
-
-#: bibletime/dummy.h:150 bibletime/dummy.h:337 bibletime/tooltipdef.h:150
-#: bibletime/whatsthisdef.h:156
-msgid "Choose a font"
-msgstr "Zvoľte typ písma"
-
-#: bibletime/dummy.h:152 bibletime/tooltipdef.h:152
-msgid "Color of the background"
-msgstr "Farba pozadia"
-
-#: bibletime/dummy.h:153 bibletime/tooltipdef.h:153
-msgid "Color of the highlighted verse"
-msgstr "Farba označeného verša"
-
-#: bibletime/dummy.h:155 bibletime/tooltipdef.h:155
-#, fuzzy
-msgid "Keyboard accelerators used by all display windows"
-msgstr "Toto je farba pozadia, ktorá je použitá pre zobrazovaní okien."
-
-#: bibletime/dummy.h:156 bibletime/tooltipdef.h:156
-msgid "Keyboard accelerators used by Bible windows"
-msgstr ""
-
-#: bibletime/dummy.h:157 bibletime/tooltipdef.h:157
-msgid "Keyboard accelerators used by commentary windows"
-msgstr ""
-
-#: bibletime/dummy.h:158 bibletime/tooltipdef.h:158
-msgid "Keyboard accelerators used by lexicon windows"
-msgstr ""
-
-#: bibletime/dummy.h:161 bibletime/tooltipdef.h:161
-msgid "Start printing"
-msgstr "Spusti tlač"
-
-#: bibletime/dummy.h:162 bibletime/tooltipdef.h:162
-#, fuzzy
-msgid "Preview print job"
-msgstr "Aplikácia pre náhľad:"
-
-#: bibletime/dummy.h:164 bibletime/tooltipdef.h:164
-msgid "Open help"
-msgstr "Otvor pomoc"
-
-#: bibletime/dummy.h:167 bibletime/tooltipdef.h:167
-msgid "List of print items"
-msgstr "Zoznam položiek na tlačenie"
-
-#: bibletime/dummy.h:168 bibletime/tooltipdef.h:168
-msgid "Move item up"
-msgstr "Posuň položku hore"
-
-#: bibletime/dummy.h:169 bibletime/tooltipdef.h:169
-msgid "Move item down"
-msgstr "Posuň položku dole"
-
-#: bibletime/dummy.h:170 bibletime/tooltipdef.h:170
-msgid "Delete items"
-msgstr "Zmaž položky"
-
-#: bibletime/dummy.h:171 bibletime/tooltipdef.h:171
-msgid "Insert a page break"
-msgstr "Vlož koniec strany"
-
-#: bibletime/dummy.h:173 bibletime/tooltipdef.h:173
-msgid "Page borders"
-msgstr "Okraje strany"
-
-#: bibletime/dummy.h:174 bibletime/tooltipdef.h:174
-msgid "Left border"
-msgstr "Ľavý okraj"
-
-#: bibletime/dummy.h:175 bibletime/tooltipdef.h:175
-msgid "Right border"
-msgstr "Pravý okraj"
-
-#: bibletime/dummy.h:176 bibletime/tooltipdef.h:176
-msgid "Upper border"
-msgstr "Horná hranica"
-
-#: bibletime/dummy.h:177 bibletime/tooltipdef.h:177
-msgid "Lower border"
-msgstr "Spodná hranica"
-
-#: bibletime/dummy.h:178 bibletime/tooltipdef.h:178
-#, fuzzy
-msgid "List of print styles"
-msgstr "Zoznam položiek na tlačenie"
-
-#: bibletime/dummy.h:179 bibletime/tooltipdef.h:179
-#, fuzzy
-msgid "Delete the selected style"
-msgstr "Zmaže vybrané položky."
-
-#: bibletime/dummy.h:180 bibletime/tooltipdef.h:180
-#, fuzzy
-msgid "Edit the selected style"
-msgstr "Zmaže vybrané položky."
-
-#: bibletime/dummy.h:181 bibletime/tooltipdef.h:181
-msgid "Create a new printing style"
-msgstr "Vytvor nový tlačový štýl"
-
-#: bibletime/dummy.h:209 bibletime/whatsthisdef.h:28
-#, fuzzy
-msgid ""
-"Clear the print queue of BibleTime. All items will be removed from the list "
-"and the print button will be disabled."
-msgstr ""
-"Vyčistí tlačovú frontu v BibleTime. Všetky položky budú odstránené zo "
-"zoznamu a tlačítko pre tlač bude nedostupné."
-
-#: bibletime/dummy.h:210 bibletime/whatsthisdef.h:29
-#, fuzzy
-msgid ""
-"Open the printer dialog of BibleTime.  Here you can edit the print queue and "
-"assign styles to the items."
-msgstr ""
-"Otvorí dialóg pre tlač v BibleTime, kde je možné upraviť tlačovú frontua "
-"priradiť štýly k položkám."
-
-#: bibletime/dummy.h:211 bibletime/whatsthisdef.h:30
-msgid "Close BibleTime and save the settings."
-msgstr "Ukočí BibleTime and ulož nastavenia."
-
-#: bibletime/dummy.h:213 bibletime/whatsthisdef.h:32
-#, fuzzy
-msgid "Open the search dialog to search for text in one or more modules."
-msgstr "Otvorí dialóg pre vyhľadávanie v jednom alebo viacerých moduloch."
-
-#: bibletime/dummy.h:214 bibletime/whatsthisdef.h:33
-#, fuzzy
-msgid ""
-"Remove the selected items from the main index.<BR>If you remove a folder, "
-"the subitems of it will be removed too."
-msgstr ""
-"Odstráni zvolené položky z hlavného indexu.<BR>Ak odstránite zložku, položky "
-"v nej budú tiež odstránené."
-
-#: bibletime/dummy.h:215 bibletime/whatsthisdef.h:34
-#, fuzzy
-msgid ""
-"Reset the main index.<BR>All bookmarks and folders will be deleted and the "
-"default folders will be restored."
-msgstr ""
-"Znovu nastaví hlavný index<BR> Všetky záložky a zložky budú zmazané a "
-"štandardné nastavenie bude obnovené."
-
-#: bibletime/dummy.h:217 bibletime/whatsthisdef.h:36
-#, fuzzy
-msgid "Toggle the main index view."
-msgstr "Hlavný index"
-
-#: bibletime/dummy.h:218 bibletime/whatsthisdef.h:37
-msgid "Toggle the main toolbar view."
-msgstr ""
-
-#: bibletime/dummy.h:219 bibletime/whatsthisdef.h:38
-msgid "Toggle footnotes in the modules."
-msgstr ""
-
-#: bibletime/dummy.h:220 bibletime/whatsthisdef.h:39
-#, fuzzy
-msgid "Toggle Strong's numbers in the modules."
-msgstr ""
-"Zobrazí alebo skryje Strongové čísla v module v závislosti od aktuálneho "
-"stavu."
-
-#: bibletime/dummy.h:222 bibletime/whatsthisdef.h:41
-#, fuzzy
-msgid "Tile the open display windows."
-msgstr "Uzavrie všetkyzobrazené okná."
-
-#: bibletime/dummy.h:223 bibletime/whatsthisdef.h:42
-#, fuzzy
-msgid "Automatically tile the display windows."
-msgstr "Automaticky dláždi okná"
-
-#: bibletime/dummy.h:224 bibletime/whatsthisdef.h:43
-#, fuzzy
-msgid "Cascade the open display windows."
-msgstr "Uzavrie všetkyzobrazené okná."
-
-#: bibletime/dummy.h:225 bibletime/whatsthisdef.h:44
-#, fuzzy
-msgid "Automatically cascade the opened display windows."
-msgstr "Automaticky kaskáduj okná"
-
-#: bibletime/dummy.h:226 bibletime/whatsthisdef.h:45
-msgid "Close all open display windows."
-msgstr "Uzavrie všetkyzobrazené okná."
-
-#: bibletime/dummy.h:228 bibletime/whatsthisdef.h:47
-#, fuzzy
-msgid "Edit profiles..."
-msgstr "Uprav záznam..."
-
-#: bibletime/dummy.h:233 bibletime/whatsthisdef.h:52
-msgid "Open the BibleTime tool bar editor."
-msgstr ""
-
-#: bibletime/dummy.h:234 bibletime/whatsthisdef.h:53
-msgid ""
-"Open BibleTime's optionsdialog where you can set most of the preferences."
-msgstr "Otvorí dialóg s nastaveniami, kde si môžete zmeniť väčšinu nastavení."
-
-#: bibletime/dummy.h:236 bibletime/whatsthisdef.h:55
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr "Otvorí KDE pomocníka s BibleTime príručkou"
-
-#: bibletime/dummy.h:237 bibletime/whatsthisdef.h:56
-msgid ""
-"Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The "
-"installation instructions explain how to set up BibleTime and the text "
-"modules."
-msgstr ""
-
-#: bibletime/dummy.h:238 bibletime/whatsthisdef.h:57
-#, fuzzy
-msgid ""
-"Open KDE's helpbrowser with the Bible study HowTo included with BibleTime."
-"<BR>This HowTo is an introduction how to study the Bible in an efficient way."
-msgstr "Otvorí KDE pomocníka s BibleTime príručkou"
-
-#: bibletime/dummy.h:239 bibletime/whatsthisdef.h:58
-#, fuzzy
-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 ""
-"Prepne do <B>\"Čo je toto?\"</B> módu.<BR>Všetky podstatné elementyBibleTime "
-"GUI ponúkajú \"Čo je toto?\" pomoc."
-
-#: bibletime/dummy.h:240 bibletime/whatsthisdef.h:59
-msgid "Send a bugreport to the developers of BibleTime!"
-msgstr "Pošle správu vývojarom BibleTime!"
-
-#: bibletime/dummy.h:241 bibletime/whatsthisdef.h:60
-msgid ""
-"Show a daily tip.<BR>The tips contain important Bible quotations and helpful "
-"usage tips for BibleTime."
-msgstr ""
-"Zobrazí tip dňa.<BR> Tipy obsahujú dôležité biblické citáty a užitočnétipy "
-"pre používanie BibleTime."
-
-#: bibletime/dummy.h:242 bibletime/whatsthisdef.h:61
-msgid "Show detailed information about BibleTime."
-msgstr "Zobrazí detailné informácie o BibleTime."
-
-#: bibletime/dummy.h:243 bibletime/whatsthisdef.h:62
-#, fuzzy
-msgid "Show the \"about\" dialog of KDE 2."
-msgstr "Zobrazí všeobecné informácie o KDE 2."
-
-#: bibletime/dummy.h:247 bibletime/whatsthisdef.h:66
-msgid ""
-"This is the main index of BibleTime.<BR>Use it to manage the installed "
-"modules, to work with bookmarks, to open display windows etc.."
-msgstr ""
-"Toto je hlavný index BibleTime.<BR>Používa sa na ovládanie "
-"nainštalovanýchmodulov, k práci so záložkami, k otváraniiu okien atď.."
-
-#: bibletime/dummy.h:248 bibletime/whatsthisdef.h:67
-#, fuzzy
-msgid ""
-"Create a new folder in the main index.<BR>If you press the right mouse "
-"button on a folder, the new folder will become a sub-folder of it."
-"<BR>Otherwise you will create a toplevel folder."
-msgstr ""
-"Vytvorí novú zložku v hlavnom indexe.<BR>Ak ste stlačili pravé tlačítko na "
-"myšina zložke, nová zložka bude jeho položkou.<BR>Inak vytvorítezložku na "
-"najvyššej úrovni."
-
-#: bibletime/dummy.h:249 bibletime/whatsthisdef.h:68
-msgid "Change the properties of the selected folder."
-msgstr "Zmení nastavenie zvolenej zložky."
-
-#: bibletime/dummy.h:250 bibletime/whatsthisdef.h:69
-msgid "Change the properties of the selected bookmark."
-msgstr "Zmení nastavenie zvolenej záložky."
-
-#: bibletime/dummy.h:251 bibletime/whatsthisdef.h:70
-#, fuzzy
-msgid "Import bookmarks from a file."
-msgstr "Importuj záložky zo súboru."
-
-#: bibletime/dummy.h:252 bibletime/whatsthisdef.h:71
-msgid ""
-"Export bookmarks to a file so you or other<BR>users can import them later."
-msgstr ""
-"Exportuje záložky do súboru, aby ste vy alebo iný<BR>užívateľ ich mohli "
-"neskôr importovať."
-
-#: bibletime/dummy.h:253 bibletime/whatsthisdef.h:72
-#, fuzzy
-msgid ""
-"Use this to add this bookmark to BibleTime's print queue. The key, the "
-"description, and the text of the key will be used for printing."
-msgstr ""
-"Použite tot k pridaniu záložky do tlačovej fronty BibleTime. Kľúč, popis a "
-"text kľúča budú vytlačené."
-
-#: bibletime/dummy.h:254 bibletime/whatsthisdef.h:73
-msgid "Open a small dialog where you can unlock the selected module."
-msgstr "Otvorí malý dialóg, kde môžete odomknúť zvolené moduly."
-
-#: bibletime/dummy.h:255 bibletime/whatsthisdef.h:74
-msgid "Open a dialog to show information about the selected module."
-msgstr "Otvorí dialóg, kde sú zobrazené infomácie o zvolenom module."
-
-#: bibletime/dummy.h:258 bibletime/whatsthisdef.h:77
-#, fuzzy
-msgid ""
-"This area is the main workspace of Bibletime.<BR>All display windows are "
-"opened in this window."
-msgstr ""
-"Táto oblasť predstavuje pracovnú plochu BibleTime.<BR> Všetky okná sa "
-"zobrazujú tu."
-
-#: bibletime/dummy.h:260 bibletime/whatsthisdef.h:79
-msgid "The next entry of the module will be shown."
-msgstr "Ďalší záznam modulu bude zobrazený."
-
-#: bibletime/dummy.h:261 bibletime/whatsthisdef.h:80
-msgid "The previous entry of the module will be shown."
-msgstr "Predchádzajúci záznam modulu sa čoskoro objaví."
-
-#: bibletime/dummy.h:262 bibletime/whatsthisdef.h:81
-#, fuzzy
-msgid ""
-"For Bible texts, the next verse will be highlighted.<BR>In commentaries, the "
-"next entry will be shown."
-msgstr ""
-"Ak vidíte text Biblie, tak ďalší verš sa označený.<BR> Ak čítate komentár,"
-"ďalší záznam sa čoskoro objaví."
-
-#: bibletime/dummy.h:263 bibletime/whatsthisdef.h:82
-#, fuzzy
-msgid ""
-"For Bible texts, the previous verse will be highlighted. In commentaries,  "
-"the previous entry will be shown."
-msgstr ""
-"Ak vidíte text Biblie, tak predchádyajúci verš bude označený. Ak čítate "
-"komentár,predchádzajúci záznam sa čoskoro objaví."
-
-#: bibletime/dummy.h:264 bibletime/whatsthisdef.h:83
-msgid "Show the next chapter of the module. The verse will be set to \"1\"."
-msgstr "Zobrazí nasledujúcu kapitolu modulu. Verš sa nastaví na \"1\"."
-
-#: bibletime/dummy.h:265 bibletime/whatsthisdef.h:84
-msgid "Show the previous chapter of the module. The verse will be set to \"1\""
-msgstr "Zobrazí predchádzajúcu kapitolu modulu. Verš sa nastaví na \"1\"."
-
-#: bibletime/dummy.h:266 bibletime/whatsthisdef.h:85
-msgid ""
-"Show the next book of this module. The chapter and the verse will be set to "
-"\"1\"."
-msgstr ""
-"Zobrazí nasledujúcu knihu modulu. Verš a kapitola budú nastavené na \"1\"."
-
-#: bibletime/dummy.h:267 bibletime/whatsthisdef.h:86
-msgid ""
-"Show the previous book of this module. The chapter and the verse will be set "
-"to \"1\"."
-msgstr ""
-"Zobrazí predchádzajúcu knihu modulu. Verš a kapitola budú nastavené na \"1\"."
-
-#: bibletime/dummy.h:268 bibletime/whatsthisdef.h:87
-msgid "This list contains the books which are available in this module."
-msgstr "Zoznam obsahuje knihy, ktoré sú dostupné v tomto module."
-
-#: bibletime/dummy.h:269 bibletime/whatsthisdef.h:88
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr ""
-"Zoznam obsahuje kapitoly, ktoré sú dostupné v tomto module v aktuálnej knihe."
-
-#: bibletime/dummy.h:270 bibletime/whatsthisdef.h:89
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-"Zoznam obsahuje verše, ktoré sú dostupné v tomto module v aktuálnej kapitole."
-
-#: bibletime/dummy.h:271 bibletime/whatsthisdef.h:90
-msgid "This list contains the entries of the current module."
-msgstr "Zoznam obsahuje položky aktuálneho module."
-
-#: bibletime/dummy.h:272 bibletime/whatsthisdef.h:91
-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 ""
-"Toto tlačítko je užitočné pri prechádzaní položkami zoznamu.Stlačte tlačítko "
-"a pohybujte myšou ak chcete zvýšiť alebo znížiť položku."
-
-#: bibletime/dummy.h:273 bibletime/whatsthisdef.h:92
-msgid "Toggle between read-write and read-only mode of writeable modules."
-msgstr "Prepína módy zapisovateľné/iba na čítanie"
-
-#: bibletime/dummy.h:274 bibletime/whatsthisdef.h:93
-#, fuzzy
-msgid "Save new personal comments."
-msgstr "Uloží vlastný komentár"
-
-#: bibletime/dummy.h:275 bibletime/whatsthisdef.h:94
-msgid "Clear the text and delete the entry from the module."
-msgstr "Zmaže text a zmaže položku z modulu."
-
-#: bibletime/dummy.h:276 bibletime/whatsthisdef.h:95
-#, fuzzy
-msgid "Toggle bold formatting of the selected text."
-msgstr "Prepne medzi tučným a nie tučným formátovaním vybraného textu"
-
-#: bibletime/dummy.h:277 bibletime/whatsthisdef.h:96
-#, fuzzy
-msgid "Toggle italic formatting of the selected text."
-msgstr "Prepne medzi kurzívou a formátovaním nie kurzívou vybraného textu"
-
-#: bibletime/dummy.h:278 bibletime/whatsthisdef.h:97
-#, fuzzy
-msgid "Toggle underlined formatting of the selected text."
-msgstr ""
-"Prepne medzi podčiarknutým a nie podčiarknutým formátovaním vybraného textu"
-
-#: bibletime/dummy.h:279 bibletime/whatsthisdef.h:98
-msgid "Choose a new font for the selected text."
-msgstr "Vyberie nový typ písma pre vybraný text."
-
-#: bibletime/dummy.h:280 bibletime/whatsthisdef.h:99
-msgid "Choose a new color for the selected text."
-msgstr "Vyberie farbu pre zvolený text."
-
-#: bibletime/dummy.h:281 bibletime/whatsthisdef.h:100
-msgid "Choose a new fontsize for the selected text."
-msgstr "Vyberie  veľkosť typu písma pre zvolený text."
-
-#: bibletime/dummy.h:283 bibletime/whatsthisdef.h:102
-msgid ""
-"Synchronize the displayed verse of this module with the active Bible window."
-msgstr "Synchronizuje zobrazený text tohoto modulu s oknom s aktuálnou Bibliou"
-
-#: bibletime/dummy.h:286 bibletime/whatsthisdef.h:105
-#, fuzzy
-msgid "Save the displayed chapter as an HTML file."
-msgstr "Uloží zobrazenú kapitolu ako HTML súbor"
-
-#: bibletime/dummy.h:287 bibletime/whatsthisdef.h:106
-msgid "Select all text."
-msgstr "Označí celý text"
-
-#: bibletime/dummy.h:288 bibletime/whatsthisdef.h:107
-msgid "Copy the displayed text to the clipboard."
-msgstr "Kopíruje zobrazený text do schránky"
-
-#: bibletime/dummy.h:291 bibletime/whatsthisdef.h:110
-#, fuzzy
-msgid ""
-"Choose the modules which will be used for the search.<BR>Use the two buttons "
-"on the right side to add or delete the modules to/from the list of used ones."
-msgstr ""
-"Vyberie moduly, ktore sa použijú pri hľadaní.<BR>Použite dve tlačítkana "
-"poravej strane k pridaniu alebo odobraniu modulov do/zo zoznamu."
-
-#: bibletime/dummy.h:292 bibletime/whatsthisdef.h:111
-#, fuzzy
-msgid "Add the selected module to the list on the right."
-msgstr "Pridá zvolený modul do zoznamu vľavo"
-
-#: bibletime/dummy.h:293 bibletime/whatsthisdef.h:112
-#, fuzzy
-msgid "Remove the selected module from the list on the right side."
-msgstr "Odstráni zvolený modul zo zoznamu vľavej časti"
-
-#: bibletime/dummy.h:294 bibletime/whatsthisdef.h:113
-msgid "The list of modules used for the search."
-msgstr "Zoznam modulov použitých pri hľadaní."
-
-#: bibletime/dummy.h:296 bibletime/whatsthisdef.h:115
-#, fuzzy
-msgid ""
-"The text entered in this edit box will be searched for in all selected "
-"modules."
-msgstr "Text v tomto okne bude hľadaný vo všetkých moduloch."
-
-#: bibletime/dummy.h:297 bibletime/whatsthisdef.h:116
-#, fuzzy
-msgid ""
-"Select this to search for multiple words.<BR>Each word in the edit box above "
-"is searched as a single word."
-msgstr ""
-"Zloľte si túto možnosť ak chcete hľadať zložené slová.<BR> Každé slovo v "
-"editovacom riadku je hľadané ako samostatné slovo."
-
-#: bibletime/dummy.h:298 bibletime/whatsthisdef.h:117
-#, fuzzy
-msgid ""
-"Select this to search for exactly the same text you entered in the edit box."
-msgstr ""
-"Vyberte si túto možnosť, ak chcete aby vložený text bol vyhľadný tak, ako "
-"ste ho vložili."
-
-#: bibletime/dummy.h:299 bibletime/whatsthisdef.h:118
-msgid ""
-"Select this to search using standard GNU regular expressions.<BR>Read the "
-"handbook for a explanation how to use them."
-msgstr ""
-"Vyberte si túto možnosť, ak chcete pri vyhľadávaní použiť GNU regulárne "
-"výrazy.<BR> Prečítajte siv príručke vysvetlenie ako ich používať."
-
-#: bibletime/dummy.h:300 bibletime/whatsthisdef.h:119
-#, fuzzy
-msgid "Activate this to use a case sensitive search."
-msgstr "Aktivujte túto možnosť, ak chce aby sa brah ohľad na veľkosť písmen."
-
-#: bibletime/dummy.h:302 bibletime/whatsthisdef.h:121
-msgid "Select this if you want to search through all parts of the module(s)."
-msgstr ""
-"Vyberte si túto možnosť, ak chce vyhľadávať vo všetkých častiach modulov"
-
-#: bibletime/dummy.h:303 bibletime/whatsthisdef.h:122
-#, fuzzy
-msgid ""
-"Select this if you want to use the last search result as the search scope."
-msgstr ""
-"Vyberte si túto možnosť, ak chcete použiť výsledky posledného hľadania v "
-"kažkom module ako rozsah hľadania"
-
-#: bibletime/dummy.h:304 bibletime/whatsthisdef.h:123
-msgid "Create a new search scope."
-msgstr "Vytvorí nový rozsah hľadania."
-
-#: bibletime/dummy.h:305 bibletime/whatsthisdef.h:124
-#, fuzzy
-msgid ""
-"Use a custom scope for the search.<BR>A standard set of search scopes exists."
-msgstr ""
-"Použije vlastné rozsahy hľadania.<BR>Štandardné rozsahy hľadania sú tiež k "
-"dispozícii."
-
-#: bibletime/dummy.h:306 bibletime/whatsthisdef.h:125
-msgid "Use this button to delete the chosen search scope."
-msgstr "Použite toto tlaťítko, ak chcete zmazať vybraný rozsah hľadania."
-
-#: bibletime/dummy.h:308 bibletime/whatsthisdef.h:127
-msgid "Choose a search scope from the combo box"
-msgstr "Vyberte rozsah hľadania z kombo boxu."
-
-#: bibletime/dummy.h:309 bibletime/whatsthisdef.h:128
-msgid ""
-"Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-"
-"Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. "
-"Genesis;Matthew)."
-msgstr ""
-"Vložte svoj vlastný rozsah hľadania.<BR>. Definujte rozsah s použitím \"-"
-"\" (napr. Genesis-Exodus),<BR>K oddeleniu jednotlivých rozsahov alebo kľúčov "
-"použite podkočiarku(napr. Genesis; Matúš)."
-
-#: bibletime/dummy.h:310 bibletime/whatsthisdef.h:129
-msgid ""
-"This list contains the parsed result of your entered scope. This result will "
-"be used for the search."
-msgstr ""
-"Zoznam obsahuje analyzované výsledky vzmi vloženého rozsahu. Tieto výsledky "
-"budúpoužité pri hľadaní."
-
-#: bibletime/dummy.h:311 bibletime/whatsthisdef.h:130
-msgid "Close this dialog and save the changes."
-msgstr "Ukočí dialóg a uloží zmeny."
-
-#: bibletime/dummy.h:313 bibletime/whatsthisdef.h:132
-msgid ""
-"List of modules used for the search.<BR>Click on a module to see the search "
-"result on the right side."
-msgstr ""
-"Zoznam modulov pouzívaných pri hľadaní.<BR> Kliknite na modul, keď chcete "
-"vidieť výsledky na pravej strane."
-
-#: bibletime/dummy.h:314 bibletime/whatsthisdef.h:133
-msgid "This contains the items found in the selected module."
-msgstr "Toto obsahuje položky nájdené vo zvolšných moduloch."
-
-#: bibletime/dummy.h:315 bibletime/whatsthisdef.h:134
-msgid "This text box shows a preview of the chosen item."
-msgstr "Tento textový blok zobrazuje náhľad vybraných položiek."
-
-#: bibletime/dummy.h:317 bibletime/whatsthisdef.h:136
-msgid ""
-"Graphical analysis of your search result.<BR>The bars show the number of "
-"items found in each book of the Bible or commentary."
-msgstr ""
-"Grafická analýza vášho hľadania.<BR> Stĺpce zobrazujú početpoložiek "
-"nájdených v každej knihe Biblie alebo komentáry."
-
-#: bibletime/dummy.h:320 bibletime/whatsthisdef.h:139
-msgid "Activate this box to see a daily tip on startup."
-msgstr "Aktivujte túto možnosť, ak chcete vidieť tipy dňa pri spustení."
-
-#: bibletime/dummy.h:321 bibletime/whatsthisdef.h:140
-msgid ""
-"Contains the languages which can be used for the international booknames."
-msgstr ""
-"Obsahuje jazyky, ktoré môžu byť použité pri medzinárodných názvoch kníh."
-
-#: bibletime/dummy.h:322 bibletime/whatsthisdef.h:141
-#, fuzzy
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr "Aktivujte túto možnosť, ak chcete vidieť tipy dňa pri spustení."
-
-#: bibletime/dummy.h:323 bibletime/whatsthisdef.h:142
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr ""
-
-#: bibletime/dummy.h:324 bibletime/whatsthisdef.h:143
-msgid ""
-"Save the windows in the workspace if BibleTime is closed<BR>and restore them "
-"on the next startup. "
-msgstr ""
-
-#: bibletime/dummy.h:326 bibletime/whatsthisdef.h:145
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This will speed up opening the lexicons a lot, but consume some disk space. "
-"Recommended."
-msgstr ""
-
-#: bibletime/dummy.h:327 bibletime/whatsthisdef.h:146
-msgid "The default Bible is used when a hyperlink into a Bible was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:328 bibletime/whatsthisdef.h:147
-msgid ""
-"The default commentary is used when a hyperlink into a commentary was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:329 bibletime/whatsthisdef.h:148
-msgid "The default lexicon is used when a hyperlink into a lexicon was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:330 bibletime/whatsthisdef.h:149
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon "
-"was clicked"
-msgstr ""
-
-#: bibletime/dummy.h:331 bibletime/whatsthisdef.h:150
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon was "
-"clicked"
-msgstr ""
-
-#: bibletime/dummy.h:332 bibletime/whatsthisdef.h:151
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:333 bibletime/whatsthisdef.h:152
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text was clicked."
-msgstr ""
-
-#: bibletime/dummy.h:335 bibletime/whatsthisdef.h:154
-#, fuzzy
-msgid "Select an action and change the key binding for the action."
-msgstr "Vyberte si funkciu a zmeňte pre ňu klávesovú skratku."
-
-#: bibletime/dummy.h:336 bibletime/whatsthisdef.h:155
-#, fuzzy
-msgid ""
-"Use this box to select how the font is used and change the font in the font "
-"chooser."
-msgstr "Vyberte si tu spsob použitia typu písma, zmeňte typ písma."
-
-#: bibletime/dummy.h:339 bibletime/whatsthisdef.h:158
-msgid "This is the background color used in display windows."
-msgstr "Toto je farba pozadia, ktorá je použitá pre zobrazovaní okien."
-
-#: bibletime/dummy.h:340 bibletime/whatsthisdef.h:159
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr "Toto je farba označeného verša, ktorá je použitá pri zobrazení okien."
-
-#: bibletime/dummy.h:342 bibletime/whatsthisdef.h:161
-#, fuzzy
-msgid "Set the keyboard accelerators used in all display windows"
-msgstr "Toto je farba pozadia, ktorá je použitá pre zobrazovaní okien."
-
-#: bibletime/dummy.h:343 bibletime/whatsthisdef.h:162
-#, fuzzy
-msgid "Set keyboard accelerators used in Bible windows"
-msgstr "Nastav klávesové skratky"
-
-#: bibletime/dummy.h:344 bibletime/whatsthisdef.h:163
-#, fuzzy
-msgid "Set the keyboard accelerators used in commentary windows"
-msgstr "Nastav klávesové skratky"
-
-#: bibletime/dummy.h:345 bibletime/whatsthisdef.h:164
-#, fuzzy
-msgid "Set the keyboard accelerators used in lexicon windows"
-msgstr "Nastav klávesové skratky"
-
-#: bibletime/dummy.h:349 bibletime/whatsthisdef.h:168
-msgid ""
-"Start the printing process.<BR>The items of the list will be printed using "
-"the assigned styles."
-msgstr ""
-"Sputí proces tlače.<BR>Položky v zozname budú vytlačené s použitím zvoleného "
-"štýlu."
-
-#: bibletime/dummy.h:350 bibletime/whatsthisdef.h:169
-msgid ""
-"Print into a temporary file and open a postscript viewer to preview the "
-"printing result."
-msgstr ""
-"Tlačí do dočasného súboru a otvoríaplikáciu k púrezeraniu poscriptu k "
-"vytvoreniu náhľadu pre tlač."
-
-#: bibletime/dummy.h:351 bibletime/whatsthisdef.h:170
-#, fuzzy
-msgid "Closes this dialog without doing anything else."
-msgstr ""
-"Ukončí tento dialóg bez akéhokoľvek zásahu do položiek alebo tlačiarne."
-
-#: bibletime/dummy.h:352 bibletime/whatsthisdef.h:171
-msgid "Open the online help of BibleTime."
-msgstr "Otvorí online pomoc pre BibleTime."
-
-#: bibletime/dummy.h:354 bibletime/whatsthisdef.h:173
-#, fuzzy
-msgid "This combo box contains the available print styles."
-msgstr "Tento blok obsahuje dostupné štýly pre tlač."
-
-#: bibletime/dummy.h:355 bibletime/whatsthisdef.h:174
-msgid "This is the list which contains the available print items."
-msgstr "Tento zoznam obsahuje dostupné položky pre tlač."
-
-#: bibletime/dummy.h:356 bibletime/whatsthisdef.h:175
-#, fuzzy
-msgid "Move the selected item up one item."
-msgstr "Posunie zvolenú položku o jednu položku nižšie."
-
-#: bibletime/dummy.h:357 bibletime/whatsthisdef.h:176
-#, fuzzy
-msgid "Move the selected item down one item."
-msgstr "Posunie zvolenú položku o jednu položku vyššie."
-
-#: bibletime/dummy.h:358 bibletime/whatsthisdef.h:177
-msgid "Delete the selected items."
-msgstr "Zmaže vybrané položky."
-
-#: bibletime/dummy.h:359 bibletime/whatsthisdef.h:178
-#, fuzzy
-msgid ""
-"Inserts a page break into the list.<BR>The printer will start a new page."
-msgstr ""
-"Vloží koniec strany do zoznamu.<BR>Tlačiareň začne tlačiť na novej strane."
-
-#: bibletime/dummy.h:361 bibletime/whatsthisdef.h:180
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr "Táto skupina obsahuej ohraničenie strany v milimetroch"
-
-#: bibletime/dummy.h:362 bibletime/whatsthisdef.h:181
-#, fuzzy
-msgid "The size of the border on the left side of the paper."
-msgstr "Veľkosť ohraničenia vľavej časti papierového listu."
-
-#: bibletime/dummy.h:363 bibletime/whatsthisdef.h:182
-#, fuzzy
-msgid "The size of the border on the right side of the paper."
-msgstr "Veľkosť ohraničenia vpravej časti papierového listu."
-
-#: bibletime/dummy.h:364 bibletime/whatsthisdef.h:183
-#, fuzzy
-msgid "The size of the border on the top of the paper."
-msgstr "Veľkosť horného ohraničenia na papierovom liste."
-
-#: bibletime/dummy.h:365 bibletime/whatsthisdef.h:184
-#, fuzzy
-msgid "The size of the border on the bottom of the paper."
-msgstr "Veľkosť spodného ohraničenia na papierovom liste."
-
-#: bibletime/dummy.h:366 bibletime/whatsthisdef.h:185
-msgid ""
-"This list contains the available printing styles.<BR>Create your own one "
-"using the \"New style\" button."
-msgstr ""
-"Zoznam obsahuje dostupné štýly pre tlač.<BR> Nový môžete vytvoriťpoužitím "
-"tlačítka \"Nový štyl\"."
-
-#: bibletime/dummy.h:367 bibletime/whatsthisdef.h:186
-msgid "Remove the selected printing style from the list."
-msgstr "Odstráni zvolený štýl pre tlač zo zoznamu."
-
-#: bibletime/dummy.h:368 bibletime/whatsthisdef.h:187
-msgid "Change the properties of the selected printing style."
-msgstr "Zmení nastavenie pre vybraný štýl pre tlač."
-
-#: bibletime/dummy.h:369 bibletime/whatsthisdef.h:188
-msgid ""
-"Create a new printing style.<BR>The new style will be added to the list."
-msgstr "Vytvorí nový štýl pre tlač.<BR>Nový štýl bude pridaný do zoznamu."
-
-#~ msgid "Save verse with text as ..."
-#~ msgstr "Ulož verš s textom ako ..."
-
-#~ msgid "The bible window"
-#~ msgstr "Okno biblie"
-
-#~ msgid "The commentary window"
-#~ msgstr "Okno komentáru"
-
-#~ msgid "The lexicon window"
-#~ msgstr "Okno lexikónu"
-
-#~ msgid "The list of printers"
-#~ msgstr "Zoznam tlačiarní"
-
-#, fuzzy
-#~ msgid "Print to a file"
-#~ msgstr "Tlač do súboru"
-
-#~ msgid "Browse for the file"
-#~ msgstr "Hľadaj súbor"
-
-#, fuzzy
-#~ msgid "Number of copies"
-#~ msgstr "&Počet kópii"
-
-#~ msgid "Paper type"
-#~ msgstr "Typ papiera"
-
-#~ msgid "Paper size"
-#~ msgstr "Veľkosť papiera"
-
-#~ msgid "This is the Bible display window"
-#~ msgstr "Toto je okno, kde je zobrazená Biblia."
-
-#~ msgid "This is the commentary display window."
-#~ msgstr "Toto je okno, kde je zobrazený komentár."
-
-#~ msgid "This is the lexicon display window."
-#~ msgstr "Toto je okno, kde je zobrazený lexikón."
-
-#~ msgid ""
-#~ "This is the list of available printers of your system.<BR>Please select "
-#~ "the printer you want to use for printing."
-#~ msgstr ""
-#~ "Toto je zoznam dostupných tlačiarní vo vašom systéme.<BR>Prosím zvoľte "
-#~ "tlačiareň, ktorú chcete použiť na tlač."
-
-#, fuzzy
-#~ msgid "Print to a postscript file on disk."
-#~ msgstr "Tlač do postscriptového súboru na disk."
-
-#, fuzzy
-#~ msgid "Browse for the file you want to print to."
-#~ msgstr "Hľadanie súboru, do ktorého chcete tlačiť."
-
-#, fuzzy
-#~ msgid "The number of copies for printing."
-#~ msgstr "Koľko kópii bude vytvorených pri tlači."
-
-#, fuzzy
-#~ msgid "Choose the orientation of the paper."
-#~ msgstr "Zvoľte orientáciu použitého papiera."
-
-#, fuzzy
-#~ msgid "Print on the paper using \"Portrait\" orientation."
-#~ msgstr "Tlač na papier s použitím orientácie na \"Na výšku\" "
-
-#, fuzzy
-#~ msgid "Print on the paper using \"Landscape\" orientation."
-#~ msgstr "Tlač na papier s použitím orientácie na \"Na šírku\" "
-
-#~ msgid "The type of the paper which is used for printing."
-#~ msgstr "Typ papiera, ktorý bude použitý pri tlači."
-
-#, fuzzy
-#~ msgid "The size of the paper used."
-#~ msgstr "Veľkosť použitého papiera."
-
-#~ msgid "Search result for \"%1\" in module \"%2\"\n"
-#~ msgstr "Hľadaj výsledky pre \"%1\" v module \"%2\"\n"
-
-#~ msgid "Printdialog"
-#~ msgstr "Tlačový dialóg"
-
-#~ msgid "The general options for printing"
-#~ msgstr "Všeobecné možnosti pre tlač"
-
-#~ msgid "Available printers:"
-#~ msgstr "Dostupné tlačiarne:"
-
-#~ msgid "Host"
-#~ msgstr "Hostiteľ"
-
-#~ msgid "Comment"
-#~ msgstr "Komentár"
-
-#~ msgid "Print to file:"
-#~ msgstr "Tlač do súboru:"
-
-#~ msgid "&Number of copies"
-#~ msgstr "&Počet kópii"
-
-#~ msgid "Por&trait"
-#~ msgstr "Na &výšku"
-
-#~ msgid "L&andscape"
-#~ msgstr "N&a šírku"
-
-#~ msgid "Paper t&ype"
-#~ msgstr "T&yp papiera"
-
-#~ msgid "Size: 8888mm x 8888mm"
-#~ msgstr "Veľkosť: 8888mm x 8888mm"
-
-#~ msgid "Preview application:"
-#~ msgstr "Aplikácia pre náhľad:"
-
-#~ msgid "*.ps | Postscript files"
-#~ msgstr "*.ps | Postscript súbory"
-
-#~ msgid "A4"
-#~ msgstr "A4"
-
-#~ msgid "A5"
-#~ msgstr "A5"
-
-#~ msgid "Letter"
-#~ msgstr "Letter"
-
-#~ msgid "Legal"
-#~ msgstr "Legal"
-
-#~ msgid "Executive"
-#~ msgstr "Executive"
-
-#~ msgid "Layout specific settings"
-#~ msgstr "Nastavenie pre konkrétne rozloženie"
-
-#~ msgid "Entries"
-#~ msgstr "Záznamy"
-
-#~ msgid "Management of BibleTime's printing queue"
-#~ msgstr "Riadenie tlačovej fronty v BibleTime"
-
-#~ msgid "Size: %1mm x %2mm"
-#~ msgstr "Veľkosť: %1mm x %2mm"
-
-#~ msgid "Useful tips for BibleTime"
-#~ msgstr "Užitočné tipy pre BibleTime"
-
-#~ msgid "Run on startup"
-#~ msgstr "Spusti pri štarte"
-
-#, fuzzy
-#~ msgid "Language:"
-#~ msgstr "Zoznam jazykov"
-
-#, fuzzy
-#~ msgid "Foonotes:"
-#~ msgstr "Poznámky pod čiarov"
-
-#~ msgid "Strong's numbers: %1<BR>"
-#~ msgstr "Strongové čislo: %1<BR>"
-
-#, fuzzy
-#~ msgid "Unlock key:"
-#~ msgstr "Kľúč k odomknutiu"
-
-#, fuzzy
-#~ msgid "Version:"
-#~ msgstr "Verzia"
-
-#, fuzzy
-#~ msgid "Not necessary"
-#~ msgstr "<I>Nie je nevyhnutné!</I>"
-
-#~ msgid "Datapath"
-#~ msgstr "Cesta k dátam (Datapath)"
-
-#~ msgid ""
-#~ "<qt><B>The file does already exist!</B><BR>Do you want to overwrite it?</"
-#~ "qt>"
-#~ msgstr "<qt><B>Súbor už existuje!</B><BR>Chcete ho prepísať?</qt>"
-
-#~ msgid "BibleTime - Save file as ..."
-#~ msgstr "BibleTime - Ulož súbor ako..."
-
-#~ msgid "Printing %1"
-#~ msgstr "Tlačenie %1"
-
-#, fuzzy
-#~ msgid "Startup options"
-#~ msgstr "Spusti tlač"
-
-#, fuzzy
-#~ msgid "SWORD options"
-#~ msgstr "Spusti tlač"
-
-#, fuzzy
-#~ msgid "Configure BibleTime's key bindings"
-#~ msgstr "Nastavenie kláves v BibleTime"
-
-#, fuzzy
-#~ msgid "Display windows"
-#~ msgstr "Zobraz okno"
-
-#, fuzzy
-#~ msgid "General settings for display windows"
-#~ msgstr "Uzavrie všetkyzobrazené okná."
-
-#, fuzzy
-#~ msgid "Colors used in display windows"
-#~ msgstr "Uzavrie všetkyzobrazené okná."
-
-#~ msgid "Choose fonts for BibleTime"
-#~ msgstr "Vyber typ písma pre BibleTime"
-
-#~ msgid "Choose the area of application and set the font for it"
-#~ msgstr "Vyberte oblasť aplikácie a zvoľte typ písma pre ňu"
-
-#, fuzzy
-#~ msgid "Accelerators used by all windows"
-#~ msgstr "Zavri všetky okná"
-
-#, fuzzy
-#~ msgid "Accelerators for bible windows"
-#~ msgstr "Okno biblie"
-
-#, fuzzy
-#~ msgid "Accelerators for commentary windows"
-#~ msgstr "Okno komentáru"
-
-#, fuzzy
-#~ msgid "Accelerators for lexicon windows"
-#~ msgstr "Okno lexikónu"
-
-#, fuzzy
-#~ msgid "Initializing keyboard accelerators"
-#~ msgstr "Nastav klávesové skratky"
-
-#~ msgid "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-#~ msgstr "<CENTER><FONT SIZE=\"+2\">%1</FONT></CENTER><HR>"
-
-#~ msgid "Display window"
-#~ msgstr "Zobraz okno"
-
-#, fuzzy
-#~ msgid "Display window Unicode"
-#~ msgstr "Zobraz okno"
-
-#, fuzzy
-#~ msgid ""
-#~ "* | Text files\n"
-#~ " *.* | All files (*.*)"
-#~ msgstr ""
-#~ "*.txt | Textové súbory\n"
-#~ " *.* | Všetky súbory (*.*)"
-
-#~ msgid "Show a daily tip"
-#~ msgstr "Zobraz tip dňa"
-
-#~ msgid "List of modules"
-#~ msgstr "Zoznam modulov"
-
-#~ msgid "Show a preview"
-#~ msgstr "Zobraz náhľad"
-
-#~ msgid "Copies"
-#~ msgstr "Kópie"
-
-#~ msgid "List of styles"
-#~ msgstr "Zoznam štýlov"
-
-#~ msgid "Delete the chosen printing style"
-#~ msgstr "Zmaž vybraný tlačový štýl"
-
-#~ msgid "Edit the chosen printing style"
-#~ msgstr "Uprav zvolený tlačový štýl"
-
-#~ msgid "Show or hide the main index depending on current state."
-#~ msgstr "Zobrazí alebo skryje hlavný index v závislosti od aktuálneho stavu."
-
-#~ msgid "Show or hide the main toolbar depending on current state."
-#~ msgstr ""
-#~ "Zobrazí alebo skryje panel nástrojov v závislosti od aktuálneho stavu."
-
-#~ msgid ""
-#~ "Show or hide the footnotes in the modules deoending on current state."
-#~ msgstr ""
-#~ "Zobrazí alebo skryje poznámky pod čiarov v module v závislosti od "
-#~ "aktuálneho stavu."
-
-#~ msgid "Arrange the opened display windows in a tile pattern."
-#~ msgstr "Upraví otovrené okná podľa dlaždicového vzoru."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a tile pattern if "
-#~ "it's necessary."
-#~ msgstr ""
-#~ "Otvárané okná budú automaticky upravené podľa dlaždicového vzoru, ak je "
-#~ "to nevyhnutné."
-
-#~ msgid "Arrange the open display windows in a cascade pattern."
-#~ msgstr "Upraví otovrené okná podľa kaskádového vzoru."
-
-#~ msgid ""
-#~ "The open display windows will automatically arranged in a cascade pattern "
-#~ "if it's necessary."
-#~ msgstr ""
-#~ "Otvárané okná budú automaticky upravené podľa kaskádového vzoru, ak je to "
-#~ "nevyhnutné."
-
-#~ msgid "Open a dialog where you can edit the toolbar of BibleTime."
-#~ msgstr "Otvorí dialóg, kde môžete uptaviť panel nástrojov BibleTime"
-
-#~ msgid "Activate this to see a startup logo on each startup of BibleTime."
-#~ msgstr ""
-#~ "Aktivujete túto možnosť, ak si chcete vidieť pri sputení logo BibleTime."
-
-#~ msgid "This list contains the modules using foreign fonts."
-#~ msgstr "Tento zoznam obsahuje moduly pouzívajúce zahraničné typy písma"
-
-#~ msgid "&Show footnotes"
-#~ msgstr "&Zobraz poznámky pod čiarov"
-
-#~ msgid "S&how Strong's numbers"
-#~ msgstr "U&káž strongové čísla"
-
-#~ msgid "handbook"
-#~ msgstr "príručka"
-
-#~ msgid "Martin Luther startup logo"
-#~ msgstr "Štartovacie logo s Martinom Lutherom"
-
-#~ msgid "Sponsor of www.bibletime.de"
-#~ msgstr "Sponzor stránky www.bibletime.de!"
-
-#~ msgid "backend"
-#~ msgstr "backend"
-
-#~ msgid ""
-#~ "Leader of the SWORD project.\n"
-#~ "Lots of help with the SWORD API!"
-#~ msgstr ""
-#~ "Vedúci projektu SWORD.\n"
-#~ "Poskytol veľa pomoci s SWORD API!"
-
-#~ msgid "Module fonts"
-#~ msgstr "Typy písma v modul"
-
-#~ msgid "Configure the fonts used for modules"
-#~ msgstr "Nastavte typy písma používané pre moduly"
-
-#~ msgid "Result with text"
-#~ msgstr "Výsledky s textom"
-
-#~ msgid "Left"
-#~ msgstr "Vľavo"
-
-#~ msgid "Center"
-#~ msgstr "Stred"
-
-#~ msgid "Right"
-#~ msgstr "Vpravo"
-
-#~ msgid "&Bottom"
-#~ msgstr "&Dole"
-
-#~ msgid "Select all"
-#~ msgstr "Zvoľ všetko"
-
-#~ msgid "Configure BibleTime's general options"
-#~ msgstr "Nastavte všeobecné možnosti v BibleTime"
-
-#~ msgid ""
-#~ "<DIV align=\"center\"><B>Missing tips!</B></DIV><BR><BR>Your installation "
-#~ "is missing the daily tips.\t\tPlease make sure all files of BibleTime are"
-#~ "\t\tinstalled and that the permissions of $KDEDIR are correct!<BR><BR>\t"
-#~ "\tIf you can't solve this problem please contact the team of BibleTime at"
-#~ "\t\t<A HREF=\"mailto:info@bibletime.de\">info@bibletime.de</A>!"
-#~ msgstr ""
-#~ "<DIV align=\"center\"><B>Chýbajú tipy!</B></DIV><BR><BR>Vaša "
-#~ "inštalácianeobsahuje tipy dňa.\t\tUistite sa, prosím, či všetky súbory "
-#~ "BibleTime sú\t\tnainštalované a či prístupové práva ku $KDEDIR sú správne!"
-#~ "<BR><BR>\t\t Ak nemôžete vyriešiť tento problém, skontaktujte sa prosím s "
-#~ "BibleTime tímom na\t\t<A HREF=\"mailto:info@bibletime.de\">info@bibletime."
-#~ "de</A>!"
-
-#~ msgid "Foonotes: %1<BR>"
-#~ msgstr "Poznámka: %1<BR>"
-
-#~ msgid "BibleTime - Help window"
-#~ msgstr "BibleTime - Pomocník"
-
-#~ msgid "Translation into Brazilian Portoguese"
-#~ msgstr "Preklad do brazílčiny a portugalštiny"
diff --git a/bibletime-doc/stamp-h.in b/bibletime-doc/stamp-h.in
deleted file mode 100644
index e69de29..0000000
--- a/bibletime-doc/stamp-h.in
+++ /dev/null
diff --git a/bibletime.desktop b/bibletime.desktop
index 11f5988..cd96b95 100644
--- a/bibletime.desktop
+++ b/bibletime.desktop
@@ -8,12 +8,12 @@ Comment[fr]=Un outil d'�ude biblique facile �utiliser
 Exec=bibletime
 Icon=bibletime.png
 MimeType=
-Name=BibleTime 1.1
-Name[C]=BibleTime 1.1
-Name[cs]=BibleTime 1.1
-Name[da]=Bibeltime 1.1
-Name[de]=BibleTime 1.1
-Name[fr]=BibleTime 1.1
+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
diff --git a/bibletime.kdevprj b/bibletime.kdevprj
index ff38aa0..e07769e 100644
--- a/bibletime.kdevprj
+++ b/bibletime.kdevprj
@@ -18,31 +18,34 @@ type=DATA
 [Config for BinMakefileAm]
 addcxxflags=
 bin_program=bibletime
+cflags=
+cppflags=
 cxxflags=\s-O2 -Wall
 ldadd=-lpthread -lkfile -lkdeui -lkdecore -lqt -lXext -lX11
-ldflags=
+ldflags=\s                   \s
 libtool_dir=
 path_to_bin_program=bibletime
 
 [General]
 AMChanged=false
 author=The BibleTime team
-configure_args=--with-qt-dir=/usr/lib/qt2 --with-kdedir=/opt/kde2
+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.de
-execute_args=--debug --ignore-startprofile
+email=info@bibletime.info
+execute_args=--debug --ignore-session
 kdevprj_version=1.3
-lfv_open_groups=
+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
+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.1beta2
+version=1.3
 version_control=CVS
 workspace=1
 
@@ -65,7 +68,7 @@ kpp_icon=0
 kpp_license=5
 kpp_summary=
 kpp_url=http://www.bibletime.de/
-kpp_version=1.0
+kpp_version=1.3
 
 [LFV Groups]
 Andere=*,
@@ -80,8 +83,8 @@ 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=bibletime.kdevprj,COPYING,ChangeLog,bibletime.spec.in,README.in,TODO.in,INSTALL.in,bibletime.lsm.in,bibletime.lsm,bibletime.spec,NEWS,README,TODO,INSTALL,configure.in.in,configure.in,am_edit,bibletime.desktop.in,NEWS.in,Makefile.cvs
-sub_dirs=bibletime,po,admin,doc,CVS,
+files=
+sub_dirs=bibletime,po,admin,doc,CVS,setupwizard
 type=normal
 
 [Makefile.cvs]
@@ -133,27 +136,15 @@ show_outputview=true
 show_treeview=true
 
 [admin/Makefile.am]
-files=admin/acinclude.m4.in,admin/am_edit.py,admin/Makefile.common,admin/missing,admin/ylwrap,admin/mkinstalldirs,admin/ltmain.sh,admin/config.sub,admin/config.pl,admin/config.guess,admin/conf.change.pl,admin/ltcf-c.sh,admin/ltcf-cxx.sh,admin/libtool.m4.in,admin/install-sh,admin/debianrules,admin/depcomp,admin/ltconfig
+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/Makefile.common]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [admin/acinclude.m4.in]
 dist=true
 install=false
 install_location=
 type=DATA
 
-[admin/am_edit.py]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [admin/conf.change.pl]
 dist=true
 install=false
@@ -208,18 +199,6 @@ install=false
 install_location=$$$$(kde_htmldir)/de/bibletime/tipdatabase
 type=DATA
 
-[admin/ltcf-c.sh]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/ltcf-cxx.sh]
-dist=false
-install=false
-install_location=
-type=DATA
-
 [admin/ltconfig]
 dist=true
 install=false
@@ -250,12 +229,6 @@ install=false
 install_location=
 type=DATA
 
-[am_edit]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [bibletime.desktop]
 dist=true
 install=false
@@ -299,34 +272,34 @@ 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/structdef.h,bibletime/whatsthisdef.h,bibletime/tooltipdef.h,bibletime/bibletime.in,bibletime/resource.h
+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/chtmlchapterdisplay.cpp,bibletime/backend/chtmlchapterdisplay.h,bibletime/backend/chtmlentrydisplay.cpp,bibletime/backend/chtmlentrydisplay.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/bt_basicfilter.cpp,bibletime/backend/bt_basicfilter.h,bibletime/backend/cswordtreekey.h,bibletime/backend/cswordtreekey.cpp,bibletime/backend/cswordbookmoduleinfo.h,bibletime/backend/cswordbookmoduleinfo.cpp,bibletime/backend/chtmlbookdisplay.cpp,bibletime/backend/chtmlbookdisplay.h
+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_basicfilter.cpp]
+[bibletime/backend/bt_gbfhtml.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/backend/bt_basicfilter.h]
+[bibletime/backend/bt_gbfhtml.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/backend/bt_gbfhtml.cpp]
+[bibletime/backend/bt_osishtml.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/backend/bt_gbfhtml.h]
+[bibletime/backend/bt_osishtml.h]
 dist=true
 install=false
 install_location=
@@ -344,43 +317,43 @@ install=false
 install_location=
 type=HEADER
 
-[bibletime/backend/chtmlbookdisplay.cpp]
+[bibletime/backend/centrydisplay.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/backend/chtmlbookdisplay.h]
+[bibletime/backend/centrydisplay.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/backend/chtmlchapterdisplay.cpp]
+[bibletime/backend/cfiltertool.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/backend/chtmlchapterdisplay.h]
+[bibletime/backend/cfiltertool.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/backend/chtmlentrydisplay.cpp]
+[bibletime/backend/ckey.h]
 dist=true
 install=false
 install_location=
-type=SOURCE
+type=HEADER
 
-[bibletime/backend/chtmlentrydisplay.h]
+[bibletime/backend/clanguagemgr.cpp]
 dist=true
 install=false
 install_location=
-type=HEADER
+type=SOURCE
 
-[bibletime/backend/ckey.h]
+[bibletime/backend/clanguagemgr.h]
 dist=true
 install=false
 install_location=
@@ -531,51 +504,45 @@ install_location=
 type=HEADER
 
 [bibletime/backend/sword_backend/Makefile.am]
-files=bibletime/backend/sword_backend/chtmlchapterdisplay.cpp,bibletime/backend/sword_backend/chtmlchapterdisplay.h
+files=
 sub_dirs=
 type=shared_library
 
-[bibletime/backend/sword_backend/chtmlchapterdisplay.cpp]
+[bibletime/bibletime.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/backend/sword_backend/chtmlchapterdisplay.h]
+[bibletime/bibletime.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/bibletime.cpp]
+[bibletime/bibletime_init.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/bibletime.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/bibletime.in]
+[bibletime/bibletime_slots.cpp]
 dist=true
 install=false
 install_location=
-type=DATA
+type=SOURCE
 
-[bibletime/bibletime_init.cpp]
+[bibletime/bibletimeapp.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/bibletime_slots.cpp]
+[bibletime/bibletimeapp.h]
 dist=true
 install=false
 install_location=
-type=SOURCE
+type=HEADER
 
 [bibletime/docs/Makefile.am]
 files=
@@ -623,95 +590,89 @@ sub_dirs=
 type=normal
 
 [bibletime/frontend/Makefile.am]
-files=bibletime/frontend/cmdiarea.cpp,bibletime/frontend/cmdiarea.h,bibletime/frontend/ceditwidget.h,bibletime/frontend/chtmldialog.cpp,bibletime/frontend/chtmldialog.h,bibletime/frontend/chtmlwidget.cpp,bibletime/frontend/chtmlwidget.h,bibletime/frontend/kstartuplogo.h,bibletime/frontend/kstartuplogo.cpp,bibletime/frontend/ctoolclass.h,bibletime/frontend/ctoolclass.cpp,bibletime/frontend/cminmaxlayout.cpp,bibletime/frontend/cminmaxlayout.h,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/creferencemanager.cpp,bibletime/frontend/creferencemanager.h,bibletime/frontend/cbtconfig.cpp,bibletime/frontend/cbtconfig.h,bibletime/frontend/coptionsdialog.cpp,bibletime/frontend/coptionsdialog.h,bibletime/frontend/cpointers.cpp,bibletime/frontend/cpointers.h,bibletime/frontend/cexportmanager.cpp,bibletime/frontend/cexportmanager.h
-sub_dirs=groupmanager,presenters,optionsdialog,searchdialog,keychooser,thirdparty
+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/cbtconfig.cpp]
+[bibletime/frontend/btinstallmgr.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/cbtconfig.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/ceditwidget.h]
+[bibletime/frontend/btinstallmgr.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/cexportmanager.cpp]
+[bibletime/frontend/cbtconfig.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/cexportmanager.h]
+[bibletime/frontend/cbtconfig.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/chtmldialog.cpp]
+[bibletime/frontend/cdragdropmgr.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/chtmldialog.h]
+[bibletime/frontend/cdragdropmgr.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/chtmlwidget.cpp]
+[bibletime/frontend/cexportmanager.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/chtmlwidget.h]
+[bibletime/frontend/cexportmanager.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/cinputdialog.cpp]
+[bibletime/frontend/chtmldialog.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/cinputdialog.h]
+[bibletime/frontend/chtmldialog.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/cmdiarea.cpp]
+[bibletime/frontend/cinputdialog.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/cmdiarea.h]
+[bibletime/frontend/cinputdialog.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/cminmaxlayout.cpp]
+[bibletime/frontend/cmdiarea.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/cminmaxlayout.h]
+[bibletime/frontend/cmdiarea.h]
 dist=true
 install=false
 install_location=
@@ -729,12 +690,6 @@ install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/cpointers.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
 [bibletime/frontend/cpointers.h]
 dist=true
 install=false
@@ -777,492 +732,460 @@ install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/creferencemanager.cpp]
+[bibletime/frontend/cswordsetupdialog.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/creferencemanager.h]
+[bibletime/frontend/cswordsetupdialog.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/ctoolclass.cpp]
+[bibletime/frontend/ctooltip.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/ctoolclass.h]
+[bibletime/frontend/ctooltip.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/groupmanager/Makefile.am]
-files=bibletime/frontend/groupmanager/cgroupmanager.h,bibletime/frontend/groupmanager/cgroupmanageritem.cpp,bibletime/frontend/groupmanager/cgroupmanageritem.h,bibletime/frontend/groupmanager/cgroupmanager.cpp,
-sub_dirs=
-type=static_library
-
-[bibletime/frontend/groupmanager/cgroupmanager.cpp]
+[bibletime/frontend/ctooltipmanager.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/groupmanager/cgroupmanager.h]
+[bibletime/frontend/ctooltipmanager.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/groupmanager/cgroupmanageritem.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/groupmanager/cgroupmanageritem.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[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=
+[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/keychooser/cbiblekeychooser.cpp]
+[bibletime/frontend/display/cdisplay.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/keychooser/cbiblekeychooser.h]
+[bibletime/frontend/display/cdisplay.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/keychooser/cbookkeychooser.cpp]
+[bibletime/frontend/display/chtmlreaddisplay.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/keychooser/cbookkeychooser.h]
+[bibletime/frontend/display/chtmlreaddisplay.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/keychooser/cbooktreechooser.cpp]
+[bibletime/frontend/display/chtmlwritedisplay.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/keychooser/cbooktreechooser.h]
+[bibletime/frontend/display/chtmlwritedisplay.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/keychooser/cfx_btn.cpp]
+[bibletime/frontend/display/cplainwritedisplay.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/keychooser/cfx_btn.h]
+[bibletime/frontend/display/cplainwritedisplay.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/keychooser/ckeychooser.cpp]
+[bibletime/frontend/display/creaddisplay.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/keychooser/ckeychooser.h]
+[bibletime/frontend/display/creaddisplay.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]
+[bibletime/frontend/display/cwritedisplay.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/keychooser/ckeychooserwidget.h]
+[bibletime/frontend/display/cwritedisplay.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/keychooser/clexiconkeychooser.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
+[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/keychooser/clexiconkeychooser.h]
+[bibletime/frontend/displaywindow/cbiblereadwindow.cpp]
 dist=true
 install=false
 install_location=
-type=HEADER
+type=SOURCE
 
-[bibletime/frontend/keychooser/keychooserbase.h]
+[bibletime/frontend/displaywindow/cbiblereadwindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/kstartuplogo.cpp]
+[bibletime/frontend/displaywindow/cbookreadwindow.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/kstartuplogo.h]
+[bibletime/frontend/displaywindow/cbookreadwindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/optionsdialog/Makefile.am]
-files=bibletime/frontend/optionsdialog/coptionsdialog.cpp,bibletime/frontend/optionsdialog/coptionsdialog.h,bibletime/frontend/optionsdialog/cbtconfig.cpp,bibletime/frontend/optionsdialog/cbtconfig.h
-sub_dirs=
-type=static_library
-
-[bibletime/frontend/optionsdialog/cbtconfig.cpp]
+[bibletime/frontend/displaywindow/cbuttons.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/optionsdialog/cbtconfig.h]
+[bibletime/frontend/displaywindow/cbuttons.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/optionsdialog/coptionsdialog.cpp]
+[bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/optionsdialog/coptionsdialog.h]
+[bibletime/frontend/displaywindow/ccommentaryreadwindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/presenters/Makefile.am]
-files=bibletime/frontend/presenters/cmodulechooserbar.cpp,bibletime/frontend/presenters/cmodulechooserbar.h,bibletime/frontend/presenters/cmodulechooserbutton.cpp,bibletime/frontend/presenters/cmodulechooserbutton.h,bibletime/frontend/presenters/cbiblepresenter.cpp,bibletime/frontend/presenters/cbiblepresenter.h,bibletime/frontend/presenters/cswordpresenter.cpp,bibletime/frontend/presenters/ccommentarypresenter.cpp,bibletime/frontend/presenters/ccommentarypresenter.h,bibletime/frontend/presenters/clexiconpresenter.cpp,bibletime/frontend/presenters/clexiconpresenter.h,bibletime/frontend/presenters/cswordpresenter.h,bibletime/frontend/presenters/cdisplaysettingsbutton.cpp,bibletime/frontend/presenters/cdisplaysettingsbutton.h,bibletime/frontend/presenters/cbookpresenter.cpp,bibletime/frontend/presenters/cbookpresenter.h
-sub_dirs=
-type=static_library
-
-[bibletime/frontend/presenters/cbiblepresenter.cpp]
+[bibletime/frontend/displaywindow/cdisplaywindow.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/presenters/cbiblepresenter.h]
+[bibletime/frontend/displaywindow/cdisplaywindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/presenters/cbookpresenter.cpp]
+[bibletime/frontend/displaywindow/chtmlwritewindow.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/presenters/cbookpresenter.h]
+[bibletime/frontend/displaywindow/chtmlwritewindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/presenters/ccommentarypresenter.cpp]
+[bibletime/frontend/displaywindow/clexiconreadwindow.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/presenters/ccommentarypresenter.h]
+[bibletime/frontend/displaywindow/clexiconreadwindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/presenters/cdisplaysettingsbutton.cpp]
+[bibletime/frontend/displaywindow/cmodulechooserbar.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/presenters/cdisplaysettingsbutton.h]
+[bibletime/frontend/displaywindow/cmodulechooserbar.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/presenters/clexiconpresenter.cpp]
+[bibletime/frontend/displaywindow/cmodulechooserbutton.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/presenters/clexiconpresenter.h]
+[bibletime/frontend/displaywindow/cmodulechooserbutton.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/presenters/cmodulechooserbar.cpp]
+[bibletime/frontend/displaywindow/cplainwritewindow.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/presenters/cmodulechooserbar.h]
+[bibletime/frontend/displaywindow/cplainwritewindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/presenters/cmodulechooserbutton.cpp]
+[bibletime/frontend/displaywindow/creadwindow.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/presenters/cmodulechooserbutton.h]
+[bibletime/frontend/displaywindow/creadwindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/presenters/cswordpresenter.cpp]
+[bibletime/frontend/displaywindow/cwritewindow.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/presenters/cswordpresenter.h]
+[bibletime/frontend/displaywindow/cwritewindow.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/searchdialog/Makefile.am]
-files=bibletime/frontend/searchdialog/csearchdialog.h,bibletime/frontend/searchdialog/csearchdialogtext.cpp,bibletime/frontend/searchdialog/csearchdialogtext.h,bibletime/frontend/searchdialog/csearchdialogresult.cpp,bibletime/frontend/searchdialog/csearchdialogresult.h,bibletime/frontend/searchdialog/csearchdialogresultview.cpp,bibletime/frontend/searchdialog/csearchdialogresultview.h,bibletime/frontend/searchdialog/csearchdialoganalysis.cpp,bibletime/frontend/searchdialog/csearchdialoganalysis.h,bibletime/frontend/searchdialog/csearchdialog.cpp,bibletime/frontend/searchdialog/csearchdialogscope.cpp,bibletime/frontend/searchdialog/csearchdialogscope.h,bibletime/frontend/searchdialog/csearchdialoganalysisview.cpp,bibletime/frontend/searchdialog/csearchdialoganalysisview.h,bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp,bibletime/frontend/searchdialog/csearchdialogmodulechooser.h
+[bibletime/frontend/groupmanager/Makefile.am]
+files=
 sub_dirs=
 type=static_library
 
-[bibletime/frontend/searchdialog/csearchdialog.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/searchdialog/csearchdialog.h]
-dist=false
-install=false
-install_location=
-type=HEADER
+[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/searchdialog/csearchdialoganalysis.cpp]
+[bibletime/frontend/keychooser/cbiblekeychooser.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/searchdialog/csearchdialoganalysis.h]
+[bibletime/frontend/keychooser/cbiblekeychooser.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/searchdialog/csearchdialoganalysisview.cpp]
+[bibletime/frontend/keychooser/cbookkeychooser.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/searchdialog/csearchdialoganalysisview.h]
+[bibletime/frontend/keychooser/cbookkeychooser.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp]
+[bibletime/frontend/keychooser/cbooktreechooser.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/searchdialog/csearchdialogmodulechooser.h]
+[bibletime/frontend/keychooser/cbooktreechooser.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/searchdialog/csearchdialogresult.cpp]
+[bibletime/frontend/keychooser/cfx_btn.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/searchdialog/csearchdialogresult.h]
+[bibletime/frontend/keychooser/cfx_btn.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/searchdialog/csearchdialogresultview.cpp]
+[bibletime/frontend/keychooser/ckeychooser.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/searchdialog/csearchdialogresultview.h]
+[bibletime/frontend/keychooser/ckeychooser.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/searchdialog/csearchdialogscope.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/searchdialog/csearchdialogscope.h]
-dist=true
+[bibletime/frontend/keychooser/ckeychooserbase.cpp]
+dist=false
 install=false
 install_location=
-type=HEADER
+type=DATA
 
-[bibletime/frontend/searchdialog/csearchdialogtext.cpp]
+[bibletime/frontend/keychooser/ckeychooserwidget.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/searchdialog/csearchdialogtext.h]
+[bibletime/frontend/keychooser/ckeychooserwidget.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/thirdparty/Makefile.am]
+[bibletime/frontend/keychooser/clexiconkeychooser.cpp]
 dist=true
-files=bibletime/frontend/thirdparty/Makefile.am
 install=false
 install_location=
-sub_dirs=qt3stuff
-type=static_library
+type=SOURCE
 
-[bibletime/frontend/thirdparty/qt3stuff/Makefile.am]
+[bibletime/frontend/keychooser/clexiconkeychooser.h]
 dist=true
-files=bibletime/frontend/thirdparty/qt3stuff/qtextview.h,bibletime/frontend/thirdparty/qt3stuff/qrichtext.cpp,bibletime/frontend/thirdparty/qt3stuff/qrichtext_p.h,bibletime/frontend/thirdparty/qt3stuff/qstylesheet.h,bibletime/frontend/thirdparty/qt3stuff/qtextedit.h,bibletime/frontend/thirdparty/qt3stuff/Makefile.am,bibletime/frontend/thirdparty/qt3stuff/qstylesheet.cpp,bibletime/frontend/thirdparty/qt3stuff/qtextview.cpp,bibletime/frontend/thirdparty/qt3stuff/qt3stuff.h,bibletime/frontend/thirdparty/qt3stuff/qtextedit.cpp,bibletime/frontend/thirdparty/qt3stuff/qsimplerichtext.cpp,bibletime/frontend/thirdparty/qt3stuff/qcomplextext_p.h,bibletime/frontend/thirdparty/qt3stuff/qcomplextext.cpp,bibletime/frontend/thirdparty/qt3stuff/qcleanuphandler.h
 install=false
 install_location=
-sub_dirs=
-type=static_library
+type=HEADER
 
-[bibletime/frontend/thirdparty/qt3stuff/qcleanuphandler.h]
+[bibletime/frontend/keychooser/keychooserbase.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/thirdparty/qt3stuff/qcomplextext.cpp]
+[bibletime/frontend/kstartuplogo.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/thirdparty/qt3stuff/qcomplextext_p.h]
+[bibletime/frontend/kstartuplogo.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/thirdparty/qt3stuff/qrichtext.cpp]
+[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/thirdparty/qt3stuff/qrichtext_p.h]
+[bibletime/frontend/mainindex/cindexitem.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/thirdparty/qt3stuff/qsimplerichtext.cpp]
+[bibletime/frontend/mainindex/cmainindex.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/thirdparty/qt3stuff/qstylesheet.cpp]
+[bibletime/frontend/mainindex/cmainindex.h]
 dist=true
 install=false
 install_location=
-type=SOURCE
+type=HEADER
+
+[bibletime/frontend/optionsdialog/Makefile.am]
+files=bibletime/frontend/optionsdialog/coptionsdialog.h
+sub_dirs=
+type=static_library
 
-[bibletime/frontend/thirdparty/qt3stuff/qstylesheet.h]
+[bibletime/frontend/optionsdialog/coptionsdialog.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/thirdparty/qt3stuff/qt3stuff.h]
+[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/thirdparty/qt3stuff/qtextedit.cpp]
+[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/thirdparty/qt3stuff/qtextedit.h]
+[bibletime/frontend/searchdialog/csearchdialog.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/frontend/thirdparty/qt3stuff/qtextview.cpp]
+[bibletime/frontend/searchdialog/csearchdialogpages.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bibletime/frontend/thirdparty/qt3stuff/qtextview.h]
+[bibletime/frontend/searchdialog/csearchdialogpages.h]
 dist=true
 install=false
 install_location=
@@ -1290,393 +1213,39 @@ sub_dirs=
 type=normal
 
 [bibletime/pics/highcolor/22*22/Makefile.am]
-files=bibletime/pics/highcolor/22*22/hi22-action-nextchapter.png,bibletime/pics/highcolor/22*22/hi22-action-nextverse.png,bibletime/pics/highcolor/22*22/hi22-action-prevchapter.png,bibletime/pics/highcolor/22*22/hi22-action-prevverse.png,bibletime/pics/highcolor/22*22/hi22-action-strongs.png,bibletime/pics/highcolor/22*22/hi22-action-tile_auto.png,bibletime/pics/highcolor/22*22/hi22-action-tile.png,bibletime/pics/highcolor/22*22/hi22-action-scrolling.png
+files=
 sub_dirs=
 type=normal
 
-[bibletime/pics/highcolor/22*22/hi22-action-nextchapter.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/22*22/hi22-action-nextverse.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/22*22/hi22-action-prevchapter.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/22*22/hi22-action-prevverse.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/22*22/hi22-action-scrolling.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/22*22/hi22-action-strongs.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/22*22/hi22-action-tile.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/22*22/hi22-action-tile_auto.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [bibletime/pics/highcolor/32*32/Makefile.am]
-files=bibletime/pics/highcolor/32*32/hi32-action-footnotes.png,bibletime/pics/highcolor/32*32/hi32-action-nextchapter.png,bibletime/pics/highcolor/32*32/hi32-action-nextverse.png,bibletime/pics/highcolor/32*32/hi32-action-prevchapter.png,bibletime/pics/highcolor/32*32/hi32-action-prevverse.png,bibletime/pics/highcolor/32*32/hi32-action-strongs.png,bibletime/pics/highcolor/32*32/hi32-app-bibletime.png,bibletime/pics/highcolor/32*32/hi32-action-cascade.png,bibletime/pics/highcolor/32*32/hi32-action-cascade_auto.png,bibletime/pics/highcolor/32*32/hi32-action-tile.png,bibletime/pics/highcolor/32*32/hi32-action-tile_auto.png,bibletime/pics/highcolor/32*32/hi32-action-groupmanager.png,bibletime/pics/highcolor/32*32/hi32-action-scrolling.png,
+files=
 sub_dirs=
 type=normal
 
-[bibletime/pics/highcolor/32*32/hi32-action-cascade.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-cascade_auto.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-footnotes.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-groupmanager.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-nextchapter.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-nextverse.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-prevchapter.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-prevverse.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-scrolling.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-strongs.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-tile.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-action-tile_auto.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/highcolor/32*32/hi32-app-bibletime.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [bibletime/pics/highcolor/48*48/Makefile.am]
-files=bibletime/pics/highcolor/48*48/hi48-app-bibletime.png,
+files=
 sub_dirs=
 type=normal
 
-[bibletime/pics/highcolor/48*48/hi48-app-bibletime.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [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=bibletime/pics/lowcolor/16*16/lo16-action-nextchapter.png,bibletime/pics/lowcolor/16*16/lo16-app-bibletime.png,bibletime/pics/lowcolor/16*16/lo16-action-footnotes.png,bibletime/pics/lowcolor/16*16/lo16-action-nextverse.png,bibletime/pics/lowcolor/16*16/lo16-action-prevchapter.png,bibletime/pics/lowcolor/16*16/lo16-action-prevverse.png,bibletime/pics/lowcolor/16*16/lo16-action-bible.png,bibletime/pics/lowcolor/16*16/lo16-action-bible_crypt.png,bibletime/pics/lowcolor/16*16/lo16-action-strongs.png,bibletime/pics/lowcolor/16*16/lo16-action-versref.png,bibletime/pics/lowcolor/16*16/lo16-action-groupmanager.png,bibletime/pics/lowcolor/16*16/lo16-action-cascade.png,bibletime/pics/lowcolor/16*16/lo16-action-cascade_auto.png,bibletime/pics/lowcolor/16*16/lo16-action-commentary.png,bibletime/pics/lowcolor/16*16/lo16-action-commentary_crypt.png,bibletime/pics/lowcolor/16*16/lo16-action-lexicon.png,bibletime/pics/lowcolor/16*16/lo16-action-lexicon_crypt.png,bibletime/pics/lowcolor/16*16/lo16-action-tile.png,bibletime/pics/lowcolor/16*16/lo16-action-tile_auto.png,bibletime/pics/lowcolor/16*16/lo16-action-module_info.png,bibletime/pics/lowcolor/16*16/lo16-action-scrolling.png,bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark.png,bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark_change.png,bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark_export.png,bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark_import.png,bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark_new.png,
+files=
 sub_dirs=
 type=normal
 
-[bibletime/pics/lowcolor/16*16/lo16-action-bible.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-bible_crypt.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark_change.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark_export.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark_import.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-bt_bookmark_new.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-cascade.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-cascade_auto.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-commentary.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-commentary_crypt.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-footnotes.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-groupmanager.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-lexicon.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-lexicon_crypt.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-module_info.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-nextchapter.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-nextverse.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-prevchapter.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-prevverse.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-scrolling.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-strongs.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-tile.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-tile_auto.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-action-versref.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/16*16/lo16-app-bibletime.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [bibletime/pics/lowcolor/22*22/Makefile.am]
 files=
 sub_dirs=
 type=normal
 
 [bibletime/pics/lowcolor/32*32/Makefile.am]
-files=bibletime/pics/lowcolor/32*32/lo32-action-footnotes.png,bibletime/pics/lowcolor/32*32/lo32-app-bibletime.png,bibletime/pics/lowcolor/32*32/lo32-action-nextchapter.png,bibletime/pics/lowcolor/32*32/lo32-action-prevchapter.png,bibletime/pics/lowcolor/32*32/lo32-action-nextverse.png,bibletime/pics/lowcolor/32*32/lo32-action-prevverse.png,bibletime/pics/lowcolor/32*32/lo32-action-groupmanager.png,bibletime/pics/lowcolor/32*32/lo32-action-scrolling.png,bibletime/pics/lowcolor/32*32/lo32-action-strongs.png,bibletime/pics/lowcolor/32*32/lo32-action-tile.png,bibletime/pics/lowcolor/32*32/lo32-action-tile_auto.png,
+files=
 sub_dirs=
 type=normal
 
-[bibletime/pics/lowcolor/32*32/lo32-action-footnotes.png]
-dist=false
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-groupmanager.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-nextchapter.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-nextverse.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-prevchapter.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-prevverse.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-scrolling.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-strongs.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-tile.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-action-tile_auto.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/pics/lowcolor/32*32/lo32-app-bibletime.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [bibletime/pics/lowcolor/Makefile.am]
 sub_dirs=16*16,32*32,22*22,
 type=normal
@@ -1770,36 +1339,48 @@ install=false
 install_location=
 type=HEADER
 
-[bibletime/resource.h]
+[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=HEADER
+type=SOURCE
 
-[bibletime/structdef.h]
+[bibletime/util/cpointers.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/tooltipdef.h]
+[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/Makefile.am]
-files=bibletime/util/scoped_resource.h
-sub_dirs=
-type=normal
+[bibletime/util/ctoolclass.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
 
-[bibletime/util/scoped_resource.h]
+[bibletime/util/ctoolclass.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bibletime/whatsthisdef.h]
+[bibletime/util/scoped_resource.h]
 dist=true
 install=false
 install_location=
@@ -1837,3 +1418,10 @@ type=normal
 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.kdevses b/bibletime.kdevses
deleted file mode 100644
index 3caf657..0000000
--- a/bibletime.kdevses
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE KDevPrjSession ><KDevPrjSession>
- <Mainframe MaximizeMode="0" />
- <DocsAndViews NumberOfDocuments="1" >
-  <Doc0 Type="CDocBrowser" NumberOfViews="1" FileName="file:/usr/lib/qt2/doc/html/qstring.html#2aaf0c" >
-   <View Top="0" Width="758" Attach="0" Height="400" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
-  </Doc0>
- </DocsAndViews>
-</KDevPrjSession>
diff --git a/bibletime.lsm b/bibletime.lsm
index fa039d0..9834dec 100644
--- a/bibletime.lsm
+++ b/bibletime.lsm
@@ -1,14 +1,14 @@
 Begin3
 Title: BibleTime
-Version: 1.1
-Entered-date:  17JUNE2001
-Description: An easy to use but powerful Bible study tool for KDE 2. BibleTime is based on SWORD 1.52..
-Keywords: bible,study,KDE2,KDE,QT,sword,bibletime,bibletime2,crosswire,www.bibletime.de,crosswire.org
-Author: The BibleTime Team <Info@bibletime.de>
-Maintained-by: The BibleTime Team <Info@bibletime.de>
-Primary-site: http://www.bibletime.de/
-Home-page: http://www.bibletime.de/
-Original-site: http://www.bibletime.de/
+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
index 65b03f4..3ee872b 100644
--- a/bibletime.lsm.in
+++ b/bibletime.lsm.in
@@ -1,14 +1,14 @@
 Begin3
 Title: BibleTime
 Version: @VERSION@
-Entered-date:  17JUNE2001
-Description: An easy to use but powerful Bible study tool for KDE 2. BibleTime is based on SWORD 1.52..
-Keywords: bible,study,KDE2,KDE,QT,sword,bibletime,bibletime2,crosswire,www.bibletime.de,crosswire.org
-Author: The BibleTime Team <Info@bibletime.de>
-Maintained-by: The BibleTime Team <Info@bibletime.de>
-Primary-site: http://www.bibletime.de/
-Home-page: http://www.bibletime.de/
-Original-site: http://www.bibletime.de/
+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
index 64b08fa..3f42937 100644
--- a/bibletime.m4
+++ b/bibletime.m4
@@ -103,7 +103,7 @@ fi
 if test "$ac_rpm_prefix" = "auto"; then
 AC_CACHE_VAL(RPM_PREFIX, [
 if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde2"
+	RPM_PREFIX="/opt/kde3"
 elif test "$DISTRIBUTION" = "Mandrake"; then
 	RPM_PREFIX="/usr"	
 elif test "$DISTRIBUTION" = "Red Hat"; then
@@ -154,3 +154,40 @@ 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
index b0a0467..cfc5531 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -1,206 +1,125 @@
 %define         name 		bibletime
-%define         version 	1.1
+%define         version 	1.4.1
 
-# This should not be changed but set this to static or dynamic.
-# Sword should always be set to static for these builds.
-%define		swordlibs 	static
-
-# this needs to be changed depending on build number 
-# and weather or not it is static
+# 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.
-%define		ostype 		Debian
+# 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.)
-%define		osversion 	3.0
+# Done by configure in bibletime.spec.in
+%define		osversion 	9.0
 
-# This is your cpu i486, i586, i686, ppc, sparc, alfa, etc.
+# 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 	Graphical desktop/KDE
-
-# this is were the sword modules will be installed on your system.
-# /usr/local/sword, /usr/share/sword, /opt/local/sword, etc.
-# default is /usr/share/sword
-%define     SwordPath 	/usr/share/sword
-%define	    ModsPath 	%{SwordPath}/mods.d
-
-# This for Mandrake menus if you have another system do not edit this line. it is for
-# compatability with those systems.
-%define		build_menus	1
-%define		_menudir 	/usr/lib/menu 
-# Nothing else should need to be changed.
-# Please do not edit below this line unless you know what you are doing.
-
-Summary:        BibleTime %{version} is an easy to use Bible study tool for KDE2.
+%define		rpmgroup 	X11/KDE/Applications
+
+Summary:        BibleTime %{version} is an easy to use Bible study tool for KDE.
 Name:		%{name}
 Version:        %{version}
 Release:        %{release}
-#Icon:		bibletime.xpm
 Copyright:      GPL
-Vendor:         The team of BibleTime <info@bibletime.de>
-Url:            http://www.bibletime.de
-Packager:       Brook Humphrey <bah@webmedic.net>, Joachim Ansorg <jansorg@gmx.de>
+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
-
-# For use with mandrake menu system. 
-%if %build_menus
-Source1:        bibletime_icons.tar.bz2
-%endif
-
-# This source comes from sword and will conflict woth sword if it is installed so we will make it a seperarte package.
-Source2:	locales.d.tar.bz2
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}--rootbibletime
-Provides:       sword-base sword = %{libversion}
-Prefix: 	/usr
-
+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.
+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-xxx.rpm --prefix /usr/local/opt/apps/noncommercial
+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.
 
-This RPM has these compiled options Sword is compiled %{swordlibs} and KDE/QT is compiled %{kdelibs}.
-
-Although this binary no longer requires sword to run the source.rpm will not build correctly
-without the sword-devel package installed.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
-# For use with mandrake menu system
-mkdir -p $RPM_BUILD_ROOT%{_menudir}
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/config
-
-# generate directories for sword if building static
-if [ %{swordlibs} = "static" ] ; then
- mkdir -p $RPM_BUILD_ROOT%{SwordPath}
- mkdir -p $RPM_BUILD_ROOT%{ModsPath}
-fi
-
-
 %setup -q
-tar jxvf %{SOURCE2}
-if [ %{ostype} = "Mandrake" ] ; then
- %if %build_menus
-  #Icons for Mandrake menu system
-  tar jxvf %{SOURCE1}
- %endif
- export KDEDIR=/usr QTDIR=/usr/lib/qt2
-elif [%{ostype} = "SuSE"] ; then
- export KDEDIR=/opt/kde2 QTDIR=/usr/lib/qt2
-else
-	echo "Using $KDEDIR as KDE2 directory";
-	echo "Using $QTDIR as QT 2.2.x directory";
-	echo "If the directories are not correct please set them using \"export KDEDIR=<KDE2 directory> QTDIR=<QT2.2 directory>\""
-	sleep 5
-fi
-
 make -f Makefile.cvs
 
-if [ %{swordlibs} = "static" ] ; then
-        ./configure --enable-static-sword;
+# Look for common rpm-options:
+if [ -f /etc/opt/kde3/common_options ]; then
+  . /etc/opt/kde3/common_options
+  ./configure $configkde
 else
-        ./configure;
+  ./configure --prefix=${_prefix}
 fi
 
-make -j2
+# Setup for parallel builds
+numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
+if [ "$numprocs" = "0" ]; then
+ numprocs=1
+fi
+
+make -j$numprocs
 
 %install
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-# Copy Sword language.conf files to our install dir
-mkdir -p $RPM_BUILD_ROOT%{SwordPath}/locales.d
-cp locales.d/*.conf $RPM_BUILD_ROOT%{SwordPath}/locales.d/
-
-# Create Sword globals.conf for using bibletime without sword installed.
-cat << EOF >$RPM_BUILD_ROOT%{ModsPath}/globals.conf
- [Globals]
-EOF
-
-# For use with mandrake menu system 
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}
-?package(bibletime):command="/usr/bin/bibletime" icon="bibletime.xpm" \
-                needs="X11" section="Applications/Bible Study/" title="Bibletime" \
-                longtitle="An easy to use Bible study tool."
-EOF
-
-# For use with mandrake menu system 
-# icons: this is for the mandrake menu system
-%if %build_menus
-  mkdir -p $RPM_BUILD_ROOT%{_liconsdir}
-  mkdir -p $RPM_BUILD_ROOT%{_iconsdir}
-  mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
-  cd $RPM_BUILD_DIR/%{name}-%{version}
-  install -m 644 %{name}_16.xpm $RPM_BUILD_ROOT%{_miconsdir}/%{name}.xpm
-  install -m 644 %{name}_32.xpm $RPM_BUILD_ROOT%{_iconsdir}/%{name}.xpm
-  install -m 644 %{name}_48.xpm $RPM_BUILD_ROOT%{_liconsdir}/%{name}.xpm
-%endif 
+make DESTDIR=$RPM_BUILD_ROOT install-strip
 
-%post
-# this is for creation of the sword.conf for systems that are using bibletime without Sword installed.
-if [ -f /etc/sword.conf ] ; then
-         echo "sword.conf already exists skiping sword.conf creation." ;
-else
-cat << EOF >/etc/sword.conf
-[Install]
-DataPath=%{SwordPath}
-EOF
-fi
+#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
 
-/sbin/ldconfig
 
-# For use with mandrake menu system
-if [ %{ostype} = "Mandrake" ] ; then
- %{update_menus}
-fi
+%post
+/sbin/ldconfig
 
 %postun
-
-# For use with mandrake menu system
-if [ %{ostype} = "Mandrake" ] ; then
- %{clean_menus}
-fi
-
 /sbin/ldconfig
 
 %clean
+#rm -f $RPM_BUILD_DIR/master.list
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-#Sword config files
-%config %{ModsPath}/globals.conf
-%config %{SwordPath}/locales.d/*.conf
-# global BibleTime config files
-%config %{prefix}/share/config/bt-printing
-%{prefix}/bin/bibletime
-%{prefix}/share/applnk/Applications/*
-%{prefix}/share/apps/bibletime/*
+%{prefix}/bin/*
+%{prefix}/share/applnk/Applications/bibletime.desktop
+%{prefix}/share/apps/bibletime/
+%{prefix}/share/doc/HTML/en/bibletime/
 %{prefix}/share/icons/*
-# For use with mandrake menu system
-%if %build_menus
-%{_menudir}/%{name}
-%endif
 
 %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.
diff --git a/bibletime.spec.in b/bibletime.spec.in
index 717fe78..3267f9a 100644
--- a/bibletime.spec.in
+++ b/bibletime.spec.in
@@ -1,206 +1,125 @@
 %define         name 		@PACKAGE@
 %define         version 	@VERSION@
 
-# This should not be changed but set this to static or dynamic.
-# Sword should always be set to static for these builds.
-%define		swordlibs 	static
-
-# this needs to be changed depending on build number 
-# and weather or not it is static
+# 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, alfa, etc.
+# 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@
 
-# this is were the sword modules will be installed on your system.
-# /usr/local/sword, /usr/share/sword, /opt/local/sword, etc.
-# default is /usr/share/sword
-%define     SwordPath 	/usr/share/sword
-%define	    ModsPath 	%{SwordPath}/mods.d
-
-# This for Mandrake menus if you have another system do not edit this line. it is for
-# compatability with those systems.
-%define		build_menus	1
-%define		_menudir 	/usr/lib/menu 
-# Nothing else should need to be changed.
-# Please do not edit below this line unless you know what you are doing.
-
-Summary:        BibleTime %{version} is an easy to use Bible study tool for KDE2.
+Summary:        BibleTime %{version} is an easy to use Bible study tool for KDE.
 Name:		%{name}
 Version:        %{version}
 Release:        %{release}
-#Icon:		bibletime.xpm
 Copyright:      GPL
-Vendor:         The team of BibleTime <info@bibletime.de>
-Url:            http://www.bibletime.de
-Packager:       Brook Humphrey <bah@webmedic.net>, Joachim Ansorg <jansorg@gmx.de>
+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
-
-# For use with mandrake menu system. 
-%if %build_menus
-Source1:        bibletime_icons.tar.bz2
-%endif
-
-# This source comes from sword and will conflict woth sword if it is installed so we will make it a seperarte package.
-Source2:	locales.d.tar.bz2
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}--rootbibletime
-Provides:       sword-base sword = %{libversion}
 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.
+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-xxx.rpm --prefix /usr/local/opt/apps/noncommercial
+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.
 
-This RPM has these compiled options Sword is compiled %{swordlibs} and KDE/QT is compiled %{kdelibs}.
-
-Although this binary no longer requires sword to run the source.rpm will not build correctly
-without the sword-devel package installed.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
-# For use with mandrake menu system
-mkdir -p $RPM_BUILD_ROOT%{_menudir}
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/config
-
-# generate directories for sword if building static
-if [ %{swordlibs} = "static" ] ; then
- mkdir -p $RPM_BUILD_ROOT%{SwordPath}
- mkdir -p $RPM_BUILD_ROOT%{ModsPath}
-fi
-
-
 %setup -q
-tar jxvf %{SOURCE2}
-if [ %{ostype} = "Mandrake" ] ; then
- %if %build_menus
-  #Icons for Mandrake menu system
-  tar jxvf %{SOURCE1}
- %endif
- export KDEDIR=/usr QTDIR=/usr/lib/qt2
-elif [%{ostype} = "SuSE"] ; then
- export KDEDIR=/opt/kde2 QTDIR=/usr/lib/qt2
-else
-	echo "Using $KDEDIR as KDE2 directory";
-	echo "Using $QTDIR as QT 2.2.x directory";
-	echo "If the directories are not correct please set them using \"export KDEDIR=<KDE2 directory> QTDIR=<QT2.2 directory>\""
-	sleep 5
-fi
-
 make -f Makefile.cvs
 
-if [ %{swordlibs} = "static" ] ; then
-        ./configure --enable-static-sword;
+# Look for common rpm-options:
+if [ -f /etc/opt/kde3/common_options ]; then
+  . /etc/opt/kde3/common_options
+  ./configure $configkde
 else
-        ./configure;
+  ./configure --prefix=${_prefix}
+fi
+
+# Setup for parallel builds
+numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
+if [ "$numprocs" = "0" ]; then
+ numprocs=1
 fi
 
-make -j2
+make -j$numprocs
 
 %install
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-# Copy Sword language.conf files to our install dir
-mkdir -p $RPM_BUILD_ROOT%{SwordPath}/locales.d
-cp locales.d/*.conf $RPM_BUILD_ROOT%{SwordPath}/locales.d/
-
-# Create Sword globals.conf for using bibletime without sword installed.
-cat << EOF >$RPM_BUILD_ROOT%{ModsPath}/globals.conf
- [Globals]
-EOF
-
-# For use with mandrake menu system 
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}
-?package(bibletime):command="/usr/bin/bibletime" icon="bibletime.xpm" \
-                needs="X11" section="Applications/Bible Study/" title="Bibletime" \
-                longtitle="An easy to use Bible study tool."
-EOF
-
-# For use with mandrake menu system 
-# icons: this is for the mandrake menu system
-%if %build_menus
-  mkdir -p $RPM_BUILD_ROOT%{_liconsdir}
-  mkdir -p $RPM_BUILD_ROOT%{_iconsdir}
-  mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
-  cd $RPM_BUILD_DIR/%{name}-%{version}
-  install -m 644 %{name}_16.xpm $RPM_BUILD_ROOT%{_miconsdir}/%{name}.xpm
-  install -m 644 %{name}_32.xpm $RPM_BUILD_ROOT%{_iconsdir}/%{name}.xpm
-  install -m 644 %{name}_48.xpm $RPM_BUILD_ROOT%{_liconsdir}/%{name}.xpm
-%endif 
+make DESTDIR=$RPM_BUILD_ROOT install-strip
 
-%post
-# this is for creation of the sword.conf for systems that are using bibletime without Sword installed.
-if [ -f /etc/sword.conf ] ; then
-         echo "sword.conf already exists skiping sword.conf creation." ;
-else
-cat << EOF >/etc/sword.conf
-[Install]
-DataPath=%{SwordPath}
-EOF
-fi
+#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
 
-/sbin/ldconfig
 
-# For use with mandrake menu system
-if [ %{ostype} = "Mandrake" ] ; then
- %{update_menus}
-fi
+%post
+/sbin/ldconfig
 
 %postun
-
-# For use with mandrake menu system
-if [ %{ostype} = "Mandrake" ] ; then
- %{clean_menus}
-fi
-
 /sbin/ldconfig
 
 %clean
+#rm -f $RPM_BUILD_DIR/master.list
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-#Sword config files
-%config %{ModsPath}/globals.conf
-%config %{SwordPath}/locales.d/*.conf
-# global BibleTime config files
-%config %{prefix}/share/config/bt-printing
-%{prefix}/bin/bibletime
-%{prefix}/share/applnk/Applications/*
-%{prefix}/share/apps/bibletime/*
+%{prefix}/bin/*
+%{prefix}/share/applnk/Applications/bibletime.desktop
+%{prefix}/share/apps/bibletime/
+%{prefix}/share/doc/HTML/en/bibletime/
 %{prefix}/share/icons/*
-# For use with mandrake menu system
-%if %build_menus
-%{_menudir}/%{name}
-%endif
 
 %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.
diff --git a/bibletime.start b/bibletime.start
deleted file mode 100755
index 156b975..0000000
--- a/bibletime.start
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-#############################################################
-#
-# This script sets system variables and launches bibletime. #
-#
-#############################################################
-
-export KDEDIRS=/usr/local/kde2
-export PATH=$KDEDIRS/bin:$PATH
-exec bibletime
\ No newline at end of file
diff --git a/bibletime/Makefile.am b/bibletime/Makefile.am
index ecb8124..681152f 100644
--- a/bibletime/Makefile.am
+++ b/bibletime/Makefile.am
@@ -2,35 +2,33 @@ bibletime_SOURCES = \
 bibletime_init.cpp \
 bibletime_slots.cpp \
 bibletime.cpp \
+bibletimeapp.cpp \
 main.cpp
 
 bibletime_LDADD   = \
 ./printing/libprinting.a \
-./frontend/presenters/libpresenters.a \
+./frontend/displaywindow/libdisplaywindow.a \
+./frontend/display/libdisplay.a \
 ./frontend/keychooser/libkeychooser.a \
-./frontend/groupmanager/libgroupmanager.a \
+./frontend/mainindex/libmainindex.a \
 ./frontend/searchdialog/libsearchdialog.a \
 ./frontend/libfrontend.a \
-./frontend/thirdparty/qt3stuff/libqt3stuff.a \
-./frontend/thirdparty/libthirdparty.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 \
-resource.h \
-whatsthisdef.h \
-tooltipdef.h \
-bt-printing
+all_headers = bibletime.h bibletimeapp.h
 
 EXTRA_DIST = $(bibletime_SOURCES) $(all_headers)
 
@@ -69,10 +67,6 @@ DISTCLEANFILES = $(bibletime_METASOURCES)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
-	$(INSTALL_DATA) bt-printing $(DESTDIR)$(kde_confdir)/bt-printing
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(kde_confdir)/bt-printing
 
 rpm: dist
 	
diff --git a/bibletime/Makefile.in b/bibletime/Makefile.in
index 36fd6cb..f02672a 100644
--- a/bibletime/Makefile.in
+++ b/bibletime/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,33 +229,77 @@ 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@
-micodir = @micodir@
+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@
-
-bibletime_SOURCES =  bibletime_init.cpp bibletime_slots.cpp bibletime.cpp main.cpp
-
-
-bibletime_LDADD =  ./printing/libprinting.a ./frontend/presenters/libpresenters.a ./frontend/keychooser/libkeychooser.a ./frontend/groupmanager/libgroupmanager.a ./frontend/searchdialog/libsearchdialog.a ./frontend/libfrontend.a ./frontend/thirdparty/qt3stuff/libqt3stuff.a ./frontend/thirdparty/libthirdparty.a ./backend/libbackend.a -lXext $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdeprint $(LIB_KFILE) $(LIB_X11) $(LIB_SWORD) $(LIBSOCKET)
+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 resource.h whatsthisdef.h tooltipdef.h bt-printing
-
+all_headers = bibletime.h bibletimeapp.h
 
 EXTRA_DIST = $(bibletime_SOURCES) $(all_headers)
 
@@ -259,137 +330,181 @@ 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 = ../config.h
-CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  bibletime$(EXEEXT)
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-#>- bibletime_OBJECTS =  bibletime_init.$(OBJEXT) bibletime_slots.$(OBJEXT) \
-#>- bibletime.$(OBJEXT) main.$(OBJEXT)
+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) main.$(OBJEXT)\
-bibletime.moc.o  \
-bibletime_meta_unload.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/presenters/libpresenters.a \
-./frontend/keychooser/libkeychooser.a \
-./frontend/groupmanager/libgroupmanager.a \
-./frontend/searchdialog/libsearchdialog.a ./frontend/libfrontend.a \
-./frontend/thirdparty/qt3stuff/libqt3stuff.a \
-./frontend/thirdparty/libthirdparty.a ./backend/libbackend.a
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+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) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=bibletime.h resource.h whatsthisdef.h tooltipdef.h bt-printing 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/bibletime.P .deps/bibletime_init.P \
-#>- .deps/bibletime_slots.P .deps/main.P
-#>+ 6
-@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/bibletime.moc.P $(DEPDIR)/bibletime_meta_unload.P  $(DEPDIR)/bibletime.all_cpp.P \
-	  .deps/bibletime.P .deps/bibletime_init.P \
-.deps/bibletime_slots.P .deps/main.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/bibletime.moc.P $(DEPDIR)/bibletime_meta_unload.P   .deps/bibletime.P .deps/bibletime_init.P \
-.deps/bibletime_slots.P .deps/main.P
-
+#>- 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)
-OBJECTS = $(bibletime_OBJECTS)
 
-#>- all: all-redirect
+#>- all: all-recursive
 #>+ 1
-all: docs-am  all-redirect
+all: docs-am  all-recursive
+
 .SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/Makefile
+.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: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
+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 \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
 	  else :; fi; \
 	done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+bibletime$(EXEEXT): $(bibletime_OBJECTS) $(bibletime_DEPENDENCIES) 
+	@rm -f bibletime$(EXEEXT)
+	$(CXXLINK) $(bibletime_LDFLAGS) $(bibletime_OBJECTS) $(bibletime_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
+@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)/'`$<
 
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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`
 
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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
@@ -398,18 +513,8 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
-
-maintainer-clean-libtool:
-
-bibletime$(EXEEXT): $(bibletime_OBJECTS) $(bibletime_DEPENDENCIES)
-	@rm -f bibletime$(EXEEXT)
-	$(CXXLINK) $(bibletime_LDFLAGS) $(bibletime_OBJECTS) $(bibletime_LDADD) $(LIBS)
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
+	-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.
@@ -417,13 +522,8 @@ bibletime$(EXEEXT): $(bibletime_OBJECTS) $(bibletime_DEPENDENCIES)
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -443,13 +543,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -465,211 +570,224 @@ 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)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+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
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-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)
 
-subdir = bibletime
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
 check-am: all-am
 check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-recursive
+all-am: Makefile $(PROGRAMS)
+installdirs: installdirs-recursive
+installdirs-am:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
 
-install-data-am: install-data-local
+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
-install: install-recursive
-uninstall-am: uninstall-binPROGRAMS uninstall-local
-uninstall: uninstall-recursive
-all-am: Makefile $(PROGRAMS)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-#>- clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-moc-classes clean-final   clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
+	@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
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-		distclean-tags distclean-depend distclean-generic \
-		clean-am
-	-rm -f libtool
+#>- 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
 
-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+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
@@ -679,13 +797,8 @@ maintainer-clean
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
-	$(INSTALL_DATA) bt-printing $(DESTDIR)$(kde_confdir)/bt-printing
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(kde_confdir)/bt-printing
 
 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:
@@ -694,60 +807,88 @@ rpm: dist
 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:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  bibletime/Makefile
 	cd $(top_srcdir) && perl admin/am_edit bibletime/Makefile.in
 
 
-#>+ 10
-bibletime_meta_unload.cpp:  bibletime.moc.cpp
-	@echo 'creating bibletime_meta_unload.cpp'
-	@-rm -f bibletime_meta_unload.cpp
-	@echo 'static const char * _metalist_bibletime[] = {' > bibletime_meta_unload.cpp
-	@cat  bibletime.moc.cpp | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> bibletime_meta_unload.cpp
-	@echo '0};' >> bibletime_meta_unload.cpp
-	@echo '#include <kunload.h>' >> bibletime_meta_unload.cpp
-	@echo '_UNLOAD(bibletime)' >> bibletime_meta_unload.cpp
-
+#>+ 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
 
-#>+ 3
-clean-moc-classes:
-	-rm -f  bibletime_meta_unload.cpp
 
 #>+ 11
-bibletime.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bibletime_init.cpp $(srcdir)/bibletime_slots.cpp $(srcdir)/bibletime.cpp $(srcdir)/main.cpp bibletime_meta_unload.cpp  bibletime.moc.cpp
+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 main.cpp bibletime_meta_unload.cpp  bibletime.moc.cpp; do \
+	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; \
+	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
 
-#>+ 2
+#>+ 3
 final:
 	$(MAKE) bibletime_OBJECTS="$(bibletime_final_OBJECTS)" all-am
-#>+ 2
+
+#>+ 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) -f $(top_srcdir)/admin/Makefile.common 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
index ca264b9..cc89edb 100644
--- a/bibletime/backend/Makefile.am
+++ b/bibletime/backend/Makefile.am
@@ -1,28 +1,9 @@
-KDE_OPTIONS = qt-only
 libbackend_a_METASOURCES = AUTO
 noinst_LIBRARIES = libbackend.a
 
 INCLUDES = $(all_includes)
 
-libbackend_a_SOURCES = \
-cswordmodulesearch.cpp \
-chtmlchapterdisplay.cpp \
-chtmlentrydisplay.cpp \
-chtmlbookdisplay.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_gbfhtml.cpp \
-bt_basicfilter.cpp 
+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 \
@@ -32,16 +13,16 @@ cswordversekey.h \
 cswordldkey.h \
 cswordbackend.h \
 cswordmoduleinfo.h \
-chtmlentrydisplay.h \
-chtmlchapterdisplay.h \
-chtmlbookdisplay.h \
 cswordmodulesearch.h \
 creferencemanager.h \
 cswordbookmoduleinfo.h \
 cswordtreekey.h \
 bt_thmlhtml.h \
+bt_osishtml.h \
 bt_gbfhtml.h \
-bt_basicfilter.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
index 9372c56..c73ac39 100644
--- a/bibletime/backend/Makefile.in
+++ b/bibletime/backend/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,178 +229,267 @@ 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@
-micodir = @micodir@
+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@
-
-KDE_OPTIONS = qt-only
+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 chtmlchapterdisplay.cpp chtmlentrydisplay.cpp chtmlbookdisplay.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_gbfhtml.cpp bt_basicfilter.cpp 
-
-
-all_headers = cswordbiblemoduleinfo.h cswordcommentarymoduleinfo.h cswordlexiconmoduleinfo.h cswordkey.h cswordversekey.h cswordldkey.h cswordbackend.h cswordmoduleinfo.h chtmlentrydisplay.h chtmlchapterdisplay.h chtmlbookdisplay.h cswordmodulesearch.h creferencemanager.h cswordbookmoduleinfo.h cswordtreekey.h bt_thmlhtml.h bt_gbfhtml.h bt_basicfilter.h
+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 = ../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libbackend_a_LIBADD = 
-#>- libbackend_a_OBJECTS =  cswordmodulesearch.$(OBJEXT) \
-#>- chtmlchapterdisplay.$(OBJEXT) chtmlentrydisplay.$(OBJEXT) \
-#>- chtmlbookdisplay.$(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_gbfhtml.$(OBJEXT) \
-#>- bt_basicfilter.$(OBJEXT)
-#>+ 12
+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) \
-chtmlchapterdisplay.$(OBJEXT) chtmlentrydisplay.$(OBJEXT) \
-chtmlbookdisplay.$(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_gbfhtml.$(OBJEXT) \
-bt_basicfilter.$(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)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=bt_thmlhtml.h creferencemanager.h cswordtreekey.h cswordbookmoduleinfo.h cswordversekey.h cswordmoduleinfo.h chtmlbookdisplay.h bt_basicfilter.h cswordbackend.h cswordbiblemoduleinfo.h cswordcommentarymoduleinfo.h chtmlentrydisplay.h st31vJFM cswordldkey.h cswordlexiconmoduleinfo.h chtmlchapterdisplay.h cswordmodulesearch.h bt_gbfhtml.h cswordkey.h 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/bt_basicfilter.P .deps/bt_gbfhtml.P \
-#>- .deps/bt_thmlhtml.P .deps/chtmlbookdisplay.P \
-#>- .deps/chtmlchapterdisplay.P .deps/chtmlentrydisplay.P \
-#>- .deps/creferencemanager.P .deps/cswordbackend.P \
-#>- .deps/cswordbiblemoduleinfo.P .deps/cswordbookmoduleinfo.P \
-#>- .deps/cswordcommentarymoduleinfo.P .deps/cswordkey.P \
-#>- .deps/cswordldkey.P .deps/cswordlexiconmoduleinfo.P \
-#>- .deps/cswordmoduleinfo.P .deps/cswordmodulesearch.P \
-#>- .deps/cswordtreekey.P .deps/cswordversekey.P
-#>+ 20
-@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libbackend_a.all_cpp.P \
-	  .deps/bt_basicfilter.P .deps/bt_gbfhtml.P \
-.deps/bt_thmlhtml.P .deps/chtmlbookdisplay.P \
-.deps/chtmlchapterdisplay.P .deps/chtmlentrydisplay.P \
-.deps/creferencemanager.P .deps/cswordbackend.P \
-.deps/cswordbiblemoduleinfo.P .deps/cswordbookmoduleinfo.P \
-.deps/cswordcommentarymoduleinfo.P .deps/cswordkey.P \
-.deps/cswordldkey.P .deps/cswordlexiconmoduleinfo.P \
-.deps/cswordmoduleinfo.P .deps/cswordmodulesearch.P \
-.deps/cswordtreekey.P .deps/cswordversekey.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =    .deps/bt_basicfilter.P .deps/bt_gbfhtml.P \
-.deps/bt_thmlhtml.P .deps/chtmlbookdisplay.P \
-.deps/chtmlchapterdisplay.P .deps/chtmlentrydisplay.P \
-.deps/creferencemanager.P .deps/cswordbackend.P \
-.deps/cswordbiblemoduleinfo.P .deps/cswordbookmoduleinfo.P \
-.deps/cswordcommentarymoduleinfo.P .deps/cswordkey.P \
-.deps/cswordldkey.P .deps/cswordlexiconmoduleinfo.P \
-.deps/cswordmoduleinfo.P .deps/cswordmodulesearch.P \
-.deps/cswordtreekey.P .deps/cswordversekey.P
 
+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)
-OBJECTS = $(libbackend_a_OBJECTS)
 
-#>- all: all-redirect
+#>- all: all-am
 #>+ 1
-all: docs-am  all-redirect
+all: docs-am  all-am
+
 .SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/backend/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/backend/Makefile
+.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: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
+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)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+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 *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
+@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)/'`$<
 
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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`
 
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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
@@ -382,241 +498,268 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 
-maintainer-clean-libtool:
+ETAGS = etags
+ETAGSFLAGS =
 
-libbackend.a: $(libbackend_a_OBJECTS) $(libbackend_a_DEPENDENCIES)
-	-rm -f libbackend.a
-	$(AR) cru libbackend.a $(libbackend_a_OBJECTS) $(libbackend_a_LIBADD)
-	$(RANLIB) libbackend.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
+CTAGS = ctags
+CTAGSFLAGS =
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+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
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-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)
 
-subdir = bibletime/backend
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/backend/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(LIBRARIES)
 
-install-data-am:
+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
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-#>- clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
+	@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
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
+#>- 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
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+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:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/backend/Makefile
+		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)/chtmlchapterdisplay.cpp $(srcdir)/chtmlentrydisplay.cpp $(srcdir)/chtmlbookdisplay.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_gbfhtml.cpp $(srcdir)/bt_basicfilter.cpp  
+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 chtmlchapterdisplay.cpp chtmlentrydisplay.cpp chtmlbookdisplay.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_gbfhtml.cpp bt_basicfilter.cpp ; do \
+	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; \
+	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
 
-#>+ 2
+#>+ 3
 final:
 	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_final_OBJECTS)" all-am
-#>+ 2
+
+#>+ 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) -f $(top_srcdir)/admin/Makefile.common 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_basicfilter.cpp b/bibletime/backend/bt_basicfilter.cpp
deleted file mode 100644
index 1ce15d7..0000000
--- a/bibletime/backend/bt_basicfilter.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/***************************************************************************
-                          bt_basicfilter.cpp  -  description
-                             -------------------
-    begin                : Thu Nov 1 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 <stdlib.h>
-#include "bt_basicfilter.h"
-#include "creferencemanager.h"
-#include "cswordversekey.h"
-#include "../frontend/cbtconfig.h"
-
-//Qt includes
-#include <qregexp.h>
-#include <qstringlist.h>
-
-char BT_BASICFILTER::ProcessText (char *text, int maxlen, const SWKey *key, const SWModule *module){
-	m_module = module;
-	m_key = key;
-	updateSettings();
-	SWBasicFilter::ProcessText(text, maxlen, key, module);
-	
-	return 0;
-}
-
-void BT_BASICFILTER::updateSettings(){
-	strcpy(footnote_color,	CBTConfig::get(CBTConfig::footnotesColor	).name().utf8());
-	strcpy(strongs_color,		CBTConfig::get(CBTConfig::strongsColor		).name().utf8());
-	strcpy(morph_color,			CBTConfig::get(CBTConfig::morphsColor			).name().utf8());
-	strcpy(jesuswords_color,CBTConfig::get(CBTConfig::jesuswordsColor	).name().utf8());
-	strcpy(swordref_color,	CBTConfig::get(CBTConfig::swordRefColor		).name().utf8());
-	strcpy(text_color, 			CBTConfig::get(CBTConfig::textColor				).name().utf8());	
-	strcpy(standard_bible,	CReferenceManager::preferredModule(CReferenceManager::Bible).utf8());
-	
-	updateTokens();
-}
-
-
-/** Parses the verse reference ref and returns it. */
-const char* BT_BASICFILTER::parseSimpleRef(const char* ref) {
- 	VerseKey parseKey; 	
- 	SWModule* m = const_cast<SWModule*>(m_module);
- 	const char* lang = m ? m->Lang() : "en";
- 	parseKey.setLocale(lang);
-
- 	parseKey = (m_key ? (const char*)*m_key : "Genesis 1:1");
- 	ListKey list;
-  char* to = new char[5000];
-	char* ret = to;
-	
-	QStringList refList = QStringList::split(QRegExp("[,.;]", false), QString::fromLocal8Bit(ref));
-	int pos = 0;
-	for ( QStringList::Iterator it = refList.begin(); it != refList.end(); ++it, pos++ ) {
-	 	list = parseKey.ParseVerseList((*it).local8Bit(), parseKey, true);
-		
-	 	const int count = list.Count();
-	 	for(int i = 0; i < count; i++) {
-	 		SWKey* key = list.GetElement(i);
-	 		VerseKey* vk = dynamic_cast<VerseKey*>(key);
- 		
-  		pushString(&to,"<font color=\"%s\"><a href=\"sword://Bible/%s/",
- 				swordref_color,
-	 			standard_bible
- 			);
- 			
- 			if (vk) {
- 				vk->setLocale(lang);
- 				vk->LowerBound().setLocale(lang);
- 				vk->UpperBound().setLocale(lang); 				
- 			}
- 			if (vk && (const char*)vk->UpperBound() != (const char*)vk->LowerBound()) { 				
-	 			pushString(&to, "%s-%s\">%s</a>",
-	 				(const char*)QString::fromLocal8Bit(vk->LowerBound()).utf8(),
-	 				(const char*)QString::fromLocal8Bit(vk->UpperBound()).utf8(),
-	 				(const char*)(*it).utf8()
-	 			); 			
-	 		}
-	 		else {
-	 			pushString(&to, "%s\">%s</a>",
-	 				(const char*)QString::fromLocal8Bit((const char*)*key).utf8(),
-					(const char*)(*it).utf8()
-				);
-	 		}
-	 		(pos+1 < (int)refList.count()) ? pushString(&to, "</font>, ") : pushString(&to, "</font>");
-	 	}
-	}	
- 	*to++ = '\0';
- 	return ret;  //don't forget to delete it!
-}
-
-const char* BT_BASICFILTER::parseThMLRef(const char* ref, const char* mod) {
-  char* to = new char[5000];
-	char* ret = to;
-	const char* module = (mod ? mod : standard_bible);	
-// 	VerseKey parseKey = (m_key ? (const char*)*m_key : "Genesis 1:1");	
-//	ListKey list = parseKey.ParseVerseList(ref, parseKey, false);		
-//  const int count = list.Count();
-
-//  for(int i = 0; i < count; i++) {
-//	 	SWKey* key = list.GetElement(i);
-//	 	VerseKey* vk =  dynamic_cast<VerseKey*>(key);
-// 		
-	 	pushString(&to,"<font color=\"%s\"><a href=\"sword://Bible/%s/",
-	 		swordref_color,
-	 		module
-	 	);
-//	 	if (vk && vk->UpperBound() != vk->LowerBound()) {
-//	 		pushString(&to, "%s-%s\">",
-//	 			(const char*)QString::fromLocal8Bit(vk->LowerBound()).utf8(),
-//	 			(const char*)QString::fromLocal8Bit(vk->UpperBound()).utf8()
-//	 		);
-//	 	}
-//	 	else {
-	 		pushString(&to, "%s\">",
-	 			(const char*)QString::fromLocal8Bit(ref).utf8()
-			);
-//	 	}
-//	 	(i+1 < refList.count()) ? pushString(&to, "</font>, ") : pushString(&to, "</font>");	
-//	}
-	*to++ = '\0';
-	return ret;
-}
-
-const char* BT_BASICFILTER::thmlRefEnd() {
-	return "</a></font>";
-}
-
-/** This filter converts the RWP #Gen 1:1| style bible references to HTML */
-char BT_BASICFILTER::ProcessRWPRefs(char* text, int maxlen){
-	char *to, *from, verse_str[500];
-	int len;
-
-	len = strlen(text) + 1;	// shift string to right of buffer
-	if (len < maxlen) {
-		memmove(&text[maxlen - len], text, len);
-		from = &text[maxlen - len];
-	}
-	else
-		from = text;	
-
-	for (to = text; *from; from++) {
-		if (*from == '#') {
-			int i=0;
-			bool is_verse = true;
-			
-			for ( i=0; i < 500 || from[i]=='|'; i++){
-				if ( from[i] == '|' )
-					break;  //We found a valid verse ref
-				if ( !isalnum(from[i])  && !isspace(from[i]) && from[i]!=':'
-							&& from[i]!=';' && from[i]!=',' && from[i]!='-' && from[i]!='#'){
-					is_verse = false;
-					break; // can't be a verseref
-				}
-			}
-			if ( i==500 || !is_verse ){
-				*to++ = *from;
-				continue;
-			}				
-			++from;
-			
-			i = 0;
-			verse_str[0] = '\0';
-			while (*from != '|' && i<500) { /* get the bible reference */
-				verse_str[i++] = *from;
-				verse_str[i + 1] = '\0';
-				from++;
-			}			
-			
-//			cerr << verse_str << endl;
-			const char* ref = parseSimpleRef(verse_str);			
-		  pushString(&to,"%s ", ref);
-		  delete [] ref;//delete now because it's unused
-		
-			continue;
-		}
-		*to++ = *from;
-	}
-	*to++ = 0;
-	*to = 0;
-	return 0;
-}
-
-/** Replaces the token in the substitute map. */
-void BT_BASICFILTER::replaceTokenSubstitute(const char* findString, const char* replaceString){
-	tokenSubMap.erase( tokenSubMap.find(findString) ); //erase entry
-	addTokenSubstitute(findString, replaceString);
-}
-
-/** Updates the token for this filter if settings changed. */
-void BT_BASICFILTER::updateTokens(){
-}
diff --git a/bibletime/backend/bt_basicfilter.h b/bibletime/backend/bt_basicfilter.h
deleted file mode 100644
index 8e44f80..0000000
--- a/bibletime/backend/bt_basicfilter.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
-                          bt_basicfilter.h  -  description
-                             -------------------
-    begin                : Thu Nov 1 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 BT_BASICFILTER_H
-#define BT_BASICFILTER_H
-
-#include <swbasicfilter.h>
-
-class SWKey;
-class SWModule;
-
-/**
-  * This is the base class for all filters in BT
-  */
-
-class BT_BASICFILTER : public SWBasicFilter  {
-public:
-  virtual char ProcessText (char *text, int maxlen, const SWKey *, const SWModule * = 0);
-
-protected:
-	/**
-	* 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(char * text, int maxlen = -1);
-  /**
-  * Parses the verse reference ref and returns it.
-  */
-  const char* parseSimpleRef(const char* ref);
-  /**
-  * Parses the verse reference ref and returns it.
-  */
-  const char* parseThMLRef(const char* ref, const char* mod = 0);
-	const char* thmlRefEnd();
-  /**
-  * Replaces the token in the substitute map.
-  */
-  void replaceTokenSubstitute(const char* findString, const char* replaceString);
-  /**
-  * Updates the token for this filter if settings changed.
-  */
-  virtual void updateTokens();
-	
-	char footnote_color[8];
-	char strongs_color[8];
-	char morph_color[8];
-	char jesuswords_color[8];
-	char swordref_color[8];
-	char text_color[8];
-	char standard_bible[100];
-
-	const SWKey *m_key;
-	const SWModule* m_module;
-};
-
-#endif
diff --git a/bibletime/backend/bt_gbfhtml.cpp b/bibletime/backend/bt_gbfhtml.cpp
index d575222..092bf5a 100644
--- a/bibletime/backend/bt_gbfhtml.cpp
+++ b/bibletime/backend/bt_gbfhtml.cpp
@@ -16,12 +16,23 @@
  ***************************************************************************/
 
 //BibleTime includes
-#include <qstring.h>
+#include "cswordmoduleinfo.h"
+#include "cswordbackend.h"
+#include "util/cpointers.h"
+
+#include "bt_gbfhtml.h"
 
+//sytsme includes
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "bt_gbfhtml.h"
+//Sword includes
+#include <utilxml.h>
+
+//Qt includes
+#include <qregexp.h>
+#include <qstring.h>
+
 
 BT_GBFHTML::BT_GBFHTML(){
   setTokenStart("<");
@@ -29,128 +40,145 @@ BT_GBFHTML::BT_GBFHTML(){
 	
 	setTokenCaseSensitive(true);
 
-	addTokenSubstitute("Rf", ")</small></font>");// end of footnote
-	addTokenSubstitute("FI", "<i>"); // italics begin
-	addTokenSubstitute("Fi", "</i>");
-	addTokenSubstitute("FB", "<b>"); // bold begin
-	addTokenSubstitute("Fb", "</b>");
-	
-	addTokenSubstitute("FR", QString::fromLatin1("<font color=\"%1\">").arg(jesuswords_color).latin1());		
-	addTokenSubstitute("Fr", "</font>");
-	addTokenSubstitute("FU", "<u>"); // underline begin
-	addTokenSubstitute("Fu", "</u>");
-	addTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
-	addTokenSubstitute("Fo", "</cite>");
-	addTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
-	addTokenSubstitute("Fs", "</sup>");
-	addTokenSubstitute("FV", "<sub>"); // Subscript begin
-	addTokenSubstitute("Fv", "</sub>");
-
-	addTokenSubstitute("TT", QString::fromLatin1(" <h1><font color=\"%1\">").arg(text_color).local8Bit());
-	addTokenSubstitute("Tt", "</font></h1>");
-	
-	addTokenSubstitute("Ts", "</font></h2>");
-	addTokenSubstitute("TS", QString::fromLatin1(" <H2><font color=\"%1\">").arg(text_color).local8Bit());	
-			
-	addTokenSubstitute("PP", "<cite>"); //  poetry  begin
-	addTokenSubstitute("Pp", "</cite>");
-	addTokenSubstitute("Fn", "</font>"); //  font  end
-	addTokenSubstitute("CL", "<br>"); //  new line
-	addTokenSubstitute("CM", "<!p><br>"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
-	addTokenSubstitute("CG", ">"); // literal greater-than sign
-	addTokenSubstitute("CT", "<"); // literal less-than sign
-	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
-	addTokenSubstitute("JC", "<div align=\"center\">"); // center align begin
-	addTokenSubstitute("JL", "</div>"); // align end
+	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(char * text, int maxlen, const SWKey * key, const SWModule * module){
-	BT_BASICFILTER::ProcessText(text, maxlen, key, module);
-	BT_BASICFILTER::ProcessRWPRefs(text, maxlen);
-}
+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(char **buf, const char *token, DualStringMap &userData) {
+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;
-		unsigned long len = strlen(token);
-
-		if (!strncmp(token, "WG", 2)){ // strong's numbers greek
-			char num[6];
-			for (i = 2; i < tokenLength; i++)
-					num[i-2] = token[i];
-			num[i-2]=0;
-
-			pushString(buf," <font color=\"%s\"><small><em><a href=\"strongs://Greek/%s\">&lt;%s&gt;</a></em></small></font> ",
-				strongs_color, num, num);
+    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()
+      );
 		}
-
-		if (!strncmp(token, "WH", 2)){ // strong's numbers hebrew
-			char num[6];
-			for (i = 2; i < tokenLength; i++)
-					num[i-2] = token[i];
-			num[i-2]=0;
-
-			pushString(buf," <font color=\"%s\"><small><em><a href=\"strongs://Hebrew/%s\">&lt;%s&gt;</a></em></small></font> ",
-				strongs_color, num, num);
+		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
-			char num[16];
-			for (i = 3; i < tokenLength; i++)
-					num[i-3] = token[i];
-			num[i-3]=0;
-
-			pushString(buf," <font color=\"%s\"><small><em><a href=\"morph://Greek/%s\">(%s)</a></em></small></font> ",
-				strongs_color, num, num);
+			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
-
-			char num[6];
-			for (i = 3; i < tokenLength; i++)
-					num[i-3] = token[i];
-			num[i-3]=0;
-
-			pushString(buf," <font color=\"%s\"><small><em><a href=\"morph://Hebrew/%s\">(%s)</a></em></small></font> ",
-				strongs_color, num, num);
+			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)) {
-			pushString(buf, "<i>");
-			userData["hasFootnotePreTag"] = "true";
+			buf += "<span class=\"footnotepre\">";
+			myUserData->hasFootnotePreTag = true;
 		}
 
 		else if (!strncmp(token, "RF", 2)) {
-			if(userData["hasFootnotePreTag"] == "true") {
-				userData["hasFootnotePreTag"] = "false";
-				pushString(buf, "</i> ");
+			if (myUserData->hasFootnotePreTag) {
+				myUserData->hasFootnotePreTag = false;
+				buf += "</span> ";
 			}
-			pushString(buf,"<font color=\"%s\"><small> (",footnote_color);
+			buf += "<span class=\"footnote\"> (";
 		}
 
 		else if (!strncmp(token, "FN", 2)) {
-			pushString(buf, "<font face=\"");
-			for (i = 2; i < tokenLength; i++)				
-				if(token[i] != '\"')
-					*(*buf)++ = token[i];
-			pushString(buf,"\">");
+			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]);
+			buf += (char)atoi(&token[2]);
 		}		
 		else {
-			return false;
+			return GBFHTML::handleToken(buf, token, userData);
 		}
 	}
 	return true;
 }
 
-/** Update the tokens which use changeable settings. */
-void BT_GBFHTML::updateTokens(){
-	replaceTokenSubstitute("TT", QString::fromLatin1(" <h1><font color=\"%1\">").arg(text_color).local8Bit());
-	replaceTokenSubstitute("TS", QString::fromLatin1(" <H2><font color=\"%1\">").arg(text_color).local8Bit());
-	replaceTokenSubstitute("FR", QString::fromLatin1("<font color=\"%1\">").arg(jesuswords_color).latin1());	
-}
diff --git a/bibletime/backend/bt_gbfhtml.h b/bibletime/backend/bt_gbfhtml.h
index 0b3f983..97f227d 100644
--- a/bibletime/backend/bt_gbfhtml.h
+++ b/bibletime/backend/bt_gbfhtml.h
@@ -16,33 +16,37 @@
  *                                                                         *
  ***************************************************************************/
 
-/* $Header: /cvsroot/bibletime/bibletime/bibletime/backend/bt_gbfhtml.h,v 1.6 2002/02/17 00:27:58 joachim Exp $ */
-/* $Revision: 1.6 $ */
+/* $Header: /cvsroot/bibletime/bibletime/bibletime/backend/bt_gbfhtml.h,v 1.14 2003/08/12 19:37:15 joachim Exp $ */
+/* $Revision: 1.14 $ */
 
-#ifndef GBFHTML_H
-#define GBFHTML_H
+#ifndef BT_GBFHTML_H
+#define BT_GBFHTML_H
 
-#include "bt_basicfilter.h"
+#include "cfiltertool.h"
 
-class SWKey;
-class SWModule;
+#include <swkey.h>
+#include <swmodule.h>
+#include <swbasicfilter.h>
+#include <gbfhtml.h>
 
 /**
 * This filter converts GBF Text into HTML
 */
-class BT_GBFHTML : public BT_BASICFILTER{
+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(char **buf, const char *token, DualStringMap &userData);
-  /** No descriptions */
-  virtual char ProcessText(char * text, int maxlen, const SWKey *, const SWModule * = 0);
-
-protected: // Protected methods
-  /**
-  * Update the tokens which use changeable setttings.
-  */
-  virtual void updateTokens();
+  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
new file mode 100644
index 0000000..c3b1d7b
--- /dev/null
+++ b/bibletime/backend/bt_osishtml.cpp
@@ -0,0 +1,259 @@
+/***************************************************************************
+                     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
new file mode 100644
index 0000000..a42bbda
--- /dev/null
+++ b/bibletime/backend/bt_osishtml.h
@@ -0,0 +1,59 @@
+/***************************************************************************
+                          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
index 3be0374..7e2e566 100644
--- a/bibletime/backend/bt_thmlhtml.cpp
+++ b/bibletime/backend/bt_thmlhtml.cpp
@@ -19,8 +19,15 @@
 #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>
@@ -28,198 +35,137 @@
 BT_ThMLHTML::BT_ThMLHTML() {
 	setEscapeStringCaseSensitive(true);
 	setPassThruUnknownEscapeString(true); //the HTML widget will render the HTML escape codes	
-	setEscapeStart("&");
-	setEscapeEnd(";");	
-  addEscapeStringSubstitute("raquo", QString::fromLatin1("�").utf8());
-  addEscapeStringSubstitute("laquo", QString::fromLatin1("�").utf8());
-//  addEscapeStringSubstitute("uuml", QString::fromLatin1("�").utf8());
-//  addEscapeStringSubstitute("ouml", QString::fromLatin1("�").utf8());
-//  addEscapeStringSubstitute("auml", QString::fromLatin1("�").utf8());
-	
-	setTokenStart("<");
+
+  setTokenStart("<");
 	setTokenEnd(">");
 	setTokenCaseSensitive(true);
-	addTokenSubstitute("note", " <small>(");
-	addTokenSubstitute("/note", ")</small> ");
-
-//	addTokenSubstitute("foreign lang=\"el\"", "<font face=\"SIL Galatia\">");
-//	addTokenSubstitute("foreign lang=\"he\"", "<font face=\"SIL Ezra\">");
-//	addTokenSubstitute("/foreign",						"</font>");
+  
+	replaceTokenSubstitute("/foreign", "</span>");
 
+  if (tokenSubMap.find("note") != tokenSubMap.end()) { //remove note tag
+	  tokenSubMap.erase( tokenSubMap.find("note") );
+  }
+	replaceTokenSubstitute("/note", ")</span>");	
 }
 
-bool BT_ThMLHTML::handleToken(char **buf, const char *token, DualStringMap &userData) {
-	unsigned long i = 0;
-	const unsigned int tokenLength = strlen(token);
-	
+bool BT_ThMLHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) {  
 	if (!substituteToken(buf, token) && !substituteEscapeString(buf, token)) {
-
-		if (!strncmp(token, "sync type=\"lemma\"", 17)) { //LEMMA
-			pushString(buf," <small><em>&lt;");
-
-			for (int j = 17; j < tokenLength; j++) {
-				if (!strncmp(token+j, "value=\"", 7)) {
-					j += 7;
-					for (;token[j] != '\"'; j++)
-						*(*buf)++ = token[j];
-					break;
-				}
-			}
-			pushString(buf, "&gt;</em></small> ");
+    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 (!strncmp(token, "sync type=\"morph\"", 17)) { //Morph
-			char num[12];
-			for (int j = 17; j < tokenLength; j++) {
-				if (!strncmp(token+j, "value=\"", 7)) {
-					j += 7;
-					int idx=0;
-					for (;token[j] != '\"'; j++,idx++)
-						num[idx] = token[j];
-					num[idx] = 0;
-					break;
-				}
+		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\">(";
 			}
-			pushString(buf," <font color=\"%s\"><small><em><a href=\"morph://Greek/%s\">(%s)</a></em></small></font> ",
-				morph_color, num, num);
 		}
-		
-		else if (!strncmp(token, "sync type=\"Strongs\" value=\"H\"", 29)) {
-			char num[12];
-			for (i = 29; i < tokenLength; i++)
-				if(token[i] != '\"')
-					num[i-29] = token[i];
-			num[i-29] = 0;
-
-			pushString(buf," <font color=\"%s\"><small><em><a href=\"strongs://Hebrew/%s\">&lt;%s&gt;</a></em></small></font> ",
-				strongs_color, num, num);
-		}
-		else if (!strncmp(token, "sync type=\"Strongs\" value=\"G\"",29)) {
-			char num[12];
-			for (i = 29; i < tokenLength; i++)
-				if(token[i] != '\"')
-					num[i-29] = token[i];
-			num[i-29] = 0;
-
-			pushString(buf," <font color=\"%s\"><small><em><a href=\"strongs://Greek/%s\">&lt;%s&gt;</a></em></small></font> ",
-				strongs_color, num, num);
-		}
-
-		else if (!strncmp(token, "scripRef p", 10) || !strncmp(token, "scripRef v", 10)) {
-			userData["inscriptRef"] = "true";
-			if (!strncmp(token, "scripRef v", 10)) { //module given
-
-				char module_version[500];
-				for (i = 18; i < tokenLength-1; i++) {
-					if(token[i] != '\"')
-						module_version[i-18] = token[i];						
-					else
-						break;
-				}
-				module_version[i-18] = 0;
-				//c contains the module
-				userData["lastRefModule"] = module_version;
-			}
-			else if (!strncmp(token, "scripRef p", 10)) { //passage without module
-				char verse_str[5000];
-				for (i = 18; i < tokenLength-1; i++) {
-					if(token[i] != '\"')
-						verse_str[i-18] = token[i];
-					else
-						break;
-				}
-				verse_str[i-18] = 0;
-				const char* ref = parseThMLRef(verse_str);
- 			  pushString(buf, ref);
- 			  delete [] ref;//delete now because it's unused
-			}
-			if ( !strncmp(token+i+2, "passage=", 8) ) { //passage after module part
-				char verse_str[5000];
-				i+=11;			
-				int idx = 0;	
-				for (; i < tokenLength-1; i++,idx++)	{
-					if(token[i] != '\"')
-						verse_str[idx] = token[i];
-					else
-						break;					
-				}
-				verse_str[idx] = '\0';
-				const char* ref = parseThMLRef(verse_str, userData["lastRefModule"].c_str());
-				pushString(buf, ref);
-				delete [] ref;
-			}
-		}
-		// we're starting a scripRef like "<scripRef>John 3:16</scripRef>"
-		else if (!strcmp(token, "scripRef")) {
-			userData["inscriptRef"] = "false";
-			// let's stop text from going to output
-			userData["suspendTextPassThru"] = "true";
-		}
-		// we've ended a scripRef
-		else if (!strcmp(token, "/scripRef")) {
-			if (userData["inscriptRef"] == "true") { // like  "<scripRef passage="John 3:16">John 3:16</scripRef>"
-				userData["inscriptRef"] = "false";
-				pushString(buf, thmlRefEnd());
-			}			
-			else { // like "<scripRef>John 3:16</scripRef>"
-				const char* ref = parseSimpleRef(userData["lastTextNode"].c_str());
- 			  pushString(buf, ref);
- 			  delete [] ref;//delete now because it's unused
-				userData["suspendTextPassThru"] = "false";
-			}
-		}			
-		
-//headings should be processed by the ThMLHeadings filter		
-		else if (!strncmp(token, "div class=\"sechead\"", 19)) {
-			userData["SecHead"] = "true";
-			pushString(buf, "<H2><FONT color=\"%s\">", text_color);
-		}
-		else if (!strncmp(token, "div class=\"title\"", 19)) {
-      userData["Title"] = "true";
-			pushString(buf, "<H1><FONT color=\"%s\">", text_color);
-		}
-		else if (!strncmp(token, "/div", 4)) {
-			if (userData["SecHead"] == "true") {
-				pushString(buf, "</FONT></H2>");
-				userData["SecHead"] = "false";
-			}
-			else if(userData["Title"] == "true") {
-				pushString(buf, "</FONT></H1>");
-				userData["Title"] = "false";
-			}
-		}
-		else if (!strncmp(token, "img ", 4)) {
-			const char *src = strstr(token, "src");
-			if (!src)		// assert we have a src attribute
-				return false;
-
-			*(*buf)++ = '<';
-			for (const char *c = token; *c; c++) {
-				if (c == src) {
-					for (;((*c) && (*c != '"')); c++)
-						*(*buf)++ = *c;
-
-					if (!*c) { c--; continue; }
-
-					*(*buf)++ = '"';
-					if (*(c+1) == '/') {
-						pushString(buf, "file:");
-						pushString(buf, module->getConfigEntry("AbsoluteDataPath"));
-						if (*(*buf-1) == '/')
-							c++;		// skip '/'
-					}
-					continue;
-				}
-				*(*buf)++ = *c;
-			}
-			*(*buf)++ = '>';
-		}		
-		else { // let token pass thru
-			*(*buf)++ = '<';
-			for (i = 0; i < tokenLength; i++)
-				*(*buf)++ = token[i];
-				*(*buf)++ = '>';
+		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
index b469ca4..6588f85 100644
--- a/bibletime/backend/bt_thmlhtml.h
+++ b/bibletime/backend/bt_thmlhtml.h
@@ -16,19 +16,36 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef THMLHTML_H
-#define THMLHTML_H
+#ifndef BT_THMLHTML_H
+#define BT_THMLHTML_H
 
-#include "bt_basicfilter.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 BT_BASICFILTER {
+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(char **buf, const char *token, DualStringMap &userData);
+  virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData);
 //  virtual char ProcessText (char *text, int maxlen = -1);
 };
 
diff --git a/bibletime/backend/centrydisplay.cpp b/bibletime/backend/centrydisplay.cpp
new file mode 100644
index 0000000..e70bae0
--- /dev/null
+++ b/bibletime/backend/centrydisplay.cpp
@@ -0,0 +1,568 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..8cdadad
--- /dev/null
+++ b/bibletime/backend/centrydisplay.h
@@ -0,0 +1,181 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..d3ab26d
--- /dev/null
+++ b/bibletime/backend/cfiltertool.cpp
@@ -0,0 +1,159 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..d627608
--- /dev/null
+++ b/bibletime/backend/cfiltertool.h
@@ -0,0 +1,69 @@
+/***************************************************************************
+                          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/chtmlbookdisplay.cpp b/bibletime/backend/chtmlbookdisplay.cpp
deleted file mode 100644
index 5211f4d..0000000
--- a/bibletime/backend/chtmlbookdisplay.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************
-                          chtmlbookdisplay.cpp  -  description
-                             -------------------
-    begin                : Mon Mar 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 "chtmlbookdisplay.h"
-#include "cswordbookmoduleinfo.h"
-#include "cswordtreekey.h"
-#include "creferencemanager.h"
-#include "../util/scoped_resource.h"
-
-char CHTMLBookDisplay::Display( CSwordModuleInfo* module ){
-	CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(module);
-	util::scoped_ptr<CSwordTreeKey> key( dynamic_cast<CSwordTreeKey*>( CSwordKey::createInstance(book) ) );
-	m_htmlText = QString::null;
-	
-	if (!module || !key) {		
-		return 0;
-	}	
-	const int displayLevel = book->config( CSwordModuleInfo::DisplayLevel ).toInt();
-	key->key(book->module()->KeyText());		
-	updateSettings();	
-	if (!displayLevel) {
-	 	m_htmlText = key->renderedText();
-	 	return 0;
-	}	
-	const QString oldKey = key->key();			
-
-	int moved = 0;
-	
-	while (key->firstChild())
-		++moved; //down
-
-	for (int i = 1; i < displayLevel; i++) {
-		if (!key->parent() || key->key() == "/" || key->key().isEmpty()) {
-			break;		
-		}
-		--moved; //up
-	};
-	
-	if (moved <= 1) { //display entries together
-		while(key->previousSibling()); //first entry of it's parent		
-		printTree(*key, book);	
-		key->key(oldKey);
-		return 1;	
-	}
-	else { //do not display entries together
-		key->key(oldKey.isNull() ? "/" : oldKey);
-		m_htmlText = key->renderedText();
-		return 1;
-	}	
-}
-
-void CHTMLBookDisplay::printTree(CSwordTreeKey treeKey, CSwordBookModuleInfo* module, const int levelPos){
-  m_htmlText += QString::fromLatin1("<A NAME=\"%1\" HREF=\"%2\">%3</A>: %4<BR>")
-  	.arg(treeKey.getLocalName())
-  	.arg(CReferenceManager::encodeHyperlink(module->name(), treeKey.getFullName(), CReferenceManager::GenericBook))
-  	.arg(treeKey.getFullName())
-  	.arg(treeKey.renderedText());  	
-  	
-  if (treeKey.hasChildren()) {
-    m_htmlText += QString::fromLatin1("<H3>%1</H3>").arg(treeKey.getFullName());
-    treeKey.firstChild();
-    printTree(treeKey, module, levelPos+1);
-    treeKey.parent();
-  }
-  if (treeKey.nextSibling())
-		printTree(treeKey, module, levelPos);
-}
diff --git a/bibletime/backend/chtmlbookdisplay.h b/bibletime/backend/chtmlbookdisplay.h
deleted file mode 100644
index 19ba6a8..0000000
--- a/bibletime/backend/chtmlbookdisplay.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
-                          chtmlbookdisplay.h  -  description
-                             -------------------
-    begin                : Mon Mar 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 CHTMLBOOKDISPLAY_H
-#define CHTMLBOOKDISPLAY_H
-
-#include "chtmlentrydisplay.h"
-#include "cswordtreekey.h"
-
-class CSwordBookModuleInfo;
-
-/**
-	* The display class to display
-	* the general book modules.
-  * @author The BibleTime team
-  */
-class CHTMLBookDisplay : public CHTMLEntryDisplay  {
-public: 
-  /**
-  * Renders the current entry of the module using HTML tags.
-  * The rendered text is cached so it's faster if it's called for the
-  * same key next time.
-  */
-  virtual char Display(CSwordModuleInfo* module);
-
-private:
-	void printTree(CSwordTreeKey treeKey, CSwordBookModuleInfo* module, const int levelPos = 0);
-};
-
-#endif
diff --git a/bibletime/backend/chtmlchapterdisplay.cpp b/bibletime/backend/chtmlchapterdisplay.cpp
deleted file mode 100644
index ecb0d16..0000000
--- a/bibletime/backend/chtmlchapterdisplay.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/***************************************************************************
-                          chtmlchapterdisplay.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 12 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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTiem includes
-#include "chtmlchapterdisplay.h"
-#include "cswordmoduleinfo.h"
-#include "cswordversekey.h"
-#include "../frontend/ctoolclass.h"
-#include "creferencemanager.h"
-
-//Qt includes
-#include <qfont.h>
-
-//Sword includes
-#include <versekey.h>
-
-/** Renders the text and puts the result into the member variable m_htmlText */
-char CHTMLChapterDisplay::Display( CSwordModuleInfo* module ){
-	if (!module) {
-		m_htmlText = QString::null;
-		return 0; //error
-	}
-	
-	CSwordVerseKey key(0);
-	key.key( module->module()->KeyText() );	
-	const int currentTestament = key.Testament();	
-	const int currentBook = key.Book();
-	const int currentChapter = key.Chapter();
-	const int currentVerse = key.Verse();	
-	
-	key.module(module);	
-	int verse = 0;
-	
-	if (module->isUnicode()) {
-		m_htmlHeader = "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head>";
-	}
-	m_htmlText = m_htmlHeader + QString::fromLatin1("<body>");
-	
-	//reload font settings
-	updateSettings();
-	m_htmlText.append(QString::fromLatin1("<font face=\"%1\" size=\"%2\" color=\"%3\">")
-		.arg(module->isUnicode() ? m_unicodeFontName : m_standardFontName)
-		.arg(module->isUnicode() ? m_unicodeFontSize : m_standardFontSize)
-		.arg(m_standardFontColorName)
-	);
-
-	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)) {
-		verse = key.Verse();
-		if (m_displayOptionsBool.verseNumbers) {
-			m_htmlText.append( QString::fromLatin1("<font color=\"%1\"><a name=\"%2\" href=\"%3\"><b>%4</b></a></font> ")
-				.arg(m_swordRefColorName)
-				.arg(verse)
-				.arg(CReferenceManager::encodeHyperlink( module->name(), key.key(), CReferenceManager::typeFromModule(module->type()) ))
-				.arg(verse)
-			);
-		}
-		if (verse == currentVerse)
-		  m_htmlText += QString::fromLatin1("<font color=\"") + m_highlightedVerseColorName + QString::fromLatin1("\">");
-		m_htmlText += key.renderedText();
-		if (verse == currentVerse)
-		  m_htmlText += QString::fromLatin1("</font>");
-		if (m_displayOptionsBool.lineBreaks)
-			m_htmlText += QString::fromLatin1("<br>\n");
-		else
-			m_htmlText += QString::fromLatin1(" \n");
-	}
-	
-	m_htmlText += QString::fromLatin1("</font>") + m_htmlBody;
-	return 1;	//no error	
-}
-
-/** Generates code to display the given modules side by side. */
-char CHTMLChapterDisplay::Display( QList<CSwordModuleInfo>* moduleList){	
-#warning make table colors configurable
-	if (!moduleList || (moduleList && !moduleList->count()) ) {
-		m_htmlText = QString::null;
-		return 0;
-	}
-	//reload font settings
-	updateSettings();
-
-	SWModule* module = moduleList->first()->module();		
-		
-	VerseKey* vk = (VerseKey*)((SWKey*)(*module));
-	CSwordVerseKey key(0);
-	key.key((const char*)*vk);
-
-	const int currentTestament = key.Testament();	
-	const int currentBook = key.Book();
-	const int currentChapter = key.Chapter();
-	const int chosenVerse = key.Verse();
-	const int width = (int)((double)97/(double)moduleList->count()); //width in per cent!!
-	CSwordModuleInfo *d = 0;
-			
-	m_htmlText = QString::fromLatin1("<qt text=\"%1\">").arg(m_standardFontColorName); //for compatibility with Qt's rendering	
-	m_htmlText += m_htmlHeader + QString::fromLatin1("<body text=\"%1\">").arg(m_standardFontColorName);
-
-
-	m_htmlText += QString::fromLatin1("<table cellpadding=\"2\" cellspacing=\"0\"><td bgcolor=\"#f1f1f1\"></td>");	
-	SWModule *m = (d = moduleList->first()) ? d->module() : 0;
-
-	QString text = QString::fromLatin1("<td width=\"%1%\" bgcolor=\"#f1f1f1\"><b>%1</b></td>");
-	while (m) {
-		m_htmlText += text.arg(width).arg(d->name());
-		m = (d=moduleList->next()) ? d->module() : 0;			
-	}
-	m_htmlText += QString::fromLatin1("</tr>");
-		
-	CSwordVerseKey current(0);	
-	QString rowText = QString::null;
-	int currentVerse = 0;
-	text = QString::fromLatin1("<tr><td bgcolor=\"#f1f1f1\"><b><font color=\"%1\"><a name=\"%2\" href=\"%3\">%4</a></b></td>\n");
-	const QString cell = QString::fromLatin1("<td width=\"%1%\" bgcolor=\"%2\">");
-	
-	for (key.Verse(1); key.Testament() == currentTestament && key.Book() == currentBook && key.Chapter() == currentChapter && !module->Error(); key.next(CSwordVerseKey::UseVerse)) {
-		const QString currentKey = key.key();
-		currentVerse = key.Verse();
-		m = (d = moduleList->first()) ? d->module() : 0;		
-		rowText = text.arg(m_swordRefColorName).arg(currentVerse).arg(CReferenceManager::encodeHyperlink( d->name(), currentKey, CReferenceManager::typeFromModule(d->type()) )).arg(currentVerse);
-		
-		current.key(currentKey);					
-		while (m) {
-			current.module(d);
-			rowText += cell.arg(width).arg(currentVerse % 2 ? "white" : "#f1f1f1");
-			if (d->isUnicode())
-				rowText +=
-					QString::fromLatin1("<font face=\"%1\" size=\"%2\">")
-						.arg(m_unicodeFontName)
-						.arg(m_unicodeFontSize);
-			if (currentVerse == chosenVerse)
-				rowText += QString::fromLatin1("<font color=\"%1\">")
-											.arg(m_highlightedVerseColorName);
-
-			rowText += current.renderedText() + QString::fromLatin1("</font>");
-			m = (d = moduleList->next()) ? d->module() : 0;
-		}
-		m_htmlText += rowText + QString::fromLatin1("</tr>\n");
-	}
-	m_htmlText += QString::fromLatin1("</font></table>")
-								+ m_htmlBody
-								+ QString::fromLatin1("</qt>");
-	
-	//clean up
-	return 1;		
-}
diff --git a/bibletime/backend/chtmlchapterdisplay.h b/bibletime/backend/chtmlchapterdisplay.h
deleted file mode 100644
index 3e169af..0000000
--- a/bibletime/backend/chtmlchapterdisplay.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
-                          chtmlchapterdisplay.h  -  description
-                             -------------------
-    begin                : Thu Oct 12 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 CHTMLCHAPTERDISPLAY_H
-#define CHTMLCHAPTERDISPLAY_H
-
-#include "chtmlentrydisplay.h"
-
-/**
-	* The display which renders a chapter
-  * @author The BibleTime team
-  * @version $Id: chtmlchapterdisplay.h,v 1.4 2001/11/07 19:20:35 mgruner Exp $
-  */
-class CHTMLChapterDisplay : public CHTMLEntryDisplay  {
-public: 
-  /**
- 	* Renders the current chapter of the module using HTML tags.
- 	* The finished HTML text could be retrieved using the function
-	* #getHTML.
- 	* This is a reimplementation from CHTMLEntryDisplay
- 	*/
-  virtual char Display( CSwordModuleInfo* module );
-  /**
-  * Generates code to display the given modules side by side.
-  */
-  virtual char Display( QList<CSwordModuleInfo>* moduleList);
-};
-
-#endif
diff --git a/bibletime/backend/chtmlentrydisplay.cpp b/bibletime/backend/chtmlentrydisplay.cpp
deleted file mode 100644
index 2589220..0000000
--- a/bibletime/backend/chtmlentrydisplay.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/***************************************************************************
-                          chtmlentrydisplay.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 "chtmlentrydisplay.h"
-#include "cswordmoduleinfo.h"
-#include "cswordkey.h"
-#include "cswordldkey.h"
-#include "cswordversekey.h"
-#include "creferencemanager.h"
-#include "../frontend/ctoolclass.h"
-#include "../frontend/cbtconfig.h"
-
-#include "../util/scoped_resource.h"
-
-
-//Qt includes
-#include <qfont.h>
-
-//Sword includes
-#include <versekey.h>
-
-CHTMLEntryDisplay::CHTMLEntryDisplay(){
-	m_htmlHeader = "<html><head></head>";
-	m_htmlBody = "</body></html>";
-	m_includeHeader = true;
-}
-
-CHTMLEntryDisplay::~CHTMLEntryDisplay(){
-}
-
-void CHTMLEntryDisplay::updateSettings(void){
-  m_highlightedVerseColorName = CBTConfig::get(CBTConfig::highlightedVerseColor).name();
-	m_standardFontColorName 		= CBTConfig::get(CBTConfig::textColor).name();
-	m_swordRefColorName 				= CBTConfig::get(CBTConfig::swordRefColor).name();
-
-  m_standardFontName = CBTConfig::get(CBTConfig::standard).family();
-  m_standardFontSize = CToolClass::makeLogicFontSize(CBTConfig::get(CBTConfig::standard).pointSize() );
-
-	m_unicodeFontName  = CBTConfig::get(CBTConfig::unicode).family();
-  m_unicodeFontSize  = CToolClass::makeLogicFontSize( CBTConfig::get(CBTConfig::unicode).pointSize() );
-}
-
-/** Displays the current entry of the module as HTML */
-char CHTMLEntryDisplay::Display(CSwordModuleInfo* module) {
-	if (!module) {
-		m_htmlText = QString::null;
-		return -1;
-	}
-  //refresh font settings
-	updateSettings();
-	
-	util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-	if (!key) {
-		m_htmlText = QString::null;
-		return 0;
-	}	
-	key->key( module->module()->KeyText() );
-	
-	CReferenceManager::Type refType = CReferenceManager::Unknown;
-	if (module->type() == CSwordModuleInfo::Bible)
-		refType = CReferenceManager::Bible;
-	else if (module->type() == CSwordModuleInfo::Commentary)
-		refType = CReferenceManager::Commentary;
-	else if (module->type() == CSwordModuleInfo::Lexicon)
-		refType = CReferenceManager::Lexicon;
-	else if (module->type() == CSwordModuleInfo::GenericBook)
-		refType = CReferenceManager::GenericBook;
-	
-	if (m_includeHeader) {
-		m_htmlText = m_htmlHeader;
-
-		m_htmlText.append(QString::fromLatin1("<body><font color=\"%1\" face=\"%2\" size=\"%3\">")
-			.arg(m_standardFontColorName)
-      .arg( module->isUnicode() ? m_unicodeFontName : m_standardFontName)
-			.arg( module->isUnicode() ? m_unicodeFontSize : m_standardFontSize));
-
-		m_htmlText.append(QString::fromLatin1("<font color=\"%1\"><a href=\"%2\">%3: <b>%4</b></a></font><hr>%5")
-			.arg(m_highlightedVerseColorName)
- 			.arg(CReferenceManager::encodeHyperlink(module->name(),key->key(), refType ))
-			.arg(module->config(CSwordModuleInfo::Description))
-			.arg(key->key())
-			.arg(key->renderedText()));
-
-		m_htmlText += QString::fromLatin1("</font>") + m_htmlBody;
-	}
-	else {
-		m_htmlText = key->renderedText();
-	}
-
-	return 1;
-}
-
-/** Generates code to display the given modules side by side. */
-char CHTMLEntryDisplay::Display( QList<CSwordModuleInfo>* moduleList) {
-//	qDebug("CHTMLEntryDisplay::Display( QList<CSwordModuleInfo>* moduleList)");
-	if (!moduleList || (moduleList && !moduleList->count()) ) {
-		m_htmlText = QString::null;
-		return 0;
-	}
-	//reload font settings
-	updateSettings();
-
- 	util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(moduleList->first()) );
-	  	
-	SWModule* module = moduleList->first()->module();
-//	ASSERT(module);
-	QString usedKey = QString::null;
-	CSwordModuleInfo *d = 0;	
-	
-	SWModule *m= (d = moduleList->first()) ? d->module() : 0;
-	SWKey* sw = (SWKey*)(*module);
-	key->key(*sw);	
-	usedKey = key->key();
- 	m = (d = moduleList->first()) ? d->module() : 0;	
- 	while (m) {
-   	m = (d=moduleList->next()) ? d->module() : 0;
-   	if (m) {
-			m->SetKey( (const char*)usedKey.local8Bit() );
-   		d->snap();			
-		}
- 	}	
-
-	const int width=(int)((double)100/(double)moduleList->count());
-	m_htmlText = m_htmlHeader + QString::fromLatin1("<TABLE cellpadding=\"2\" cellspacing=\"0\"><TR>"); 	
-	m_htmlText.append(QString("<font face=\"%1\" size=\"%2\" color=\"%3\">")
-		.arg(m_standardFontName).arg(m_standardFontSize).arg(m_standardFontColorName));
-	
-	m = (d = moduleList->first()) ? d->module() : 0;		
-	while (m) {
-		key->module(d);
-    if (m){
-    	m_htmlText.append(QString("<td width=\"%1\" bgcolor=\"#f1f1f1\"><b>%2 ")
-				.arg(width).arg(d->name()));
-			m_htmlText.append(QString("(<font color=\"%1\" face=\"%2\" size=\"%3\">%4</font>)</b></td>")
-				.arg(m_highlightedVerseColorName)
-        .arg((d && d->isUnicode() ) ? m_unicodeFontName : m_standardFontName)
-	  		.arg((d && d->isUnicode() ) ? m_unicodeFontSize : m_standardFontSize)
-     		.arg(key->key())
-			);
-		}
-		m = (d=moduleList->next()) ? d->module() : 0;			
-	}
-	m_htmlText.append(QString::fromLatin1("</TR>"));
-			
-	m = (d = moduleList->first()) ? d->module() : 0;
-	m_htmlText += QString::fromLatin1("<TR>");
-	while (m) {
-		key->module(d);
-		key->key(usedKey);
-		
-		m_htmlText +=
-			QString::fromLatin1("<td width=\"%1%\"><FONT face =\"%2\" size=\"%3\">%4</font></td>")
-				.arg(width)
-				.arg((d && d->isUnicode() ) ? m_unicodeFontName : m_standardFontName)
-				.arg((d && d->isUnicode() ) ? m_unicodeFontSize : m_standardFontSize)
-				.arg(key->renderedText());
-		m = (d = moduleList->next()) ? d->module() : 0;		
-	}
-	m_htmlText += QString::fromLatin1("</font></tr></table>") + m_htmlBody;
-
-	//clean up
-//	delete key;	
-	return 1;
-}
diff --git a/bibletime/backend/chtmlentrydisplay.h b/bibletime/backend/chtmlentrydisplay.h
deleted file mode 100644
index 1adc285..0000000
--- a/bibletime/backend/chtmlentrydisplay.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/***************************************************************************
-                          chtmlentrydisplay.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 CHTMLENTRYDISPLAY_H
-#define CHTMLENTRYDISPLAY_H
-
-//BibleTime includes
-
-//Qt includes
-#include <qstring.h>
-#include <qlist.h>
-#include <qfont.h>
-
-//Sword includes
-#include <swdisp.h>
-#include <swmodule.h>
-
-#include "cswordbackend.h"
-
-
-class CHTMLChapterDisplay;
-class CSwordModuleInfo;
-
-/**	
-	* The display class for entry based modules.
-  *	@author The BibleTime team
-  * @version $Id: chtmlentrydisplay.h,v 1.12 2002/03/20 15:08:44 joachim Exp $
-  */
-class CHTMLEntryDisplay : public SWDisplay  {
-public:
-	/**
-	* The constructor of CHTMLEntryDisplay.
-	* This is the constructor of CHTMLEntryDisplay. It initializes the members
-	* and creates the objects we need to create the required HTML formatted text.
-	*/
-	CHTMLEntryDisplay();
-	virtual ~CHTMLEntryDisplay();
-  /**
-  * Renders the current entry of the module using HTML tags.
-  * The rendered text is cached so it's faster if it's called for the
-  * same key next time.
-  */
-  virtual char Display(CSwordModuleInfo* module);
-  /**
-  * Generates code to display the given modules side by side.
-  */
-  virtual char Display( QList<CSwordModuleInfo>* moduleList);
-  /**
-  * This function returns the last looked up HTML text.
-  */
-  const QString getHTML() const;  	
-  /**
-  * Call this with false as argument to switch off the headers (module anme and current position)
-  */
-  void setIncludeHeader( const bool includeHeader );
-  void setDisplayOptions( const CSwordBackend::DisplayOptionsBool options);
-
-protected:
-	bool m_includeHeader;
-
-	QString m_htmlText;
-	QString m_htmlHeader;
-	QString m_htmlBody;
-
-	QString m_highlightedVerseColorName;
-	QString m_standardFontColorName;
-	QString m_swordRefColorName;
-
-
-  QString m_standardFontName;
-	QString m_unicodeFontName;
-  int 		m_standardFontSize;
-  int 		m_unicodeFontSize;
-
-	void updateSettings(void);
-
-	CSwordBackend::DisplayOptionsBool m_displayOptionsBool;
-};
-
-/** Returns the generated HTML text. */
-inline void CHTMLEntryDisplay::setDisplayOptions(const CSwordBackend::DisplayOptionsBool options){
-  m_displayOptionsBool = options;	
-}
-
-
-/** Returns the generated HTML text. */
-inline const QString CHTMLEntryDisplay::getHTML() const {
-	return m_htmlText;
-}
-
-/** Call this with false as argument to switch off the headers (module anme and current position) */
-inline void CHTMLEntryDisplay::setIncludeHeader( const bool includeHeader ){
-	m_includeHeader = includeHeader;
-}
-
-#endif
diff --git a/bibletime/backend/clanguagemgr.cpp b/bibletime/backend/clanguagemgr.cpp
new file mode 100644
index 0000000..05f5e85
--- /dev/null
+++ b/bibletime/backend/clanguagemgr.cpp
@@ -0,0 +1,424 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..4e070e2
--- /dev/null
+++ b/bibletime/backend/clanguagemgr.h
@@ -0,0 +1,88 @@
+/***************************************************************************
+                          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
index 9927cc6..675f9fd 100644
--- a/bibletime/backend/creferencemanager.cpp
+++ b/bibletime/backend/creferencemanager.cpp
@@ -20,8 +20,11 @@
 
 #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& module, const QString& key, const CReferenceManager::Type& type){
+const QString CReferenceManager::encodeHyperlink( const QString& moduleName, const QString& key, const CReferenceManager::Type& type){
 	QString ret = QString::null;
 	switch (type) {
 		case Bible:				
@@ -52,8 +55,9 @@ const QString CReferenceManager::encodeHyperlink( const QString& module, const Q
 			break;
 	}
 
-	if (!module.isEmpty())
-		ret += module + QString::fromLatin1("/");
+	if (!moduleName.isEmpty()) {
+		ret += moduleName + QString::fromLatin1("/");
+  }
 	else { //if module is empty use fallback module
 		ret += preferredModule(type) + QString::fromLatin1("/");
 	}	
@@ -62,17 +66,35 @@ const QString CReferenceManager::encodeHyperlink( const QString& module, const Q
 		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 divider!
+	  // 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) {
-			if (s[i] == '/')
+      c = s.at(i);
+			if (c == '/') {
 				newKey += "\\/";
-			else
-				newKey += s[i];
+      }
+			else {
+				newKey += c;
+      }
 		}
 		ret += newKey;		
 	}
 	else { //slashes do not appear in verses and dictionary entries
-		ret += key;
+   	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;
 }
@@ -88,7 +110,7 @@ const bool CReferenceManager::decodeHyperlink( const QString& hyperlink, QString
 	type = Unknown; //not yet known
 	QString ref = hyperlink;
 	//remove the trailing slash
-	if (ref.right(1)=="/")
+	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)
@@ -111,18 +133,26 @@ const bool CReferenceManager::decodeHyperlink( const QString& hyperlink, QString
 			ref = ref.mid(5); //inclusive trailing slash
 		}		
 		// string up to next slash is the modulename
-		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;
-			}
-		}
-		// the rest is the key
-		key = ref;
-		//replace \/ escapes with /
-		key.replace(QRegExp("\\\\/"), "/");
+		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};
@@ -217,7 +247,7 @@ const QString CReferenceManager::preferredModule( const CReferenceManager::Type
 			description = CBTConfig::get( CBTConfig::standardGreekMorphLexicon );
 			break;			
 		default:
-			qWarning("unknwon type");
+//			qWarning("unknwon type");
 			description = QString::null;
 			break;			
 	}
@@ -236,6 +266,8 @@ CReferenceManager::Type CReferenceManager::typeFromModule( const CSwordModuleInf
 			return CReferenceManager::Commentary;
 		case CSwordModuleInfo::Lexicon:
 			return CReferenceManager::Lexicon;
+    case CSwordModuleInfo::GenericBook:
+      return CReferenceManager::GenericBook;
 		default:
 			return CReferenceManager::Unknown;
 	}
@@ -244,12 +276,14 @@ CReferenceManager::Type CReferenceManager::typeFromModule( const CSwordModuleInf
 /** 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())
+	if (!lang.isEmpty()) {
 		key.setLocale( lang.latin1() );
+  }
 	
 	key.key(ref);
 	
-	if (!lang.isEmpty() && lang != newLang)
+	if (!lang.isEmpty() && lang != newLang) {
 		key.setLocale(newLang.latin1());
+  }
 	return key.key();
 }
diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp
index 1686cd8..f355006 100644
--- a/bibletime/backend/cswordbackend.cpp
+++ b/bibletime/backend/cswordbackend.cpp
@@ -17,21 +17,22 @@
 
 //BibleTime includes
 #include "cswordbackend.h"
-#include "chtmlentrydisplay.h"
-#include "chtmlchapterdisplay.h"
-#include "chtmlbookdisplay.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>
@@ -46,11 +47,13 @@
 #include <filemgr.h>
 #include <utilstr.h>
 
+using std::string;
+
 //static class-wide members
 static QMap<QString, QString> moduleDescriptionMap;
 
 CSwordBackend::CSwordBackend()
-	: SWMgr(0,0,false,new EncodingFilterMgr( ENC_UTF8 ))
+	: sword::SWMgr(0, 0, false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ))
 {	
 	m_displays.entry = 0;
 	m_displays.chapter = 0;
@@ -58,89 +61,126 @@ CSwordBackend::CSwordBackend()
 
 	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();	
+	shutdownModules();
 	delete m_filters.gbf;
-	delete m_filters.plain;	
-	delete m_filters.thml;	
+	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;
 
-	ModMap::iterator it;
-	SWModule*	curMod = 0;
-	CSwordModuleInfo* newModule = 0;
-		 	
  	shutdownModules(); //remove previous modules
  	m_moduleList.clear();	
 
 	ret = LoadError( Load() );
-	
-	for (it = Modules.begin(); it != Modules.end(); it++) {
-		curMod = (*it).second;
+	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);
-			newModule->module()->Disp(m_displays.chapter ? m_displays.chapter : (m_displays.chapter = new CHTMLChapterDisplay));
+			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);
-			newModule->module()->Disp(m_displays.entry ? m_displays.entry : (m_displays.entry = new CHTMLEntryDisplay));
+			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);
-			newModule->module()->Disp(m_displays.entry ? m_displays.entry : (m_displays.entry = new CHTMLEntryDisplay));
+			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);
-			newModule->module()->Disp(m_displays.book ? m_displays.book : (m_displays.book = new CHTMLBookDisplay));
+			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
+		
+		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(SWModule *module, ConfigEntMap &section) {
-	string sourceformat;
-	string moduleDriver;
-	ConfigEntMap::iterator entry;
+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 : (string) "";
-	moduleDriver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (string) "";
+	sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (sword::SWBuf) "";
+	moduleDriver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (sword::SWBuf) "";
 
-	if (!stricmp(sourceformat.c_str(), "GBF")) {
+	if (sourceformat == "GBF") {
 		if (!m_filters.gbf)
 			m_filters.gbf = new BT_GBFHTML();
 		module->AddRenderFilter(m_filters.gbf);
 		noDriver = false;
 	}
 
-	if (!stricmp(sourceformat.c_str(), "PLAIN")) {
+	if (sourceformat == "PLAIN") {
 		if (!m_filters.plain)
-			m_filters.plain = new PLAINHTML();	
+			m_filters.plain = new sword::PLAINHTML();	
 		module->AddRenderFilter(m_filters.plain);
 		noDriver = false;
 	}
 
-	if (!stricmp(sourceformat.c_str(), "ThML")) {
+	if (sourceformat == "ThML") {
 		if (!m_filters.thml)
 			m_filters.thml = new BT_ThMLHTML();
 		module->AddRenderFilter(m_filters.thml);
 		noDriver = false;
 	}
 
-	if (noDriver){
-		if (!stricmp(moduleDriver.c_str(), "RawCom") || !stricmp(moduleDriver.c_str(), "RawLD")) {
+	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 PLAINHTML();
+				m_filters.plain = new sword::PLAINHTML();
 			module->AddRenderFilter(m_filters.plain);
 			noDriver = false;
 		}
@@ -150,37 +190,61 @@ void CSwordBackend::AddRenderFilters(SWModule *module, ConfigEntMap &section) {
 /** This function deinitializes the modules and deletes them. */
 const bool CSwordBackend::shutdownModules(){
 	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) {
-		if (m_moduleList.current()) {
-			CSwordModuleInfo* current = m_moduleList.current();
-			m_moduleList.removeRef(current);
-			delete current;
-		}		
+		CSwordModuleInfo* current = m_moduleList.current();
+    m_moduleList.removeRef(current);
+		delete current;
 	}
-	m_moduleList.clear();	
+	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::FilterOptions type) {
+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::FilterOptions type, const bool enable){
-	string value;
+void CSwordBackend::setOption( const CSwordBackend::FilterTypes type, const int state ){
+  sword::SWBuf value;
 	switch (type) {
 		case textualVariants:
-			value = enable ? "Secondary Reading" : "Primary Reading";
-			//if on, user alternaticve (secondary) reading
+      if (state == 0) {
+        value = "Primary Reading";
+			}
+      else if (state == 1) {
+        value = "Secondary Reading";
+			}
+      else {
+        value = "All Readings";
+			}
 			break;
-		default:		
-			value = enable ? "On": "Off";
+
+		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;
 	};
-	setGlobalOption(optionName(type).latin1(), value.c_str());
+	if (value.length())
+    setGlobalOption(optionName(type).latin1(), value.c_str());
 }
 
-void CSwordBackend::setFilterOptions( const CSwordBackend::FilterOptionsBool options){
+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 );
@@ -188,15 +252,20 @@ void CSwordBackend::setFilterOptions( const CSwordBackend::FilterOptionsBool opt
 	setOption( lemmas, 							options.lemmas );
 	setOption( hebrewPoints, 				options.hebrewPoints );
 	setOption( hebrewCantillation, 	options.hebrewCantillation );
-	setOption( greekAccents, 				options.greekAccents);
-	setOption( textualVariants,			options.textualVariants);	
+	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::DisplayOptionsBool options){
+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 */
@@ -210,23 +279,49 @@ CSwordModuleInfo* const CSwordBackend::findModuleByDescription(const QString& de
 
 /** This function searches for a module with the specified description */
 const QString CSwordBackend::findModuleNameByDescription(const QString& description){
-	if (moduleDescriptionMap.contains(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 )
+  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, SWConfig& moduleConfig) {
-	SectionMap::iterator section;
+const bool CSwordBackend::moduleConfig(const QString& module, sword::SWConfig& moduleConfig) {
+	sword::SectionMap::iterator section;
 	DIR *dir = opendir(configPath);
 	struct dirent *ent;
 	
@@ -239,7 +334,7 @@ const bool CSwordBackend::moduleConfig(const QString& module, SWConfig& moduleCo
 				modFile = QString::fromLocal8Bit(configPath);
 				modFile += QString::fromLatin1("/");
 				modFile += QString::fromLocal8Bit(ent->d_name);
-				moduleConfig = SWConfig( (const char*)modFile.local8Bit() );
+				moduleConfig = sword::SWConfig( (const char*)modFile.local8Bit() );
 				section =	moduleConfig.Sections.find( (const char*)module.local8Bit() );
 				foundConfig = ( section != moduleConfig.Sections.end() );
 			}
@@ -248,14 +343,14 @@ const bool CSwordBackend::moduleConfig(const QString& module, SWConfig& moduleCo
 	}
 	else { //try to read mods.conf
 		//moduleConfig = SWConfig( configPath + "/mods.conf" );
-		moduleConfig = SWConfig("");//global config		
+		moduleConfig = sword::SWConfig("");//global config		
 		section =	config->Sections.find( (const char*)module.local8Bit() );		
 		foundConfig = ( section != config->Sections.end() );		
 		
-		ConfigEntMap::iterator entry;
+		sword::ConfigEntMap::iterator entry;
 		if (foundConfig) { //copy module section
 			for (entry = (*section).second.begin(); entry != (*section).second.end(); entry++) {
-					moduleConfig.Sections[(*section).first].insert(ConfigEntMap::value_type((*entry).first, (*entry).second));
+					moduleConfig.Sections[(*section).first].insert(sword::ConfigEntMap::value_type((*entry).first, (*entry).second));
 			}
 		}			
 	}
@@ -270,7 +365,7 @@ const bool CSwordBackend::moduleConfig(const QString& module, SWConfig& moduleCo
 					modFile = myPath;
 					modFile += "/";
 					modFile += ent->d_name;
-					moduleConfig = SWConfig( (const char*)modFile.local8Bit() );
+					moduleConfig = sword::SWConfig( (const char*)modFile.local8Bit() );
 					section =	moduleConfig.Sections.find( (const char*)module.local8Bit() );
 					foundConfig = ( section != moduleConfig.Sections.end() );
 				}
@@ -282,7 +377,7 @@ const bool CSwordBackend::moduleConfig(const QString& module, SWConfig& moduleCo
 }
 
 /** Returns the text used for the option given as parameter. */
-const QString CSwordBackend::optionName( const CSwordBackend::FilterOptions option ){
+const QString CSwordBackend::optionName( const CSwordBackend::FilterTypes option ){
 	switch (option) {
 		case CSwordBackend::footnotes:
 			return QString::fromLatin1("Footnotes");
@@ -300,14 +395,20 @@ const QString CSwordBackend::optionName( const CSwordBackend::FilterOptions opti
 			return QString::fromLatin1("Hebrew Cantillation");
 		case CSwordBackend::greekAccents:
 			return QString::fromLatin1("Greek Accents");
-		case CSwordBackend::textualVariants:
-			return QString::fromLatin1("Textual Variants");			
+		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::FilterOptions option){
+const QString CSwordBackend::translatedOptionName(const CSwordBackend::FilterTypes option){
 	switch (option) {
 		case CSwordBackend::footnotes:
 			return i18n("Footnotes");
@@ -325,17 +426,23 @@ const QString CSwordBackend::translatedOptionName(const CSwordBackend::FilterOpt
 			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");			
+			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::FilterOptions option ){
+const QString CSwordBackend::configOptionName( const CSwordBackend::FilterTypes option ){
 	switch (option) {
 		case CSwordBackend::footnotes:
-			return QString::fromLatin1("Footnotes");
+			return QString::fromLatin1("Footnotes");         
 		case CSwordBackend::strongNumbers:
 			return QString::fromLatin1("Strongs");
 		case CSwordBackend::headings:
@@ -350,19 +457,92 @@ const QString CSwordBackend::configOptionName( const CSwordBackend::FilterOption
 			return QString::fromLatin1("Cantillation");
 		case CSwordBackend::greekAccents:
 			return QString::fromLatin1("GreekAccents");
+		case CSwordBackend::redLetterWords:
+			return QString::fromLatin1("RedLetterWords");
 		case CSwordBackend::textualVariants:
-			return QString::fromLatin1("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())
-		LocaleMgr::systemLocaleMgr.setDefaultLocaleName( language.local8Bit() );
-	return QString::fromLatin1(LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
+		sword::LocaleMgr::systemLocaleMgr.setDefaultLocaleName( language.local8Bit() );
+	return QString::fromLatin1(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
 }
 
 /** Returns the version of the Sword library. */
-const SWVersion CSwordBackend::Version() {
-	return SWVersion::currentVersion;
+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
index 2ce5531..83bfd0a 100644
--- a/bibletime/backend/cswordbackend.h
+++ b/bibletime/backend/cswordbackend.h
@@ -19,9 +19,10 @@
 #define CSWORDBACKEND_H
 
 //BibleTime includes
+//#include "cswordmoduleinfo.h"
 
 //Qt includes
-#include <qlist.h>
+#include <qptrlist.h>
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
@@ -32,12 +33,12 @@
 #include <swversion.h>
 #include <localemgr.h>
 
-class CHTMLEntryDisplay;
-class CHTMLChapterDisplay;
-class CHTMLBookDisplay;
+class CEntryDisplay;
+class CChapterDisplay;
+class CBookDisplay;
 
 class CSwordModuleInfo;
-typedef QList<CSwordModuleInfo>	ListCSwordModuleInfo;
+typedef QPtrList<CSwordModuleInfo>	ListCSwordModuleInfo;
 
 /**
 	* This is the implementation of CBackend for Sword. It's additionally derived from SWMgr
@@ -45,15 +46,15 @@ typedef QList<CSwordModuleInfo>	ListCSwordModuleInfo;
   *
   *	@short The backend implementation of Sword
   *	@author The BibleTime team
-  * @version $Id: cswordbackend.h,v 1.22 2002/03/20 15:08:44 joachim Exp $
+  * @version $Id: cswordbackend.h,v 1.37 2003/10/02 20:37:41 joachim Exp $
   */
-class CSwordBackend : public SWMgr {
+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 FilterOptions {
+  enum FilterTypes {
   	footnotes,
   	strongNumbers,
   	headings,
@@ -62,25 +63,33 @@ public:
 		hebrewPoints,
 		hebrewCantillation,
 		greekAccents,
-		textualVariants,
-		filterOptionsMIN = footnotes,
-		filterOptionsMAX = textualVariants
+    scriptureReferences,
+    redLetterWords,
+    textualVariants,
+		filterTypesMIN = footnotes,
+		filterTypesMAX = textualVariants,
+
+    /* The following are handled in a special way */
+    transliteration
 	};
 
-  struct FilterOptionsBool {
-  	bool footnotes;
-  	bool strongNumbers;
-  	bool headings;
-  	bool morphTags;
-		bool lemmas;
-		bool hebrewPoints;
-		bool hebrewCantillation;
-		bool greekAccents;
-		bool textualVariants;
+  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 DisplayOptionsBool {
-		bool lineBreaks;
-		bool verseNumbers;
+	struct DisplayOptions {
+		int lineBreaks;
+		int verseNumbers;
 	};
   enum LoadError { // the values exist to cast from the char return of SWMgr::Load
 		NoSwordConfig = -1,
@@ -93,6 +102,8 @@ public:
 	* filters for the module format.
 	*/
 	CSwordBackend();
+	CSwordBackend( const QString& path );
+  
 	/**
 	* The destrctor of this backend. This function shuts the modules down using @ref shutdownModules.
 	*/
@@ -122,15 +133,15 @@ public:
   * @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::FilterOptions type, const bool enable);
-  void setFilterOptions( const CSwordBackend::FilterOptionsBool options);
-  void setDisplayOptions( const CSwordBackend::DisplayOptionsBool options);
+  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::FilterOptions type);
+  virtual const bool isOptionEnabled( const CSwordBackend::FilterTypes type);
   /**
   * Sets the language for the international booknames of Sword.
   */
@@ -154,51 +165,74 @@ public:
   */
   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.
 	*/
-  SWConfig* const getConfig() const;
+  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, SWConfig& moduleConfig);
+  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::FilterOptions option);
+  static const QString optionName( const CSwordBackend::FilterTypes option);
   /**
   * Returns the text used for the option given as parameter.
   */
-  static const QString configOptionName( const CSwordBackend::FilterOptions option);
+  static const QString configOptionName( const CSwordBackend::FilterTypes option);
   /**
 	* Returns the translated name of the option given as parameter.
 	*/
-  static const QString translatedOptionName(const CSwordBackend::FilterOptions option);
+  static const QString translatedOptionName(const CSwordBackend::FilterTypes option);
   /**
   * Returns the version of the Sword library.
   */
-  virtual const SWVersion Version();
+  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(SWModule *module, ConfigEntMap &section);
+	virtual void AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap &section);
 	
 private:
 	//filters
 	struct {
-		SWFilter *gbf;
-		SWFilter *plain;
-		SWFilter *thml;		
+		sword::SWFilter *gbf;
+		sword::SWFilter *plain;
+		sword::SWFilter *thml;
+ 		sword::SWFilter *osis;
 	} m_filters;
 	ListCSwordModuleInfo m_moduleList;
 
 	struct {
-		CHTMLChapterDisplay* 	chapter;
-		CHTMLEntryDisplay* 		entry;
-		CHTMLBookDisplay* 		book;
+		CChapterDisplay* 	chapter;
+		CEntryDisplay* 		entry;
+		CBookDisplay* 		book;
 	} m_displays;
 };
 
@@ -208,7 +242,7 @@ inline ListCSwordModuleInfo& CSwordBackend::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 SWConfig* const CSwordBackend::getConfig() const {
+inline sword::SWConfig* const CSwordBackend::getConfig() const {
 	return config;
 }
 
diff --git a/bibletime/backend/cswordbiblemoduleinfo.cpp b/bibletime/backend/cswordbiblemoduleinfo.cpp
index a8ff152..7172d1f 100644
--- a/bibletime/backend/cswordbiblemoduleinfo.cpp
+++ b/bibletime/backend/cswordbiblemoduleinfo.cpp
@@ -25,23 +25,34 @@
 //Sword includes
 #include <versekey.h>
 
-static VerseKey staticKey;
+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( SWModule* module )
-	: CSwordModuleInfo(module) {
-	m_bookList = 0;
-	m_cachedLocale = "unknown";
-	m_hasOT = m_hasNT = -1;
 }
 
-CSwordBibleModuleInfo::CSwordBibleModuleInfo( const CSwordBibleModuleInfo& m ) : CSwordModuleInfo(m) {
+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;	
+	m_cachedLocale = m.m_cachedLocale;
 }
 
 CSwordModuleInfo* CSwordBibleModuleInfo::clone(){
@@ -52,48 +63,65 @@ 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* CSwordBibleModuleInfo::books() {
+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();	
-		if (m_hasOT == -1)
-			m_hasOT = hasTestament(OldTestament);
-		if (m_hasNT == -1)
-			m_hasNT = hasTestament(NewTestament);
-			
-		int min = 0;				
+		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) {
+		if (m_hasOT>0 && m_hasNT>0) { //both
 			min = 0;
 			max = 1;
 		}
-		else if (m_hasOT>0 && !m_hasNT) {
+		else if (m_hasOT>0 && !m_hasNT) { //only OT
 			min = 0;
 			max = 0;
 		}
-		else if (!m_hasOT && m_hasNT>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 not NT
-			qWarning("CSwordBibleModuleInfo (%s) no OT and not NT! Check config.", module()->Name());
+		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;			
+			max = -1;
 		}
 
-		staticKey.setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
+		staticKey.setLocale(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
 		for (int i = min; i <= max; ++i) {
 			for ( int j = 0; j < staticKey.BMAX[i]; ++j) {
-				m_bookList->append( QString::fromLocal8Bit(staticKey.books[i][j].name) );
+//			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();		
+		m_cachedLocale = backend()->booknameLanguage();
 	}
 	return m_bookList;
 }
@@ -101,36 +129,49 @@ QStringList* CSwordBibleModuleInfo::books() {
 /** 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);
-	}
+ 	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];
-	}
+
+ 	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(LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
+	staticKey.setLocale(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
 	int min = 0;
-	int max = 1;	
+	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;
@@ -139,42 +180,44 @@ const unsigned int CSwordBibleModuleInfo::bookNumber(const QString &book){
 	else if (m_hasOT>0 && !m_hasNT) {
 		min = 0;
 		max = 0;
-		bookNumber = 0;		
+		bookNumber = 0;
 	}
 	else if (!m_hasOT && m_hasNT>0) {
 		min = 1;
 		max = 1;
-		bookNumber = staticKey.BMAX[0];		
+		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() = TOP; //position to first entry
-		VerseKey key( module()->KeyText() );
+  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() = BOTTOM;
+
+		*module() = sword::BOTTOM;
 		key = module()->KeyText();
 		if (key.Testament() == 1) { // only OT, no NT
 			m_hasNT = 0;
@@ -182,14 +225,28 @@ const bool CSwordBibleModuleInfo::hasTestament( CSwordBibleModuleInfo::Testament
 		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;		
+			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
index 4209af4..0067def 100644
--- a/bibletime/backend/cswordbiblemoduleinfo.h
+++ b/bibletime/backend/cswordbiblemoduleinfo.h
@@ -20,6 +20,7 @@
 
 //own includes
 #include "cswordmoduleinfo.h"
+#include "cswordversekey.h"
 
 //Qt includes
 #include <qstringlist.h>
@@ -32,19 +33,19 @@
 	*	
 	*	@short Implementation for Sword Bibles
   *	@author The BibleTime team
-  * @version $Id: cswordbiblemoduleinfo.h,v 1.5 2002/03/15 20:48:00 joachim Exp $
+  * @version $Id: cswordbiblemoduleinfo.h,v 1.12 2004/01/29 00:36:48 joachim Exp $
   */
 class CSwordBibleModuleInfo : public CSwordModuleInfo  {
-public:	
+public:
 	enum Testament {
 		OldTestament = 1,
 		NewTestament = 2
 	};
-		
+
 	/**
 	* The constructor of this class
 	*/
-	CSwordBibleModuleInfo( SWModule* module  );
+	CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend()  );
 	CSwordBibleModuleInfo( const CSwordBibleModuleInfo& m );
 	/**
 	* The destructor of this class
@@ -58,15 +59,21 @@ public:
  	* @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* books();
+  virtual QStringList* const books();
   /**
   * Reimplementation, Returns the type
   */
@@ -80,9 +87,22 @@ public:
   */
   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:
-	QStringList*	m_bookList;	//This booklist is cached
+	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;
diff --git a/bibletime/backend/cswordbookmoduleinfo.cpp b/bibletime/backend/cswordbookmoduleinfo.cpp
index a769657..ad4d13d 100644
--- a/bibletime/backend/cswordbookmoduleinfo.cpp
+++ b/bibletime/backend/cswordbookmoduleinfo.cpp
@@ -14,28 +14,25 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <iostream.h>
 
 //BibleTime includes
 #include "cswordbookmoduleinfo.h"
+#include "cswordtreekey.h"
 
 //Sword includes
 #include <treekeyidx.h>
 #include <treekey.h>
 
-CSwordBookModuleInfo::CSwordBookModuleInfo( SWModule* module )
-	: CSwordModuleInfo(module), m_depth(-1)
+#include <iostream>
+#include <string>
+using std::cout;
+using std::endl;
+
+CSwordBookModuleInfo::CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend ) 
+	: CSwordModuleInfo(module, usedBackend),
+		m_depth(-1) 
 {
-	//checking if it works as expected
-//	qWarning("Book module: %s", module->Name());
-//	if (TreeKeyIdx* treeKey = tree()) {
-//		TreeKeyIdx root = *treeKey;
-//  	root.root();
-//		printTree(root, treeKey, 0);
-//	}
-//	else
-//		qWarning("treeKey not valid");
-//	qWarning("%s has depth: %i\n\n", module->Name(), depth());
+
 }
 
 CSwordBookModuleInfo::CSwordBookModuleInfo( const CSwordBookModuleInfo& module )
@@ -47,54 +44,38 @@ CSwordBookModuleInfo::CSwordBookModuleInfo( const CSwordBookModuleInfo& module )
 CSwordBookModuleInfo::~CSwordBookModuleInfo(){
 }
 
-void CSwordBookModuleInfo::printTree(TreeKeyIdx treeKey, TreeKeyIdx* target, int level ){
-	if (!target)
-		target = &treeKey;
-
-//  unsigned long currentOffset = target->getOffset();
-  for (int i = 0; i < level; i++)
-  	std::cout << "    ";
-  std::cout << treeKey.getLocalName() << std::endl;
-  if (treeKey.firstChild()) {
-    printTree(treeKey, target, level+1);
-    treeKey.parent();
-  }
-  if (treeKey.nextSibling())
-		printTree(treeKey, target, level);
-}
-
 const int CSwordBookModuleInfo::depth() {
 	if (m_depth == -1) {
-  	TreeKeyIdx* treeKey = tree();
-  	if (treeKey) {
-    	TreeKeyIdx root = *treeKey;
-    	root.root();
-			computeDepth(root, treeKey, 0);
+  	sword::TreeKeyIdx* key = tree();
+  	if (key) {
+    	key->root();
+			computeDepth(key, 0);
 		}
 	}
 	return m_depth;
 }
 
-void CSwordBookModuleInfo::computeDepth(TreeKeyIdx treeKey, TreeKeyIdx* target, int level ){
-	if (!target)
-		target = &treeKey;
-
-	if (level > m_depth)
+void CSwordBookModuleInfo::computeDepth(sword::TreeKeyIdx* key, int level ){
+  std::string savedKey;
+  savedKey = key->getFullName();
+  if (level > m_depth) {
 		m_depth = level;
-
-  if (treeKey.firstChild()) {
-    computeDepth(treeKey, target, level+1);
-    treeKey.parent();
   }
-  if (treeKey.nextSibling())
-		computeDepth(treeKey, target, 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 */
-TreeKeyIdx* const  CSwordBookModuleInfo::tree() const {
-	TreeKeyIdx* treeKey = dynamic_cast<TreeKeyIdx*>((SWKey*)*(module()));
-	if (treeKey)
-		return treeKey;
-	return 0;
+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
index c2b4560..0d65231 100644
--- a/bibletime/backend/cswordbookmoduleinfo.h
+++ b/bibletime/backend/cswordbookmoduleinfo.h
@@ -30,7 +30,7 @@
   */
 class CSwordBookModuleInfo : public CSwordModuleInfo  {
 public: 
-	CSwordBookModuleInfo( SWModule* module );
+	CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
 	CSwordBookModuleInfo( const CSwordBookModuleInfo& m );	
 	~CSwordBookModuleInfo();
   /**
@@ -38,20 +38,19 @@ public:
   */
   virtual const CSwordModuleInfo::ModuleType type() const;
   /**
-  * Used for debugging
-  */
-  void printTree(TreeKeyIdx treeKey, TreeKeyIdx* target, int level = 1 );
-  /**
   * 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.
   */
-  TreeKeyIdx* const tree() const;
+  sword::TreeKeyIdx* const tree() const;
 
 private:
-  void computeDepth(TreeKeyIdx treeKey, TreeKeyIdx* target, int level = 0 );	
+  /**
+  * A recursive helper function to help computng the module depth!
+  */
+  void computeDepth(sword::TreeKeyIdx* key, int level = 0 );	
 	int m_depth;
 };
 
diff --git a/bibletime/backend/cswordcommentarymoduleinfo.cpp b/bibletime/backend/cswordcommentarymoduleinfo.cpp
index 6832efa..54e2ad0 100644
--- a/bibletime/backend/cswordcommentarymoduleinfo.cpp
+++ b/bibletime/backend/cswordcommentarymoduleinfo.cpp
@@ -17,8 +17,12 @@
 
 #include "cswordcommentarymoduleinfo.h"
 
-CSwordCommentaryModuleInfo::CSwordCommentaryModuleInfo( SWModule* module)
-	:CSwordBibleModuleInfo(module) {	
+#include <string>
+
+CSwordCommentaryModuleInfo::CSwordCommentaryModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend)
+	: CSwordBibleModuleInfo(module, usedBackend) 
+{	
+
 }
 
 CSwordCommentaryModuleInfo::~CSwordCommentaryModuleInfo(){
@@ -29,3 +33,13 @@ CSwordCommentaryModuleInfo::~CSwordCommentaryModuleInfo(){
 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
index 965fb6a..4af59aa 100644
--- a/bibletime/backend/cswordcommentarymoduleinfo.h
+++ b/bibletime/backend/cswordcommentarymoduleinfo.h
@@ -21,20 +21,20 @@
 //own includes
 #include "cswordbiblemoduleinfo.h"
 
-//Qt includes
-
-//Sword includes
-
 /**
   * @author The BibleTime team
-  * @version $Id: cswordcommentarymoduleinfo.h,v 1.3 2002/02/22 20:55:12 joachim Exp $
+  * @version $Id: cswordcommentarymoduleinfo.h,v 1.7 2004/01/29 00:36:48 joachim Exp $
   */
 class CSwordCommentaryModuleInfo : public CSwordBibleModuleInfo  {
 public:
-	CSwordCommentaryModuleInfo( SWModule* module );
+	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 */
diff --git a/bibletime/backend/cswordkey.cpp b/bibletime/backend/cswordkey.cpp
index 871c8b0..edbd6e6 100644
--- a/bibletime/backend/cswordkey.cpp
+++ b/bibletime/backend/cswordkey.cpp
@@ -39,52 +39,90 @@ CSwordKey::CSwordKey(const CSwordKey& k) {
 	m_module = k.m_module;
 }
 
-CSwordModuleInfo* CSwordKey::module(CSwordModuleInfo* newModule) {
+CSwordModuleInfo* const CSwordKey::module(CSwordModuleInfo* const newModule) {
 	if (newModule)
 		m_module = newModule;
 	return m_module;
 }
 
-const QString CSwordKey::renderedText() {
-	if (!m_module)
-		return QString::null;		
-	if (SWKey* k = dynamic_cast<SWKey*>(this)) {
-		m_module->module()->SetKey(k);		
+const QString CSwordKey::rawText() {
+  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()->RenderText());
+  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() {
-	if (!m_module)
+//	qWarning("const QString CSwordKey::strippedText()");
+  if (!m_module)
 		return QString::null;
-	SWKey* k = dynamic_cast<SWKey*>(this);
-	if (k)
+	if (sword::SWKey* k = dynamic_cast<sword::SWKey*>(this)) {
 		m_module->module()->SetKey(k);
-	return QString::fromUtf8(m_module->module()->StripText());	
+  }
+	return QString::fromUtf8(m_module->module()->StripText());
 }
 
 /** This will create a proper key object from a given module */
-CSwordKey* CSwordKey::createInstance( CSwordModuleInfo *module ){
+CSwordKey* CSwordKey::createInstance( CSwordModuleInfo* const module ){
 	if (!module)
 		return 0;
-		
+
 	switch( module->type() ){
-		case CSwordModuleInfo::Bible:
+		case CSwordModuleInfo::Bible://fall through
 		case CSwordModuleInfo::Commentary:
-		{
-			CSwordVerseKey* key = new CSwordVerseKey( (VerseKey *) ( (SWKey *)(*module->module()) ), module );
-			return key;
-		}
+			return new CSwordVerseKey( (sword::VerseKey *) ( (sword::SWKey *)(*module->module()) ), module );
 		case CSwordModuleInfo::Lexicon:
-		{
-			CSwordLDKey* key = new CSwordLDKey( (SWKey *)(*module->module()), module);
-			return key;
-		}
-		case CSwordModuleInfo::GenericBook: {
-			CSwordTreeKey* key =  new CSwordTreeKey( (TreeKeyIdx*)((SWKey *)(*module->module())), module );
-			return key;
-		}
+			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
index a5ad99c..f5c774f 100644
--- a/bibletime/backend/cswordkey.h
+++ b/bibletime/backend/cswordkey.h
@@ -29,7 +29,7 @@ class CSwordModuleInfo;
 /**
  * The base class for all Sword based keys.
  * @author The BibleTime team
- * @version $Id: cswordkey.h,v 1.8 2002/03/09 11:07:14 joachim Exp $
+ * @version $Id: cswordkey.h,v 1.14 2003/01/02 18:42:19 joachim Exp $
  */
 class CSwordKey {
 
@@ -38,24 +38,36 @@ protected:
 	CSwordKey(const CSwordKey&); //copy constructor
 
 public:
+
+  enum TextRenderType {
+    Normal = 0,
+    HTMLEscaped
+  };
+
 	virtual ~CSwordKey() {};
 	
 	
 	//pure virtual functions		
-	virtual const QString key(const QString& = QString::null) = 0;
+	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* module(CSwordModuleInfo* newModule = 0);
-	virtual const QString renderedText();
+	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 *module);
+  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
diff --git a/bibletime/backend/cswordldkey.cpp b/bibletime/backend/cswordldkey.cpp
index f9c5582..5522a8d 100644
--- a/bibletime/backend/cswordldkey.cpp
+++ b/bibletime/backend/cswordldkey.cpp
@@ -28,30 +28,27 @@
 
 
 CSwordLDKey::CSwordLDKey( CSwordModuleInfo* module ) {
-	m_module = dynamic_cast<CSwordLexiconModuleInfo*>(module);
-	if (m_module)
-		SWKey::operator = (m_module->module()->KeyText());
+	if ((m_module = dynamic_cast<CSwordLexiconModuleInfo*>(module))) {
+//    *(m_module->module()) = TOP;	
+  }
+  SWKey::operator = (" ");
 }
 
 /** No descriptions */
-CSwordLDKey::CSwordLDKey( const CSwordLDKey &k ) : SWKey((const char*)k), CSwordKey(k) {
+CSwordLDKey::CSwordLDKey( const CSwordLDKey &k ) : CSwordKey(k), SWKey((const char*)k) {
 }
 
 /** No descriptions */
-CSwordLDKey::CSwordLDKey( const SWKey *k, CSwordModuleInfo* module) : SWKey(*k), CSwordKey(module) {
-//	m_module = module;
+CSwordLDKey::CSwordLDKey( const SWKey *k, CSwordModuleInfo* module) : CSwordKey(module), SWKey(*k) {
 }
 
-//CSwordLDKey::~CSwordLDKey(){
-//}
-
 /** Clones this object by copying the members. */
 CSwordLDKey* CSwordLDKey::copy() const {
 	return new CSwordLDKey(*this);
 }
 
 /** Sets the module of this key. */
-CSwordModuleInfo* CSwordLDKey::module(CSwordModuleInfo* newModule){	
+CSwordModuleInfo* const CSwordLDKey::module(CSwordModuleInfo* const newModule){	
 	if (newModule && newModule->type() == CSwordModuleInfo::Lexicon) {
 		const QString oldKey = key();	
 		m_module = newModule;
@@ -61,20 +58,25 @@ CSwordModuleInfo* CSwordLDKey::module(CSwordModuleInfo* newModule){
 }
 
 /** Sets the key of this instance */
-const QString CSwordLDKey::key( const QString& newKey ){
-	if (!newKey.isNull()) {
-		SWKey::operator = ((const char*)newKey.local8Bit());		
-		m_module->module()->SetKey(this);
-		m_module->snap();
-		SWKey::operator = (m_module->module()->KeyText());
-	}
- 	return QString::fromLocal8Bit((const char*)*this);//don't use fromUtf8
+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()->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());	
 	
@@ -84,7 +86,9 @@ CSwordLDKey* CSwordLDKey::NextEntry(){
 /** 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() ) )--;
+  m_module->module()->setSkipConsecutiveLinks(true);
+  ( *( m_module->module() ) )--;
+  m_module->module()->setSkipConsecutiveLinks(false);
 	SWKey::operator = (m_module->module()->KeyText());	
 	
 	return this;
@@ -101,3 +105,8 @@ void CSwordLDKey::key( const char* newKey ){
 	}
 }
 
+/** 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
index 38ea007..951781b 100644
--- a/bibletime/backend/cswordldkey.h
+++ b/bibletime/backend/cswordldkey.h
@@ -53,10 +53,10 @@
 	* @endcode
 	*
   *	@author The BibleTime team
-  *	@version $Id: cswordldkey.h,v 1.8 2002/03/18 00:21:12 joachim Exp $
+  *	@version $Id: cswordldkey.h,v 1.13 2002/10/01 20:55:49 mgruner Exp $
   */
 
-class CSwordLDKey : public SWKey, public CSwordKey {
+class CSwordLDKey : public CSwordKey, public sword::SWKey {
 public: 
 	/**
 	* Constructor of CSwordLDKey
@@ -69,7 +69,7 @@ public:
 	/**
 	* Copy constructor for this key class.
 	*/
-	CSwordLDKey( const SWKey *k, CSwordModuleInfo* module);
+	CSwordLDKey( const sword::SWKey *k, CSwordModuleInfo* module);
 //	virtual ~CSwordLDKey();
   /**
   * Clones this object by copying the members.
@@ -86,15 +86,21 @@ public:
   /**
   * Sets the module of this key.
   */
-  virtual CSwordModuleInfo* module( CSwordModuleInfo* module = 0 );
+  virtual CSwordModuleInfo* const module( CSwordModuleInfo* const module = 0 );
   /**
   * Returns the current key as a QString
   */
-  virtual const QString key( const QString& newKey = QString::null);
+  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 );
 };
 
 
diff --git a/bibletime/backend/cswordlexiconmoduleinfo.cpp b/bibletime/backend/cswordlexiconmoduleinfo.cpp
index 666033c..26416c7 100644
--- a/bibletime/backend/cswordlexiconmoduleinfo.cpp
+++ b/bibletime/backend/cswordlexiconmoduleinfo.cpp
@@ -17,7 +17,7 @@
 
 //BibleTime includes
 #include "cswordlexiconmoduleinfo.h"
-#include "../frontend/cbtconfig.h"
+#include "frontend/cbtconfig.h"
 
 //Qt includes
 #include <qfile.h>
@@ -27,10 +27,13 @@
 #include <swmodule.h>
 
 #include <kglobal.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 
+//Change it once the format changed to make all
+//systems rebuild their caches
+#define CACHE_FORMAT "2"
 
-CSwordLexiconModuleInfo::CSwordLexiconModuleInfo( SWModule* module) : CSwordModuleInfo(module) {
+CSwordLexiconModuleInfo::CSwordLexiconModuleInfo( sword::SWModule* module, CSwordBackend* const backend ) : CSwordModuleInfo(module, backend) {
 	m_entryList = 0;
 }
 
@@ -51,12 +54,12 @@ CSwordLexiconModuleInfo::~CSwordLexiconModuleInfo(){
 
 /** Returns the entries of the module. */
 QStringList* const CSwordLexiconModuleInfo::entries(){
-	if (!module())
+	if (!module()) {
 		return 0;
+	}
 
-	if (!m_entryList) {
+  if (!m_entryList) {
 		m_entryList = new QStringList();
-
     const bool lexiconCache = CBTConfig::get(CBTConfig::lexiconCache);
 		bool read = false;
 
@@ -64,14 +67,15 @@ QStringList* const CSwordLexiconModuleInfo::entries(){
   		QFile f1(
   			QString::fromLatin1("%1/%2")
   				.arg(KGlobal::dirs()->saveLocation("data", "bibletime/cache/"))
-  				.arg( name() )
+  				.arg(name())
   		);
-  		
+
       if ( f1.open( IO_ReadOnly ) ){
         QDataStream s( &f1 );
-  			QString v;
-        s >> v;
-  			if (v == config(ModuleVersion) ) {
+  			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;
   			}
@@ -79,41 +83,52 @@ QStringList* const CSwordLexiconModuleInfo::entries(){
       }
 		}
 
-
-		if (!read){
-			(*module()) = TOP;  		
+    if (!read || !m_entryList->count()){
+      module()->setSkipConsecutiveLinks(true);
+			(*module()) = sword::TOP;
+      snap(); //snap to top entry
   		do {
-   			m_entryList->append(QString::fromLocal8Bit(module()->KeyText())); //UTF8, Latin1 or Local8Bit??
+        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());
-
-  		if (m_entryList->first().stripWhiteSpace().isEmpty())
-	  		m_entryList->remove( m_entryList->begin() );			
+  		} 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){
-  			// create cache
+			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);
+  				s << config(CSwordModuleInfo::ModuleVersion); //store module version
+					s << QString::fromLatin1(CACHE_FORMAT); //store BT version -- format may change
   				s << *m_entryList;
   			  f2.close();
         }
 			}
-			(*module()) = TOP;			
 		}
-	}	
+	}
 	return m_entryList;
 }
 
 /** Jumps to the closest entry in the module.  */
 const bool CSwordLexiconModuleInfo::snap(){
-	bool ret = false;
 	if(module()->getRawEntry()){	//snap to the current entry
-		ret = true;
+		return true;
 	}
-	return ret;
+	return false;
 }
 
 /** No descriptions */
diff --git a/bibletime/backend/cswordlexiconmoduleinfo.h b/bibletime/backend/cswordlexiconmoduleinfo.h
index b240f7c..c8caa22 100644
--- a/bibletime/backend/cswordlexiconmoduleinfo.h
+++ b/bibletime/backend/cswordlexiconmoduleinfo.h
@@ -27,7 +27,7 @@
 /**
 	* The implementation of CModuleInfo for the Sword lexiccons and citionaries.
   * @author The BibleTime team
-  * @version $Id: cswordlexiconmoduleinfo.h,v 1.5 2002/03/06 22:02:41 joachim Exp $
+  * @version $Id: cswordlexiconmoduleinfo.h,v 1.7 2004/01/29 00:36:48 joachim Exp $
   */
 class CSwordLexiconModuleInfo : public CSwordModuleInfo {
 public: 
@@ -35,7 +35,7 @@ public:
 	* The standard constructor fot this object.
 	* A default constructor doesn't exist. Use this one.
 	*/
-	CSwordLexiconModuleInfo( SWModule* module );
+	CSwordLexiconModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
 	/**
 	* The copy constructor
 	*/
diff --git a/bibletime/backend/cswordmoduleinfo.cpp b/bibletime/backend/cswordmoduleinfo.cpp
index f66c210..1474279 100644
--- a/bibletime/backend/cswordmoduleinfo.cpp
+++ b/bibletime/backend/cswordmoduleinfo.cpp
@@ -18,9 +18,10 @@
 //BibleTime includes
 #include "cswordmoduleinfo.h"
 #include "cswordbackend.h"
-#include "chtmlentrydisplay.h"
+#include "centrydisplay.h"
 #include "cswordmodulesearch.h"
 #include "cswordkey.h"
+#include "clanguagemgr.h"
 #include "util/scoped_resource.h"
 
 #include <sys/types.h>
@@ -30,8 +31,10 @@
 #include <regex.h>
 
 //Qt includes
+#include <qregexp.h>
 
 //Sword includes
+#include <swbuf.h>
 #include <swmodule.h>
 #include <swkey.h>
 #include <listkey.h>
@@ -39,14 +42,17 @@
 #include <swconfig.h>
 #include <rtfhtml.h>
 
-CSwordModuleInfo::CSwordModuleInfo( SWModule* module ) {
+using std::string;
+
+CSwordModuleInfo::CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend) {
 	m_module = module;
 	m_searchResult.ClearList();
-	m_dataCache.name = QString::fromLatin1(module->Name());
-	m_dataCache.isUnicode = m_module->isUnicode();
+  m_backend = usedBackend;
+	m_dataCache.name = module ? QString::fromLatin1(module->Name()) : QString();
+	m_dataCache.isUnicode = module ? module->isUnicode() : false;
 
 	if (backend()) {
-		if (hasVersion() && (minimumSwordVersion() > SWVersion::currentVersion)) {
+		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());
 		}
 	}
@@ -54,10 +60,11 @@ CSwordModuleInfo::CSwordModuleInfo( SWModule* module ) {
 
 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);
@@ -69,90 +76,99 @@ CSwordModuleInfo::~CSwordModuleInfo(){
 }
 
 /** Sets the unlock key of the modules and writes the key into the cofig file.*/
-const CSwordModuleInfo::UnlockErrorCode CSwordModuleInfo::unlock( const QString& unlockKey ){
-	CSwordModuleInfo::UnlockErrorCode	ret = CSwordModuleInfo::noError;
-	SWConfig moduleConfig("");
-	if ( backend()->moduleConfig(name(), moduleConfig) ) {
-		moduleConfig[name().latin1()]["CipherKey"] = unlockKey.local8Bit();	
-		backend()->setCipherKey(name().latin1(), unlockKey.local8Bit());	
-		(*backend()->getConfig()) += moduleConfig;
-		(*backend()->getConfig())[name().latin1()]["CipherKey"] = moduleConfig[name().latin1()]["CipherKey"];
-		moduleConfig.Save();
-	}	
-	else
-		ret = CSwordModuleInfo::wrongUnlockKey;
-	return ret;
+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. */
-CHTMLEntryDisplay* const CSwordModuleInfo::getDisplay() const {
-	return dynamic_cast<CHTMLEntryDisplay*>(m_module->Disp());
+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 {
+const bool CSwordModuleInfo::isEncrypted()/* const*/ {
 	/**
 	* If we have the CipherKey entry the module
-	* is encrypted but not necessary locked
-	*/		
-	ConfigEntMap config	= backend()->getConfig()->Sections.find( name().latin1() )->second;
-	ConfigEntMap::iterator it = config.find("CipherKey");
+	* 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 string version = (*backend()->getConfig())[name().latin1()]["Version"];
+	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, ListKey scope, void (*percentUpdate)(char, void*) ) {
+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) );
-	SWKey* s = dynamic_cast<SWKey*>(key.get());
-	if (s)
+	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)
+	if (searchOptions & CSwordModuleSearch::multipleWords) {
+		searchType = -2; //multiple words
+  }
+	else if (searchOptions & CSwordModuleSearch::exactPhrase) {
 		searchType = -1; //exact phrase
-	else if (searchOptions & CSwordModuleSearch::regExp)
+  }
+	else if (searchOptions & CSwordModuleSearch::regExp) {
 		searchType = 0;	//regexp matching
+  }
 
-	if ((searchOptions & CSwordModuleSearch::useLastResult) && m_searchResult.Count()) {		
-		util::scoped_ptr<SWKey> searchScope( m_searchResult.clone() );
-		m_searchResult = m_module->Search(searchedText.utf8(), searchType, searchFlags, searchScope, 0, percentUpdate);
+	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);
+		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);
+  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. */
-ListKey& CSwordModuleInfo::searchResult(const ListKey* newResult) {
-	if (newResult)
-		m_searchResult.copyFrom( *newResult );	
+sword::ListKey& CSwordModuleInfo::searchResult(const sword::ListKey* newResult) {
+	if (newResult) {
+		m_searchResult.copyFrom( *newResult );
+  }
 	return m_searchResult;
 }
 
@@ -167,8 +183,8 @@ void CSwordModuleInfo::interruptSearch(){
 }
 
 /** Returns the required Sword version for this module. Returns -1 if no special Sword version is required. */
-const SWVersion CSwordModuleInfo::minimumSwordVersion(){
-	return SWVersion( config(CSwordModuleInfo::MinimumSwordVersion).latin1() );
+const sword::SWVersion CSwordModuleInfo::minimumSwordVersion(){
+	return sword::SWVersion( config(CSwordModuleInfo::MinimumSwordVersion).latin1() );
 }
 
 /** Returns the name of the module. */
@@ -187,34 +203,73 @@ const QString CSwordModuleInfo::config( const CSwordModuleInfo::ConfigEntry entr
 		{
 			QString about = QString::fromLatin1(m_module->getConfigEntry("About"));
 			if (!about.isEmpty()) {	
-				RTFHTML filter;
-				const int len = about.length()+600;
-				char dummy[len];
-				strcpy(dummy, about.local8Bit());
-		
-				filter.ProcessText(dummy,len,0);
-				about = QString::fromLocal8Bit(dummy);
-			}			
+				sword::RTFHTML filter;
+				sword::SWBuf buf( about.local8Bit() );
+				filter.processText(buf, 0, 0);
+				about = QString::fromLocal8Bit(buf.c_str());
+			}
 			return about;
-		}		
+		}
 		case CipherKey:
-			return QString::fromLatin1(m_module->getConfigEntry("CipherKey"));
-		case AbsoluteDataPath:
-			return QString::fromLatin1(m_module->getConfigEntry("AbsoluteDataPath"));
-		case DataPath:
-			return QString::fromLatin1(m_module->getConfigEntry("DataPath"));
+      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::fromLocal8Bit(m_module->Description());			
-		case ModuleVersion:
-			return QString::fromLatin1(m_module->getConfigEntry("Version"));
+			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 DisplayLevel: {
+		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("0");
+			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;
 	}
@@ -233,26 +288,80 @@ const bool CSwordModuleInfo::has( const CSwordModuleInfo::Feature feature ){
 			return m_module->getConfig().has("Feature", "GreekParse");		
 		case HebrewParse:
 			return m_module->getConfig().has("Feature", "HebrewParse");		
-		case DailyDevotion:
-			return m_module->getConfig().has("Feature", "DailyDevotion");		
-		case Glossary:
-			return m_module->getConfig().has("Feature", "Glossary");		
 	}
-	return 0;
+	return false;
 }
 
-const bool CSwordModuleInfo::has( const CSwordBackend::FilterOptions option ){
-	//BAD workaround to see if the filter is GBF or ThML!	
- 	if (m_module->getConfig().has("GlobalOptionFilter",QString::fromLatin1("GBF%1").arg(backend()->configOptionName(option)).latin1()))
+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("ThML%1").arg(backend()->configOptionName(option)).latin1()))
+  if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("GBF%1").arg(name).latin1()))
  		return true;
- 	if (m_module->getConfig().has("GlobalOptionFilter",QString::fromLatin1("UTF8%1").arg(backend()->configOptionName(option)).latin1()))
+ 	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",backend()->configOptionName(option).latin1()))
+ 	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
index 8173401..5104b96 100644
--- a/bibletime/backend/cswordmoduleinfo.h
+++ b/bibletime/backend/cswordmoduleinfo.h
@@ -20,8 +20,8 @@
 
 //BibleTime includes
 #include "cswordbackend.h"
-#include "frontend/cpointers.h"
-
+#include "clanguagemgr.h"
+#include "util/cpointers.h"
 
 //Qt includes
 #include <qstring.h>
@@ -33,9 +33,10 @@
 #include <listkey.h>
 #include <swversion.h>
 
-class SWModule;
+class sword::SWModule;
 class CSwordBackend;
-class CHTMLEntryDisplay;
+class CEntryDisplay;
+class CSwordKey;
 
 /**
 	* Base class for Sword modules.
@@ -43,11 +44,15 @@ class CHTMLEntryDisplay;
 	* does inherit from this class.
 	*
   * @author The BibleTime team
-  * @version $Id: cswordmoduleinfo.h,v 1.21 2002/03/21 21:58:37 joachim Exp $
+  * @version $Id: cswordmoduleinfo.h,v 1.44 2004/01/29 00:36:48 joachim Exp $
   */
 class CSwordModuleInfo : public CPointers  {
 public:
-	enum ModuleType {
+  enum TextDirection { /* The text direction of the modules's text */
+    LeftToRight,
+    RightToLeft
+  };
+  enum ModuleType {
 		Bible,
 		Commentary,
 		Lexicon,
@@ -69,27 +74,37 @@ public:
 		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 decsription stored in the config file */
+		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.).*/
-		DisplayLevel /* Mostly used for books. Gives the level which should contain the connected entries.*/
+	  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, /*Hebrew StringsNumbers definitions in a lexicon*/
-		HebrewDef,
+		GreekDef,
+		HebrewDef, 
 		GreekParse,
 		HebrewParse,
-		DailyDevotion,
-		Glossary
+    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 ConfigEntry );
+	const QString config( const CSwordModuleInfo::ConfigEntry entry );
 	
-	CSwordModuleInfo( SWModule* module );
+	CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
+//	CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const backend );
 	CSwordModuleInfo( const CSwordModuleInfo& m );	
   virtual CSwordModuleInfo* clone();	
 	virtual ~CSwordModuleInfo();	
@@ -97,12 +112,12 @@ public:
   /**
  	* Returns the module object so all objects can access the original Sword module.
  	*/
-  SWModule* const module() const;
+  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 CSwordModuleInfo::UnlockErrorCode unlock( const QString& unlockKey );
+  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
@@ -110,13 +125,13 @@ public:
  	* This function performs some casts to return the correct display. If it returns 0 there's no valid
  	* display object.
  	*/
-  CHTMLEntryDisplay* const getDisplay() const;
+  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;
+  const bool isEncrypted() /*const*/;
   /**
  	* This function returns true if this module is locked (encrypted + correct cipher key),
  	* otherwise return false.
@@ -132,12 +147,12 @@ public:
   * 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, ListKey scope, void (*percent)(char, void*));
+  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 ListKey& searchResult( const ListKey* newResult = 0 );
+  virtual sword::ListKey& searchResult( const sword::ListKey* newResult = 0 );
   /**
   * This interupts the search if this module is being searched.
   */
@@ -156,42 +171,79 @@ public:
   * Returns the required Sword version for this module.
 	* Returns -1 if no special Sword version is required.
 	*/
-  const SWVersion minimumSwordVersion();
+  const sword::SWVersion minimumSwordVersion();
   /**
   * Returns the name of the module.
   */
   const QString name() const;
   /**
-  * Returns true if this module is Unicode encoded. False if the charset is iso8859-1.
-  */
-  const bool isUnicode();
-  /**
   * 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::FilterOptions option )	;
+	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:
-	SWModule*	m_module;
-	ListKey m_searchResult;
+	sword::SWModule* m_module;
+	sword::ListKey m_searchResult;
 	struct {
 		QString name;
 		bool isUnicode;
-	} m_dataCache;	
+	} m_dataCache;
+
+  CSwordBackend* m_backend;
 };
 
-typedef QList<CSwordModuleInfo>	ListCSwordModuleInfo;
+typedef QPtrList<CSwordModuleInfo>	ListCSwordModuleInfo;
 
 inline const CSwordModuleInfo::ModuleType CSwordModuleInfo::type() const {
 	return CSwordModuleInfo::Unknown;
 }
 
-inline SWModule*const CSwordModuleInfo::module() const {
+inline sword::SWModule* const CSwordModuleInfo::module() const {
 	return m_module;
 }
 
-typedef QList<CSwordModuleInfo> ListCSwordModuleInfo;
-
 #endif
diff --git a/bibletime/backend/cswordmodulesearch.cpp b/bibletime/backend/cswordmodulesearch.cpp
index 404b332..4449007 100644
--- a/bibletime/backend/cswordmodulesearch.cpp
+++ b/bibletime/backend/cswordmodulesearch.cpp
@@ -21,20 +21,15 @@
 #include "cswordbackend.h"
 #include "../frontend/cbtconfig.h"
 
-//System includes
-#include <pthread.h>
-
-//#include <qdatetime.h>
-
 //Sword includes
 #include <swmodule.h>
 #include <swkey.h>
 #include <listkey.h>
 
 
-CSwordModuleSearch* searcher = 0;
+static CSwordModuleSearch* searcher = 0;
 
-void startSearchCallback(void *p){
+void startSearchCallback(void* /*p*/){
 	if (searcher)
 		searcher->startSearch();
 }
@@ -64,7 +59,7 @@ void CSwordModuleSearch::percentUpdate(char percent, void *){
 }
 
 /** This function sets the modules which should be searched. */
-void CSwordModuleSearch::setModules( ListCSwordModuleInfo& list ) {
+void CSwordModuleSearch::setModules( ListCSwordModuleInfo list ) {
 	m_moduleList = list;
 }
 
@@ -94,29 +89,12 @@ const bool CSwordModuleSearch::startSearch() {
 	m_isSearching = false;
 	m_terminateSearch = false;
 
-	m_finishedSig.activate();		
+  m_finishedSig.activate();		
 	return true;
 }
 
 void CSwordModuleSearch::startSearchThread(void){
-//	pthread_t thread;
-	
-//	pthread_attr_t attr;
-//	pthread_attr_init(&attr);
-//	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-	
-//	pthread_mutex_init(&percentage_mutex, NULL);
-//	pthread_mutex_init(&signal_mutex, NULL);			
-
-//	percentage_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-	/*const int i =*/ //pthread_create( &thread, /*&attr*/NULL, &startSearchCallback, this );
-
 	startSearch();
-	
-//	pthread_cond_wait(&finish_cond, &dummy_mutex);
-//	pthread_mutex_lock(&signal_mutex);			
-//	m_finishedSig.activate();	
-//	pthread_mutex_unlock(&signal_mutex);				
 }
 
 /** Sets the text which should be search in the modules. */
@@ -125,8 +103,18 @@ void CSwordModuleSearch::setSearchedText( const QString text ){
 }
 
 /** Sets the search scope. */
-void CSwordModuleSearch::setSearchScope( ListKey scope ) {
-	m_searchScope.copyFrom( 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. */
@@ -166,7 +154,7 @@ const int CSwordModuleSearch::getPercent( percentType type ){
 }
 
 /** Returns a copy of the used search scope. */
-ListKey& CSwordModuleSearch::scope() {
+sword::ListKey& CSwordModuleSearch::scope() {
 	return m_searchScope;
 }
 
@@ -180,10 +168,5 @@ void CSwordModuleSearch::connectFinished( QObject *receiver, const char *member
 
 /** Should be called when the search finished. */
 void CSwordModuleSearch::searchFinished(){
-//	qWarning("CSwordModuleSearch::searchFinished!");
-//	m_updateSig.block(true);	
-//	pthread_mutex_lock(&signal_mutex);			
 	m_finishedSig.activate();	
-//	pthread_mutex_unlock(&signal_mutex);
-//	m_updateSig.block(false);
 }
diff --git a/bibletime/backend/cswordmodulesearch.h b/bibletime/backend/cswordmodulesearch.h
index 241f4c9..86d6a8b 100644
--- a/bibletime/backend/cswordmodulesearch.h
+++ b/bibletime/backend/cswordmodulesearch.h
@@ -19,12 +19,10 @@
 #define CSWORDMODULESEARCH_H
 
 //BibleTime includes
-//#include "cswordmoduleinfo.h"
-//#include "../structdef.h"
-#include "../frontend/cpointers.h"
+#include "util/cpointers.h"
 
 //Qt includes
-#include <qlist.h>
+#include <qptrlist.h>
 #include <qstring.h>
 #include <qsignal.h>
 
@@ -36,14 +34,14 @@
 
 //class ListKey;
 class CSwordModuleInfo;
-typedef QList<CSwordModuleInfo> ListCSwordModuleInfo;
+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.11 2002/03/09 21:03:16 mgruner Exp $
+  * @version $Id: cswordmodulesearch.h,v 1.17 2004/01/27 15:38:16 joachim Exp $
   */
 class CSwordModuleSearch: public CPointers {
 public:
@@ -91,11 +89,11 @@ public:
   /**
  	* This function sets the modules which should be searched.
  	*/
-  void setModules( ListCSwordModuleInfo& );
+  void setModules( ListCSwordModuleInfo );
   /**
  	* Sets the search scope.
  	*/
-  void setSearchScope( ListKey scope );
+  void setSearchScope( sword::ListKey scope );
   /**
  	*	Calls with true if you want to use the last searchresult as search scope.
  	*/
@@ -130,14 +128,14 @@ public:
   /**
   * Returns a copy of the used search scope.
   */
-  ListKey& scope();
+  sword::ListKey& scope();
 	void connectPercentUpdate( QObject *receiver, const char *member );
 	void connectFinished( QObject *receiver, const char *member );
   void searchFinished();
 		
 protected:
 	QString m_searchedText;
-	ListKey m_searchScope;
+	sword::ListKey m_searchScope;
 	ListCSwordModuleInfo m_moduleList;
 
 	int m_searchOptions;
diff --git a/bibletime/backend/cswordtreekey.cpp b/bibletime/backend/cswordtreekey.cpp
index 5aa9f56..c9444aa 100644
--- a/bibletime/backend/cswordtreekey.cpp
+++ b/bibletime/backend/cswordtreekey.cpp
@@ -18,11 +18,12 @@
 #include "cswordtreekey.h"
 #include "cswordbookmoduleinfo.h"
 
-CSwordTreeKey::CSwordTreeKey( const CSwordTreeKey& k ) : TreeKeyIdx(/*(const char*)*/k), CSwordKey(k) {
+CSwordTreeKey::CSwordTreeKey( const CSwordTreeKey& k ) : CSwordKey(k), TreeKeyIdx(k) {
+  
 }
 
-CSwordTreeKey::CSwordTreeKey( const TreeKeyIdx *k, CSwordModuleInfo* module )
-	: TreeKeyIdx(*k), CSwordKey(module) {
+CSwordTreeKey::CSwordTreeKey( const TreeKeyIdx *k, CSwordModuleInfo* module ) : CSwordKey(module), TreeKeyIdx(*k) {
+  
 }
 
 CSwordTreeKey* CSwordTreeKey::copy() const {
@@ -30,19 +31,19 @@ CSwordTreeKey* CSwordTreeKey::copy() const {
 }
 
 /** Sets the key of this instance */
-const QString CSwordTreeKey::key( const QString& newKey ){
-	if (!newKey.isNull()) {
-		if (newKey.isEmpty())
-			root();	
-		else
-			TreeKeyIdx::operator = ((const char*)newKey.local8Bit());		//don't use Utf8! Doesn't work with umlauts!
-	
-		if (Error()) {
-			root();
-			return QString::null;
-		}		
-	}
- 	return QString::fromLocal8Bit( getFullName() ); //don't use fromUtf8
+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 ){
@@ -51,33 +52,21 @@ void CSwordTreeKey::key( const char* newKey ){
 	}
 }
 
-CSwordModuleInfo* CSwordTreeKey::module( CSwordModuleInfo* newModule ){
-	if (newModule && newModule->type() == CSwordModuleInfo::GenericBook ) {
-		CSwordBookModuleInfo* bookModule = dynamic_cast<CSwordBookModuleInfo*>(newModule);
+CSwordModuleInfo* const CSwordTreeKey::module( CSwordModuleInfo* const newModule ) {
+	if (newModule && (newModule != m_module) && (newModule->type() == CSwordModuleInfo::GenericBook) ) {
 		m_module = newModule;
-		copyFrom(*(bookModule->tree()));
-		root();
+
+		const QString oldKey = key();
+		CSwordBookModuleInfo* newBook = dynamic_cast<CSwordBookModuleInfo*>(newModule);
+		copyFrom(*(newBook->tree()));
+
+		key(oldKey); //try to restore our old key
 	}
 	return m_module;
 }
 
-//const bool CSwordTreeKey::jumpTo(const JumpType type) {
-//	switch (type) {
-//		case NextEntry:
-//			if (Traversable()) {
-//				(*this)++;
-//				return !Error();
-//			}
-//			return false;
-//			
-//		case PreviousEntry:
-//			if (Traversable()) {
-//				(*this)++;
-//				return !Error();
-//			}
-//			return false;
-//			
-//		default:
-//			return false;
-//	};
-//}
+/** Assignment operator. */
+CSwordTreeKey& CSwordTreeKey::operator = (const QString& keyname ){
+  key(keyname);
+  return *this;
+}
diff --git a/bibletime/backend/cswordtreekey.h b/bibletime/backend/cswordtreekey.h
index 8b8a04f..98c78e3 100644
--- a/bibletime/backend/cswordtreekey.h
+++ b/bibletime/backend/cswordtreekey.h
@@ -28,29 +28,29 @@
 /** BibleTime's implementation of Sword's TreeKeyIdx class.
   * @author The BibleTime team
   */
-class CSwordTreeKey : public TreeKeyIdx, public CSwordKey  {
+class CSwordTreeKey : public CSwordKey, public sword::TreeKeyIdx  {
 public:
-//	enum JumpType {
-//		NextEntry,
-//		PreviousEntry
-//	};
-	
 	CSwordTreeKey( const CSwordTreeKey& k );
-	CSwordTreeKey( const TreeKeyIdx *k, CSwordModuleInfo* module );
-	CSwordModuleInfo* module( CSwordModuleInfo* newModule );
+	CSwordTreeKey( const sword::TreeKeyIdx *k, CSwordModuleInfo* module );
+	CSwordModuleInfo* const module( CSwordModuleInfo* const newModule );
 	virtual CSwordTreeKey* 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.
+  * 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 const QString key( const QString& key = QString::null );
+  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 );
-	
-//	const bool jumpTo( const JumpType type );
+  /**
+  * Assignment operator.
+  */
+  virtual CSwordTreeKey& operator = (const QString& keyname );
 };
 
 #endif
diff --git a/bibletime/backend/cswordversekey.cpp b/bibletime/backend/cswordversekey.cpp
index f6b7642..cebf311 100644
--- a/bibletime/backend/cswordversekey.cpp
+++ b/bibletime/backend/cswordversekey.cpp
@@ -27,12 +27,16 @@
 #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 ) : VerseKey(k),CSwordKey(k) {
+CSwordVerseKey::CSwordVerseKey( const CSwordVerseKey& k ) : CSwordKey(k), VerseKey(k) {
+
 }
 
-CSwordVerseKey::CSwordVerseKey( const VerseKey* k, CSwordModuleInfo* module) : VerseKey(*k),CSwordKey(module) {
+CSwordVerseKey::CSwordVerseKey( const VerseKey* k, CSwordModuleInfo* module) : CSwordKey(module), VerseKey(*k) {
 }
 
 /** Clones this object. */
@@ -41,13 +45,24 @@ CSwordKey* CSwordVerseKey::copy() const {
 }
 
 /** Sets the module for this key */
-CSwordModuleInfo* CSwordVerseKey::module( CSwordModuleInfo* newModule ){
-	if (newModule && (newModule->type() == CSwordModuleInfo::Bible || newModule->type() == CSwordModuleInfo::Commentary) ) {
-		const QString& oldKey	= 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);
+	//	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 m_module;
+	return dynamic_cast<CSwordBibleModuleInfo*>(m_module);
 }
 
 /** Returns the current book as Text, not as integer. */
@@ -55,8 +70,7 @@ const QString CSwordVerseKey::book( const QString& newBook ) {
 	int min = 0;
 	int max = 1;
 	
-	if (!newBook.isEmpty()) {
-		CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module());
+	if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module())) {
 		const bool hasOT = bible->hasTestament(CSwordBibleModuleInfo::OldTestament);		
 		const bool hasNT = bible->hasTestament(CSwordBibleModuleInfo::NewTestament);
 		if (hasOT && hasNT) {
@@ -75,7 +89,9 @@ const QString CSwordVerseKey::book( const QString& newBook ) {
 			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) {
@@ -87,55 +103,102 @@ const QString CSwordVerseKey::book( const QString& newBook ) {
 			}
 		}
 	}
-	if ( Testament()> 0 && Testament() <=2 && Book() <= BMAX[Testament()-1] )
+	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( const QString& newKey ){	
-	if (!newKey.isEmpty()) {
-		VerseKey::operator = ((const char*)newKey.local8Bit());
-	}
-	return QString::fromLocal8Bit((const char*)*this);//don't use fromUtf8 here!
+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) {
+  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;		
+			if ((Book() <= 0) || (Book() >= BMAX[Testament()-1]) && (Testament() > 1)) {
+				return false;
+			}
 			Book(Book()+1);
-			return true;
+			break;
 		}
 		case UseChapter: {
-			Chapter(Chapter()+1);		
-			return true;
+			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!	
+				//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()) )++;
-    		if (!m_module->module()->Error())		
+        m_module->module()->setSkipConsecutiveLinks(false);
+
+    		if (!m_module->module()->Error()) {
     			key( QString::fromLocal8Bit(m_module->module()->KeyText()) );//don't use fromUtf8
-    		else {    			
+        }
+    		else {
+					qWarning("VerseKey::next: module error");
 	    	  Verse(Verse()+1);
-	    	  return false;
+	    	  break;
 	    	}
     	}
-    	else
+    	else {
     	  Verse(Verse()+1);
-    	return true;		
+      }
+    	break;
 		}
-		default:	
+		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 ) {
@@ -144,29 +207,51 @@ const bool CSwordVerseKey::previous( const JumpType type ) {
 			if (Book()<=1 || Book() > BMAX[Testament()-1] && Testament() > 1)
 				return false;
 			Book(Book()-1);
-			return true;
+			break;
 		}
 		case UseChapter: {
 			Chapter(Chapter()-1);
-			return true;		
+			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()->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 {
+    		else
 	    	  Verse(Verse()-1);
-	    	  return false;
-	    	}
     	}
-    	else
+    	else {
     		Verse(Verse()-1);
-    	
-    	return true;		
+      }
+      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
index 7afaab8..18a30d4 100644
--- a/bibletime/backend/cswordversekey.h
+++ b/bibletime/backend/cswordversekey.h
@@ -46,10 +46,10 @@
 	* 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.8 2002/03/12 20:43:13 joachim Exp $
+	*	@version $Id: cswordversekey.h,v 1.15 2003/07/05 17:12:16 joachim Exp $
   *	@author The BibleTime team
   */
-class CSwordVerseKey :  public VerseKey, public CSwordKey  {
+class CSwordVerseKey : public CSwordKey,  public sword::VerseKey  {
 public:
 	enum JumpType {
 		UseBook,
@@ -72,23 +72,20 @@ public:
   /**
   * VerseKey based constructor.
   */
-  CSwordVerseKey( const VerseKey* k, CSwordModuleInfo* module );
+  CSwordVerseKey( const sword::VerseKey* k, CSwordModuleInfo* module );
   /**
   * Clones this object.
   */
   virtual CSwordKey* copy() const;
-	/**
-	* Destructor of this class.
-	*
-	* Clean up the data variables and delete objects used and
-	* created by this class.
-	*/
-//	virtual ~CSwordVerseKey();
   /**
   * 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( const QString& key = QString::null );
+  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.
@@ -113,7 +110,11 @@ public:
   /**
   * Sets the module for this key
   */
-  virtual CSwordModuleInfo* module( CSwordModuleInfo* newModule = 0 );
+  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/backend/st31vJFM b/bibletime/backend/st31vJFM
deleted file mode 100644
index ffbbf5d..0000000
--- a/bibletime/backend/st31vJFM
+++ /dev/null
diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp
index ee84db7..f3c94ba 100644
--- a/bibletime/bibletime.cpp
+++ b/bibletime/bibletime.cpp
@@ -18,20 +18,19 @@
 //local includes
 #include "config.h"
 #include "bibletime.h"
-#include "resource.h"
 
 //frontend includes
-#include "frontend/chtmldialog.h"
-#include "frontend/ctoolclass.h"
 #include "frontend/cmdiarea.h"
-#include "frontend/presenters/cswordpresenter.h"
-#include "frontend/presenters/cbiblepresenter.h"
-#include "frontend/presenters/ccommentarypresenter.h"
-#include "frontend/presenters/clexiconpresenter.h"
-#include "frontend/presenters/cbookpresenter.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 "frontend/cpointers.h"
+
+#include "util/ctoolclass.h"
+#include "util/cpointers.h"
 
 //backend includes
 #include "backend/cswordmoduleinfo.h"
@@ -39,8 +38,6 @@
 #include "backend/cswordcommentarymoduleinfo.h"
 #include "backend/cswordlexiconmoduleinfo.h"
 #include "backend/cswordbookmoduleinfo.h"
-#include "backend/chtmlentrydisplay.h"
-#include "backend/chtmlchapterdisplay.h"
 #include "backend/cswordversekey.h"
 #include "backend/cswordldkey.h"
 
@@ -52,58 +49,65 @@
 
 //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);
 
-BibleTime::BibleTime() : KMainWindow() {
-	m_initialized = false;
-	m_moduleList  = 0;
-	m_progress = 0;
-	m_currentProfile = 0;
-	
-	m_keyAccel = new KAccel(this);
-
-	connect(kapp, SIGNAL(lastWindowClosed()), SLOT(lastWindowClosed()));
-
-	initBackends();
+  initBackends();
 	initPrinter();
-	
 	initView();
 	initActions();
-	setHelpMenuEnabled(false);
+
 	createGUI("bibletimeui.rc");
 	initMenubar();
 	initConnections();
-	
+
 	readSettings();
 
 	setPlainCaption("BibleTime " VERSION);
-	setAutoSaveSettings(QString::fromLatin1("MainWindow"), false);
-}
 
-BibleTime::~BibleTime() {
-	saveSettings();
+  // 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();	
-	if (m_keyAccel)
-		m_keyAccel->writeSettings();
+	if (m_mdi) {
+		m_mdi->saveSettings();
+  }
+
+  accel()->writeSettings();
 
  	CBTConfig::set(CBTConfig::toolbar, m_viewToolbar_action->isChecked());
- 	CBTConfig::set(CBTConfig::mainIndex, m_viewGroupManager_action->isChecked());
+ 	CBTConfig::set(CBTConfig::mainIndex, m_viewMainIndex_action->isChecked());
 
- 	if (m_viewGroupManager_action->isChecked())	//only save changes when the groupmanager is visible
+ 	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);	
+ 		CBTConfig::set(CBTConfig::autoCascade, false);
  	}
  	else if ( m_windowAutoTile_action->isChecked() ) {
 		CBTConfig::set(CBTConfig::autoTile, false);
@@ -115,21 +119,20 @@ void BibleTime::saveSettings(){
  	}
 
 	if ( CBTConfig::get(CBTConfig::restoreWorkspace) ) {
-		if (CProfile* p = m_profileMgr.startupProfile())
+		if (CProfile* p = m_profileMgr.startupProfile()) {
 			saveProfile(p);
+    }
 	}
 }
 
 /** Reads the settings from the configfile and sets the right properties. */
 void BibleTime::readSettings(){
-	applyMainWindowSettings(KGlobal::config(), QString::fromLatin1("MainWindow"));
-	
-	m_keyAccel->readSettings(KGlobal::config());
+	accel()->readSettings(KGlobal::config());
 
  	m_viewToolbar_action->setChecked( CBTConfig::get(CBTConfig::toolbar) );
  	slotToggleToolbar();
 		
- 	m_viewGroupManager_action->setChecked( CBTConfig::get(CBTConfig::mainIndex) );
+ 	m_viewMainIndex_action->setChecked( CBTConfig::get(CBTConfig::mainIndex) );
  	slotToggleGroupManager();
 		
  	m_splitter->setSizes( CBTConfig::get(CBTConfig::splitterSizes) );		
@@ -152,93 +155,76 @@ void BibleTime::readSettings(){
 }
 
 /** Creates a new presenter in the MDI area according to the type of the module. */
-CSwordPresenter* BibleTime::createNewSwordPresenter(ListCSwordModuleInfo modules, const QString& key) {
-	kapp->setOverrideCursor( waitCursor );
-	
-	CSwordPresenter* presenter = 0;
-	switch (modules.first()->type()) {
-		case CSwordModuleInfo::Bible:
-			presenter = new CBiblePresenter(modules, m_mdi);
-			break;
-		case CSwordModuleInfo::Commentary:
-			presenter = new CCommentaryPresenter(modules, m_mdi);
-			break;
-		case CSwordModuleInfo::Lexicon:
-			presenter = new CLexiconPresenter(modules, m_mdi);
-			break;
-		case CSwordModuleInfo::GenericBook:			
-			presenter = new CBookPresenter(modules, m_mdi);
-			break;
-		default:
-			presenter = 0;
-			qWarning("unknown module type");
-			break;
-	}	
-	if (presenter) {
-		connect(presenter, SIGNAL(lookupInLexicon(const QString&, const QString&)),
-			m_mdi, SLOT(lookupInLexicon(const QString&, const QString&)));				
-		connect(presenter, SIGNAL(lookupInModule(const QString&, const QString&)),
-			m_mdi, SLOT(lookupInModule(const QString&, const QString&)));							
-		connect(presenter, SIGNAL(closePresenter(CSwordPresenter*)),
-			m_mdi, SLOT(closePresenter(CSwordPresenter*)));							
-		if (presenter->isA("CBiblePresenter")) {
-			connect(presenter->keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
-				m_mdi, SLOT(syncCommentaries(CSwordKey*)));		
-		}
-		presenter->lookup(modules.first()->name(),key);		
+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();
-	presenter->setFocus();
-	
-	return presenter;
+
+  kapp->restoreOverrideCursor();  
+	return displayWindow;
 }
 
 
 /** Creates a new presenter in the MDI area according to the type of the module. */
-CSwordPresenter* BibleTime::createNewSwordPresenter(CSwordModuleInfo* module, const QString& key) {
+CDisplayWindow* BibleTime::createReadDisplayWindow(CSwordModuleInfo* module, const QString& key) {
 	ListCSwordModuleInfo list;
 	list.append(module);
-	
-	return createNewSwordPresenter(list, key);		
+
+	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::refreshPresenters() {
+void BibleTime::refreshDisplayWindows() {
 	unsigned int index;				
 	for ( index = 0; index < m_mdi->windowList().count(); index++) {
-		CSwordPresenter* myPresenter = dynamic_cast<CSwordPresenter*>(m_mdi->windowList().at(index));
-		if (myPresenter)
-   		myPresenter->refresh();
+		if (CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(m_mdi->windowList().at(index))) {
+   		window->reload();
+    }
 	}
 }
 
 /** Called before quit. */
 bool BibleTime::queryExit(){
-  if (!m_initialized)
+  if (!m_initialized) {
   	return false;
+  }
 	saveSettings();
 	return true;
 }
 
 /** Called before a window is closed */
 bool BibleTime::queryClose(){
-	bool ret = true;
+  bool ret = true;
 	for ( unsigned int index = 0; index < m_mdi->windowList().count(); ++index) {
-		if (CSwordPresenter* myPresenter = dynamic_cast<CSwordPresenter*>(m_mdi->windowList().at(index)))
-   		ret = myPresenter->queryClose() && ret;
+		if (CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(m_mdi->windowList().at(index))) {
+   		ret = ret && window->queryClose();
+    }
 	}	
 	return ret;
 }
 
-/** No descriptions */
-void BibleTime::show(){
-	KMainWindow::show();	
-	//if we show BibleTime for the first time we are ready for processing
-	//but not before this point.
-	m_initialized = true;
-}
-
 /** Reimplementation used for sessions management. */
 void BibleTime::saveProperties(KConfig* /*myConfig*/){
 
@@ -251,8 +237,9 @@ 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())
+	if (CProfile* p = m_profileMgr.startupProfile()) {
 		loadProfile(p);
+  }
 }
 
 /** Sets the caption of the mainwindow */
@@ -264,3 +251,40 @@ void BibleTime::setCaption( const QString& ){
 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
index 27bc476..d22e5f5 100644
--- a/bibletime/bibletime.h
+++ b/bibletime/bibletime.h
@@ -18,11 +18,11 @@
 #define BIBLETIME_H
 
 //KDE includes
-#include <kapp.h>
-#include <ktmainwindow.h>
+#include <kmainwindow.h>
 
 //Frontend includes
 #include "frontend/cprofilemgr.h"
+#include "frontend/displaywindow/cdisplaywindow.h"
 
 //Backend includes
 #include "backend/cswordmoduleinfo.h"
@@ -30,10 +30,10 @@
 //forward class declarations
 
 //BT classes
-class CGroupManager;
 class CMDIArea;
 class CProfile;
-class CSwordPresenter;
+class CDisplayWindow;
+class CMainIndex;
 
 //KDE classes
 class KToggleAction;
@@ -109,12 +109,9 @@ public:
 	* construtor of BibleTime
 	*/
 	BibleTime();
-	/**
-	* Destructor of BibleTime
-	*/
-	virtual ~BibleTime();
-	virtual void show();
-	/**
+	
+  virtual void polish();
+  /**
 	* Reads the settings from the configfile and sets the right properties.
 	*/
 	void readSettings();
@@ -145,18 +142,14 @@ public slots:
 	*/
 	void slotSettingsOptions();
 	/**
-	* The last window was closed!
+	* Opens the optionsdialog of BibleTime.
 	*/
-	void lastWindowClosed();
+	void slotSwordSetupDialog();
 	/**
 	* Opens the handbook.
 	*/
 	void openOnlineHelp_Handbook();
 	/**
-	* Opens the installation instructions.
-	*/
-	void openOnlineHelp_Install();
-	/**
 	* Opens the bible study howto.
 	*/
 	void openOnlineHelp_Howto();
@@ -168,6 +161,10 @@ public slots:
 	* Sets the caption of the mainwindow
 	*/
 	virtual void setCaption(const QString&);
+  /**
+  * Processes the commandline options given to BibleTime.
+  */
+  void processCommandline();
 
 protected: // Protected methods
 	/**
@@ -193,7 +190,7 @@ protected: // Protected methods
 	/**
 	* Refreshes all presenter supporting at least in of the features given as parameter.
 	*/
-	void refreshPresenters();
+	void refreshDisplayWindows();
 	/**
 	* Called before a window is closed
 	*/
@@ -213,61 +210,15 @@ protected: // Protected methods
 	/**
 	* Reimplementation used for sessions management.
 	*/
-	void saveProperties(KConfig* myConfig);
-
-	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_viewGroupManager_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;
-	KActionMenu*	m_windowLoadProfile_action;	
-	KAction*	m_windowEditProfiles_action;	
-	KToggleAction*	m_windowFullscreen_action;		
-		
-	KHelpMenu* m_helpMenu;
-		
-	KAccel* m_keyAccel;
-	QSplitter* m_splitter;
-	CGroupManager* m_groupmanager;
-	CMDIArea* m_mdi;
-	
-	/**
-	* The list of installed SWORD modules
-	*/
-	ListCSwordModuleInfo* m_moduleList;
-	CProfile* m_currentProfile;
-	
-	bool m_initialized;
+	void saveProperties(KConfig* myConfig);	
 
 protected slots:
 	/**
- 	* Quit BibleTime
- 	*/
-	void slotFileQuit();
-	/**
  	* Creates a new presenter in the MDI area according to the type of the module.
  	*/
-	CSwordPresenter* 
-		createNewSwordPresenter(ListCSwordModuleInfo, const QString&);
-	
-	/**
-	* No descriptions
-	*/
-	CSwordPresenter* createNewSwordPresenter(CSwordModuleInfo*, const QString&);
+	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 ;-)
  	*/
@@ -333,6 +284,36 @@ protected slots:
 	* 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
 	/**
@@ -353,10 +334,52 @@ private slots: // Private slots
 	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;
-	CProfileMgr m_profileMgr;	
+
+  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
index e2f4beb..e0984d7 100644
--- a/bibletime/bibletime_init.cpp
+++ b/bibletime/bibletime_init.cpp
@@ -16,21 +16,28 @@
  ***************************************************************************/
 
 //BibleTime includes
-#include "printing/cprinter.h"
-#include "frontend/cmdiarea.h"
-#include "frontend/kstartuplogo.h"
-#include "frontend/groupmanager/cgroupmanager.h"
 #include "bibletime.h"
-#include "resource.h"
-#include "frontend/chtmldialog.h"
+
+#include "backend/cswordbackend.h"
+
+#include "frontend/mainindex/cmainindex.h"
 #include "frontend/cprofilemgr.h"
 #include "frontend/cprofile.h"
-#include "backend/cswordbackend.h"
-#include "whatsthisdef.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
@@ -41,6 +48,7 @@
 
 //KDE includes
 #include <kaboutdata.h>
+#include <kapplication.h>
 #include <kconfigbase.h>
 #include <ktoolbar.h>
 #include <kiconloader.h>
@@ -57,278 +65,438 @@
 /**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_groupmanager = new CGroupManager( m_splitter, "groupmanager", m_moduleList );
-	m_groupmanager->setFocusPolicy(ClickFocus);
+//  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());
-
-	setCentralWidget(m_splitter);	
 }
 
-
 /** 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 printing queue"), ICON_FILE_CLEAR_QUEUE ,0,
-		m_printer, SLOT(clearQueue()), actionCollection(), "fileClearQueue_action");	
-	m_fileClearQueue_action->setEnabled(false);	
-	m_fileClearQueue_action->setToolTip( TT_FILE_CLEAR_QUEUE );
-	m_fileClearQueue_action->setWhatsThis( WT_FILE_CLEAR_QUEUE );
-	m_fileClearQueue_action->plugAccel( m_keyAccel );	
-	
-	m_filePrint_action = KStdAction::print(this, SLOT( slotFilePrint() ), actionCollection());
-	m_filePrint_action->setEnabled(false);		
-	m_filePrint_action->setToolTip( TT_FILE_PRINT );	
-	m_filePrint_action->setWhatsThis( WT_FILE_PRINT );
-	m_filePrint_action->plugAccel( m_keyAccel );	
-	
-	action = KStdAction::quit(this, SLOT( slotFileQuit() ), actionCollection());
-	action->setToolTip( TT_FILE_QUIT );	
-	action->setWhatsThis( WT_FILE_QUIT );
-	action->plugAccel( m_keyAccel );
-												
-	action =  new KAction(i18n("Reset main index"), ICON_MAININDEX_RESET, IDK_GM_RESET,
-		m_groupmanager, SLOT(slotReset()), actionCollection(), "GMreset_action");	
-	action->setToolTip( TT_GM_RESET );			
-	action->setWhatsThis( WT_GM_RESET );		
-	action->plugAccel( m_keyAccel );
-	
-	action =  new KAction(i18n("Search in module(s)"), ICON_MAININDEX_SEARCH, IDK_GM_MODULES_SEARCH,
-		m_groupmanager, SLOT(slotSearchSelectedModules()), actionCollection(), "GMsearch_action");	
-  action->setToolTip( TT_GM_SEARCH_MODULES );
-  action->setWhatsThis( WT_GM_SEARCH_MODULES );
-	action->plugAccel( m_keyAccel );
-	
-	action =  new KAction(i18n("Remove selected item(s)"),ICON_MAININDEX_DELETE_ITEMS, IDK_GM_ITEMS_DELETE,
-		m_groupmanager, SLOT(slotDeleteSelectedItems()), actionCollection(), "GMdelete_action");	
-	action->setToolTip( TT_GM_DELETE_ITEMS );	
-	action->setWhatsThis( WT_GM_DELETE_ITEMS );
-	action->plugAccel( m_keyAccel );
-
-	m_viewToolbar_action = KStdAction::showToolbar(this, SLOT( slotToggleToolbar() ), actionCollection());
-	m_viewToolbar_action->setToolTip( TT_VIEW_TOOLBAR );	
-	m_viewToolbar_action->setWhatsThis( WT_VIEW_TOOLBAR );
-	m_viewToolbar_action->plugAccel( m_keyAccel );
-
-	m_viewGroupManager_action = new KToggleAction(i18n("&Show main index"), ICON_VIEW_MAININDEX, IDK_VIEW_GROUPMANAGER,
-		this, SLOT(slotToggleGroupManager()), actionCollection(), "viewGroupManager_action");
-	m_viewGroupManager_action->setToolTip( TT_VIEW_GROUPMANAGER );	
-	m_viewGroupManager_action->setWhatsThis( WT_VIEW_GROUPMANAGER );
-	
-	action = KStdAction::preferences(this, SLOT( slotSettingsOptions() ), actionCollection());
-	action->setToolTip( TT_SETTINGS_OPTIONS );
-	action->setWhatsThis( WT_SETTINGS_OPTIONS );
-	action->plugAccel( m_keyAccel );
-
-	action = KStdAction::configureToolbars(this, SLOT( slotSettingsToolbar() ), actionCollection());
-	action->setToolTip( TT_SETTINGS_EDIT_TOOLBAR );	
-	action->setWhatsThis( WT_SETTINGS_EDIT_TOOLBAR );
-	action->plugAccel( m_keyAccel );
-
-	m_windowCascade_action = new KAction(i18n("&Cascade"), ICON_WINDOW_CASCADE, IDK_WINDOW_CASCADE,
-		m_mdi, SLOT(cascade()), actionCollection(), "windowCascade_action");
-	m_windowCascade_action->setToolTip( TT_WINDOW_CASCADE );	
-	m_windowCascade_action->setWhatsThis( WT_WINDOW_CASCADE );
-	m_windowCascade_action->plugAccel( m_keyAccel);	
-	
-	m_windowTile_action = new KAction(i18n("&Tile"), ICON_WINDOW_TILE,
-																IDK_WINDOW_TILE, m_mdi, SLOT(tile()), actionCollection(), "windowTile_action");
-	m_windowTile_action->setToolTip( TT_WINDOW_TILE );	
-	m_windowTile_action->setWhatsThis( WT_WINDOW_TILE );
-	m_windowTile_action->plugAccel( m_keyAccel );	
-	
-	m_windowAutoCascade_action 	= new KToggleAction(i18n("&Auto cascade"), ICON_WINDOW_CASCADE_AUTO,
-																IDK_WINDOW_AUTO_CASCADE, this, SLOT(slotAutoCascade()), actionCollection(), "windowAutoCascade_action");
-	m_windowAutoCascade_action->setToolTip( TT_WINDOW_AUTO_CASCADE );	
-	m_windowAutoCascade_action->setWhatsThis( WT_WINDOW_AUTO_CASCADE );
-	m_windowAutoCascade_action->plugAccel( m_keyAccel );	
-																	
-	m_windowAutoTile_action = new KToggleAction(i18n("A&uto Tile"),ICON_WINDOW_TILE_AUTO,
-																IDK_WINDOW_AUTO_TILE, this, SLOT(slotAutoTile()), actionCollection(), "windowAutoTile_action");
-	m_windowAutoTile_action->setToolTip( TT_WINDOW_AUTO_TILE );	
-	m_windowAutoTile_action->setWhatsThis( WT_WINDOW_AUTO_TILE );
-	m_windowAutoTile_action->plugAccel( m_keyAccel );	
-	
-	m_windowCloseAll_action = new KAction(i18n("&Close all"), ICON_WINDOW_CLOSE_ALL,
-																IDK_WINDOW_CLOSE_ALL, m_mdi, SLOT(deleteAll()), actionCollection(),"windowCloseAll_action");
-	m_windowCloseAll_action->setToolTip( TT_WINDOW_CLOSE_ALL );	
-	m_windowCloseAll_action->setWhatsThis( WT_WINDOW_CLOSE_ALL );
-	m_windowCloseAll_action->plugAccel( m_keyAccel );	
-	
-	m_windowSaveProfile_action = new KActionMenu(i18n("&Save profile"), ICON_WINDOW_SAVE_PROFILE, actionCollection(),"windowSaveProfile_action");
-	m_windowSaveProfile_action->setToolTip( TT_WINDOW_SAVE_PROFILE );	
-	m_windowSaveProfile_action->setWhatsThis( WT_WINDOW_SAVE_PROFILE );
-	m_windowSaveProfile_action->plugAccel( m_keyAccel );	
-
-	m_windowLoadProfile_action = new KActionMenu(i18n("&Load profile"), ICON_WINDOW_SAVE_PROFILE, actionCollection(),"windowLoadProfile_action");
-	m_windowLoadProfile_action->setToolTip( TT_WINDOW_SAVE_PROFILE );	
-	m_windowLoadProfile_action->setWhatsThis( WT_WINDOW_SAVE_PROFILE );
-	m_windowLoadProfile_action->plugAccel( m_keyAccel );
-
-	m_windowEditProfiles_action = new KAction(i18n("&Configure profiles"), ICON_WINDOW_EDIT_PROFILES,
-																IDK_WINDOW_EDIT_PROFILES, this, SLOT(editProfiles()), actionCollection(),"windowEditProfiles_action");
-	m_windowEditProfiles_action->setToolTip( TT_WINDOW_SAVE_PROFILE );	
-	m_windowEditProfiles_action->setWhatsThis( WT_WINDOW_SAVE_PROFILE );
-	m_windowEditProfiles_action->plugAccel( m_keyAccel );	
-
-	m_windowFullscreen_action = new KToggleAction(i18n("&Fullscreen mode"), ICON_WINDOW_FULLSCREEN,
-																IDK_WINDOW_FULLSCREEN, this, SLOT(toggleFullscreen()), actionCollection(),"windowFullscreen_action");
-	m_windowFullscreen_action->setToolTip( TT_WINDOW_FULLSCREEN );	
-	m_windowFullscreen_action->setWhatsThis( WT_WINDOW_FULLSCREEN );
-	m_windowFullscreen_action->plugAccel( m_keyAccel );			
-		
-	QList<CProfile> profiles = m_profileMgr.profiles();		
+
+	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();	
+	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());			
+		savePopup->insertItem(p->name());
 		loadPopup->insertItem(p->name());
 	}
-	
-	if ( actionCollection()->action("help_contents") )	 //delete help action if KDE created it
-		actionCollection()->remove(actionCollection()->action("help_contents"));
-		
-	action = new KAction(i18n("&Handbook"), ICON_HELP_CONTENTS, 0, this,
-		SLOT(openOnlineHelp_Handbook()), actionCollection(), "help_handbook");
-  action->setToolTip( TT_HELP_HANDBOOK );
-  action->setWhatsThis( WT_HELP_HANDBOOK  );
-	action->plugAccel( m_keyAccel );
-
-	action = new KAction(i18n("&Installation"), ICON_HELP_CONTENTS, 0, this,
-		SLOT(openOnlineHelp_Install()), actionCollection(), "help_install");
-  action->setToolTip( TT_HELP_INSTALLATION );
-  action->setWhatsThis( WT_HELP_INSTALLATION  );
-	action->plugAccel( m_keyAccel );
-
-	action = new KAction(i18n("&Bible Study Howto"), ICON_HELP_CONTENTS, 0, this,
-		SLOT(openOnlineHelp_Howto()), actionCollection(), "help_howto");
-  action->setToolTip( TT_HELP_BIBLESTUDY );
-  action->setWhatsThis( WT_HELP_BIBLESTUDY  );
-	action->plugAccel( m_keyAccel );
+
+	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(TT_HELP_WHATSTHIS);
-	action->setWhatsThis(WT_HELP_WHATSTHIS);	
-	
-	action = KStdAction::reportBug(m_helpMenu, SLOT(reportBug()), actionCollection());	
-	action->setToolTip(TT_HELP_BUGREPORT);
-	action->setWhatsThis(WT_HELP_BUGREPORT);
-	action->setIcon(ICON_BUG_REPORT);
-	
-	action = new KAction(i18n("&Daily tip"), ICON_HELP_DAILY_TIP, IDK_HELP_DAILY_TIP, this,
-		SLOT(slotHelpTipOfDay()), actionCollection(), "helpDailyTip_action");
-	action->setToolTip(TT_HELP_DAILY_TIP);
-	action->setWhatsThis(WT_HELP_DAILY_TIP);	
-
-	action = KStdAction::aboutApp(m_helpMenu, SLOT(aboutApplication()), actionCollection());	
-	action->setToolTip(TT_HELP_ABOUT);
-	action->setWhatsThis(WT_HELP_ABOUT);	
-	
+	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("help_about_kde") )	 //delete About KDE action if KDE created it
-		actionCollection()->remove(actionCollection()->action("help_about_kde"));	
-	action = KStdAction::aboutKDE(m_helpMenu, SLOT(aboutKDE()), actionCollection());	
-	action->setToolTip(TT_HELP_ABOUT_KDE);
-	action->setWhatsThis(WT_HELP_ABOUT_KDE);	
+	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));	
+	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(createNewSwordPresenter(CSwordModuleInfo*, const QString&)),
-		this, SLOT(createNewSwordPresenter(CSwordModuleInfo*, 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)));		
+			this, SLOT(slotWindowMenuActivated(int)));
 	}
-	else
-		qWarning("can't find window menu");
-		
-	connect(m_groupmanager, SIGNAL(createSwordPresenter(CSwordModuleInfo*, const QString&)),
-		this, SLOT(createNewSwordPresenter(CSwordModuleInfo*,const QString&)));
-	connect(m_groupmanager, SIGNAL(createSwordPresenter(ListCSwordModuleInfo, const QString&)),
-		this, SLOT(createNewSwordPresenter(ListCSwordModuleInfo,const QString&)));
-	
-	//connect to the signals of the printer object
-	connect(m_printer, SIGNAL(addedFirstQueueItem()),
+	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()));
-	connect(m_printer, SIGNAL(printingStarted()),
+
+  //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(printingFinished()),
-		this, SLOT(slotPrintingFinished()));				
-	connect(m_printer, SIGNAL(printingInterrupted()),
-		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(slotPrintingFinished()));						
-	connect(m_printer, SIGNAL(queueCleared()),
 		this, SLOT(slotSetPrintingStatus()));
-	connect(m_printer, SIGNAL(percentCompleted(const int)),
-		this, SLOT(slotPrintedPercent(const int)));		
+
 }
 
 /** Initializes the backend */
 void BibleTime::initBackends(){
-	KStartupLogo::setStatusMessage(i18n("Initializing Sword")+QString::fromLatin1("..."));
-	
-	m_backend = new CSwordBackend();	
+	KStartupLogo::setStatusMessage(i18n("Initializing Sword") + QString::fromLatin1("..."));
+
+	m_backend = new CSwordBackend();
 	CPointers::setBackend(m_backend);
 	const CSwordBackend::LoadError errorCode = m_backend->initModules();
-//	qWarning("ErrorCode = %i", errorCode);
 
-	m_moduleList = 0;		
+	m_moduleList = 0;
 	if ( errorCode == CSwordBackend::NoError ) {	//no error
 		m_moduleList = &(m_backend->moduleList());
-	} else {
+	}
+	else {
 		m_moduleList = 0;
-		//show error message that initBackend failed		
+		//show error message that initBackend failed
 		switch (errorCode) {
 			case CSwordBackend::NoSwordConfig: //mods.d or mods.conf missing
 			{
 				KStartupLogo::hideSplash();
-				CHTMLDialog dlg(HELPDIALOG_NO_SWORD_MODULE_CONFIG_DIR);
-				dlg.exec();				
-				KStartupLogo::showSplash();				
+        CSwordSetupDialog dlg;
+        dlg.showPart( CSwordSetupDialog::Sword );
+        dlg.exec();
 				break;
 	    }
-	
+
 			case CSwordBackend::NoModules: //no modules installed, but config exists
 			{
 				KStartupLogo::hideSplash();
-				CHTMLDialog dlg(HELPDIALOG_NO_SWORD_MODULES);
-				dlg.exec();
-				KStartupLogo::showSplash();				
+        CSwordSetupDialog dlg;
+        dlg.showPart( CSwordSetupDialog::Install );
+        dlg.exec();
 				break;
 		  }
-		
+
 			default: //unknown error
 			{
 				KStartupLogo::hideSplash();
-				CHTMLDialog dlg(HELPDIALOG_INITBACKEND_FAILED);
-				dlg.exec();
-				KStartupLogo::showSplash();				
+        CSwordSetupDialog dlg;
+        dlg.showPart( CSwordSetupDialog::Sword );
+       	dlg.exec();
 				break;
 		  }
 		}
@@ -338,28 +506,27 @@ void BibleTime::initBackends(){
 
 /** Initializes the CPrinter object. */
 void BibleTime::initPrinter() {
-	KStartupLogo::setStatusMessage(i18n("Initializing printing system") + QString::fromLatin1("..."));
+	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)
+	if (!p) {
 		return;
+  }
 
-	if (p->fullscreen()) { //we can set only fullscreen OR geometry
-		m_windowFullscreen_action->setChecked( true );
-		toggleFullscreen();
-	}
-	else {
-		setGeometry( p->geometry() );
-		m_windowFullscreen_action->setChecked( false );
-		toggleFullscreen();		
-	}
+	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 ){
-	p->setFullscreen(m_windowFullscreen_action->isChecked());
+  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
index a289364..644c69f 100644
--- a/bibletime/bibletime_slots.cpp
+++ b/bibletime/bibletime_slots.cpp
@@ -17,23 +17,27 @@
 
 //own includes
 #include "bibletime.h"
-#include "resource.h"
-#include "frontend/ctoolclass.h"
-//#include "frontend/ctipwindow.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 "backend/cswordversekey.h"
-#include "backend/chtmlentrydisplay.h"
-#include "backend/chtmlchapterdisplay.h"
-#include "printing/cprinter.h"
-#include "frontend/chtmldialog.h"
-#include "frontend/presenters/cswordpresenter.h"
-#include "frontend/groupmanager/cgroupmanager.h"
+#include "frontend/cprofilewindow.h"                       	
 #include "frontend/coptionsdialog.h"
+#include "frontend/cswordsetupdialog.h"
 #include "frontend/cbtconfig.h"
-#include "config.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>
 
@@ -43,15 +47,17 @@
 #include <qwhatsthis.h>
 #include <qvaluelist.h>
 #include <qclipboard.h>
-#include <qxembed.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 <kstddirs.h>
+#include <kstandarddirs.h>
 #include <kmenubar.h>
 #include <kaboutdata.h>
 #include <kglobal.h>
@@ -64,89 +70,83 @@
 //Sword includes
 #include <versekey.h>
 
-/** Closes the current apploication window */
-void BibleTime::slotFileQuit(){
-	saveSettings();		
-	// close the first window, the list makes the next one the first again.
-	// This ensures that queryClose() is called on each window to ask for closing
-	
-	KMainWindow* w;
-	bool ok = true;
-	
-	if(memberList){
-		for(w = memberList->first(); w && ok; w = memberList->first()){
-			// only close the window if the closeEvent is accepted. If the user presses Cancel on the saveModified() dialog,
-			// the window and the application stay open.
-			ok = w->close();
-		}
-	}		
-	if (ok)
-		kapp->quit();
-}
-
 /** Opens the optionsdialog of BibleTime. */
 void BibleTime::slotSettingsOptions(){
-	COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", m_keyAccel);
+	COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", accel());
   connect(dlg, SIGNAL(signalSettingsChanged()), SLOT(slotSettingsChanged()) );
 	
 	dlg->exec();
 	dlg->delayedDestruct();
 }
 
-/** Is called when settings in the optionsdialog have been changed (ok or apply) */
+/** 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);		
- 	//refresh the bookmark items in the groupmanager		
- 	QListViewItemIterator it( m_groupmanager );
- 	CGroupManagerItem* item = 0;
+ 	m_backend->booknameLanguage(language);
+
+ 	QListViewItemIterator it( m_mainIndex );
+ 	CItemBase* item = 0;
  	for ( ; it.current(); ++it ) {
- 		if ( (item = dynamic_cast<CGroupManagerItem*>(it.current())) ) {
- 			if (item->type() == CGroupManagerItem::Bookmark) {
-					CSwordVerseKey* vKey = dynamic_cast<CSwordVerseKey*>(item->getBookmarkKey());
-					if ( vKey ) {
-						vKey->setLocale( (const char*)m_backend->booknameLanguage().local8Bit());
-						item->update();
-					}
- 			}
+ 		if ( (item = dynamic_cast<CItemBase*>(it.current())) ) {
+      item->update();
  		}
- 	}			
+  }
 
- 	for ( unsigned int index = 0; index < m_mdi->windowList().count(); index++) {
- 		CSwordPresenter* myPresenter = dynamic_cast<CSwordPresenter*>(m_mdi->windowList().at(index));
- 		if (myPresenter)
- 			myPresenter->refresh();
- 	}
+  refreshDisplayWindows();
+  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();
- 	QList<CProfile> profiles = m_profileMgr.profiles();
- 	for (CProfile* p = profiles.first(); p; p = profiles.next()) {
-		savePopup->insertItem(p->name());			
-		loadPopup->insertItem(p->name());
- 	}
+/** 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);	
-//	CTipWindow* tipDlg = new CTipWindow();
-//	tipDlg->exec();
-//	delete tipDlg;	
+	KTipDialog::showTip(this, "bibletime/tips", true);
 }
 
-
 /** Is called just before the window menu is ahown. */
 void BibleTime::slotWindowMenuAboutToShow(){
-	if (!m_windowMenu)
+	if (!m_windowMenu) {
 		return;
+  }
 
 	if ( m_windowSaveProfile_action->isPlugged() )
 		m_windowSaveProfile_action->unplug(m_windowMenu);
@@ -171,7 +171,8 @@ void BibleTime::slotWindowMenuAboutToShow(){
 	m_windowMenu->clear();
 			
 	m_windowSaveProfile_action->plug(m_windowMenu);	
-	m_windowLoadProfile_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);				
@@ -193,8 +194,8 @@ void BibleTime::slotWindowMenuAboutToShow(){
 		m_windowCloseAll_action->setEnabled( true );
 		m_windowMenu->insertSeparator();
 	} else {
-		m_windowTile_action->setEnabled( !m_windowAutoTile_action->isChecked() );
-		m_windowCascade_action->setEnabled( !m_windowAutoCascade_action->isChecked() );
+		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();		
 	}
@@ -202,8 +203,13 @@ void BibleTime::slotWindowMenuAboutToShow(){
 	QWidgetList windows = m_mdi->windowList();
 	int i, id;
 	for ( i = 0; i < int(windows.count()); ++i ) {
-		id = m_windowMenu->insertItem(QString::fromLatin1("&%1 ").arg(i+1)+windows.at(i)->caption(),
-			this, SLOT( slotWindowMenuActivated( int ) ) );
+    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) );
 	}
@@ -215,8 +221,9 @@ void BibleTime::slotAutoTile(){
 		m_windowAutoCascade_action->setChecked(false);
 		m_mdi->setGUIOption( CMDIArea::autoTile );
 	}
-	else if (!m_windowAutoCascade_action->isChecked())
-		m_mdi->setGUIOption( CMDIArea::Nothing );
+	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 */
@@ -225,8 +232,9 @@ void BibleTime::slotAutoCascade(){
 		m_windowAutoTile_action->setChecked(false);
 		m_mdi->setGUIOption( CMDIArea::autoCascade );
 	}
-	else if (!m_windowAutoTile_action->isChecked())
-		m_mdi->setGUIOption( CMDIArea::Nothing );
+	else if (!m_windowAutoTile_action->isChecked()) { //tile and cascade are enabled/disbled in  slotWindowMenuAboutToShow
+		m_mdi->setGUIOption( CMDIArea::Nothing );    
+  }
 }
 
 void BibleTime::slotWindowMenuActivated( int id ) {
@@ -250,24 +258,22 @@ void BibleTime::slotToggleToolbar(){
 
 /** Shows or hides the groupmanager. */
 void BibleTime::slotToggleGroupManager() {
-	if (m_viewGroupManager_action->isChecked())
-		m_groupmanager->show();
-	else
-		m_groupmanager->hide();
+	if (m_viewMainIndex_action->isChecked()) {
+		m_mainIndex->show();
+  }
+	else {
+		m_mainIndex->hide();
+  }
 }
 
 /** Opens a toolbar editor */
-void BibleTime::slotSettingsToolbar(){	
+void BibleTime::slotSettingsToolbar(){
 	KEditToolbar dlg(actionCollection());
-	if (dlg.exec())
+	if (dlg.exec()) {
 		createGUI();
+  }
 }
 
-/** The last window was closed! */
-void BibleTime::lastWindowClosed(){
-}
-
-
 /** Opens the print dialog. */
 void BibleTime::slotFilePrint(){
 	m_printer->setup(this);	//opens the printer dialog
@@ -275,7 +281,7 @@ void BibleTime::slotFilePrint(){
 
 /** Enables the "Clear printer queue" action */
 void BibleTime::slotSetPrintingStatus(){
-	const bool enable = (m_printer->printQueue().count()>0);
+	const bool enable = (m_printer->queue().count() > 0);
 	m_filePrint_action->setEnabled( enable );
 	m_fileClearQueue_action->setEnabled( enable );
 }
@@ -286,6 +292,7 @@ void BibleTime::slotPrintingStarted(){
 	connect(m_progress, SIGNAL(cancelled()), SLOT(slotAbortPrinting()));
 	m_progress->setProgress(0);
 	m_progress->setMinimumDuration(0);
+  m_progress->setCaption("BibleTime");
 	m_progress->show();
 }
 
@@ -308,60 +315,74 @@ void BibleTime::slotAbortPrinting(){
 		slotPrintingFinished();
 }
 
-void BibleTime::openOnlineHelp_Handbook() {
-//#ifdef STATIC_BUILD
-//	CHTMLDialog dlg("bibletime/handbook/index.html");
-//	dlg.exec();
-//#else
-	if (m_helpMenu)
-//		m_helpMenu->appHelpActivated();
-		kapp->invokeHTMLHelp("bibletime/handbook/index.html");
-//#endif
+
+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);
 }
-void BibleTime::openOnlineHelp_Install() {
-//#ifdef STATIC_BUILD
-//	CHTMLDialog dlg("bibletime/install/index.html");
-//	dlg.exec();
-//#else
-	kapp->invokeHTMLHelp("bibletime/install/index.html");
-//#endif
+
+/* 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() {
-//#ifdef STATIC_BUILD
-//	CHTMLDialog dlg("bibletime/howto/index.html");
-//	dlg.exec();
-//#else
-	kapp->invokeHTMLHelp("bibletime/howto/index.html");
-//#endif
+  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();
-	CProfile* p = m_profileMgr.profile( popup->text(ID) );
-	if (p)
+
+  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)
+	if (!profile) {
 		return;
+  }
 
 	//save mainwindow settings
 	storeProfileSettings(profile);
 			
 	QWidgetList windows = m_mdi->windowList();
-	QList<CProfileWindow> profileWindows;
+	QPtrList<CProfileWindow> profileWindows;
 	for (QWidget* w = windows.first(); w; w = windows.next()) {
-		CSwordPresenter* displayWindow = dynamic_cast<CSwordPresenter*>(w);
-		if (!displayWindow)
+		CDisplayWindow* displayWindow = dynamic_cast<CDisplayWindow*>(w);
+		if (!displayWindow) {
 			continue;
+    }
 
 		CProfileWindow* profileWindow = new CProfileWindow();
-		displayWindow->storeSettings(profileWindow);
+		displayWindow->storeProfileSettings(profileWindow);
 		profileWindows.append(profileWindow);
 	}
 	profile->save(profileWindows);
@@ -371,59 +392,111 @@ void BibleTime::saveProfile(CProfile* profile){
 	profileWindows.clear();
 }
 
-void BibleTime::loadProfile(int ID){
-	m_mdi->setUpdatesEnabled(false);
-	m_mdi->deleteAll();
-	
-	m_mdi->setUpdatesEnabled(false);
+void BibleTime::loadProfile(int ID){	
 	KPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
-	CProfile* p = m_profileMgr.profile( popup->text(ID) );
-	if (p)
-		loadProfile(p);
+  if ( CProfile* p = m_profileMgr.profile( popup->text(ID) ) ) {
+    m_mdi->deleteAll();
 
-	m_mdi->setUpdatesEnabled(true);	
+    loadProfile(p);
+  }
 }
 
 void BibleTime::loadProfile(CProfile* p){
 	if (!p)
-		return;		
-	QList<CProfileWindow> windows = p->load();
+		return;
+    
+  QPtrList<CProfileWindow> windows = p->load();
 
 	//load mainwindow setttings
 	applyProfileSettings(p);
-		
-	for (CProfileWindow* w = windows.first(); w; w = windows.next()) {
-		const QString key = w->key();		
+
+	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 ) {
-			CSwordModuleInfo* m = m_backend->findModuleByName(*it);
-			if (m)
+			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()) );
 		}
-		if (!modules.count()) //are the modules still installed?
-			continue;		
-		
-		if (CSwordPresenter* displayWindow = createNewSwordPresenter(modules, key)) {
-			displayWindow->applySettings(w);
+    else { //create a read window
+      displayWindow = createReadDisplayWindow(modules, key);
 		}
-	}	
-	
-	m_mdi->setUpdatesEnabled(true);	
+    
+    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 (m_windowFullscreen_action->isChecked())
-		showFullScreen();
-	else
-		showNormal();
+//  if (!isVisible())
+//    return;
+  
+	if (m_windowFullscreen_action->isChecked()) {
+ 		showFullScreen();
+  }
+	else if (isVisible()){
+    showNormal();
+  }
 }
 
 void BibleTime::editProfiles(){
-	COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", m_keyAccel);
+	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
new file mode 100644
index 0000000..d5ed628
--- /dev/null
+++ b/bibletime/bibletimeapp.cpp
@@ -0,0 +1,36 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..28a3a5e
--- /dev/null
+++ b/bibletime/bibletimeapp.h
@@ -0,0 +1,36 @@
+/***************************************************************************
+                          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/bt-printing b/bibletime/bt-printing
deleted file mode 100644
index f7ccf57..0000000
--- a/bibletime/bt-printing
+++ /dev/null
@@ -1,98 +0,0 @@
-[Black&White__DESCRIPTION]
-Alignement=2
-BGColor=255,255,255
-FGColor=0,0,0
-Font=helvetica,9,5,0,50,0
-Identation=0
-has frame=false
-isEnabled=true
-[Black&White__HEADER]
-Alignement=1
-BGColor=0,0,0
-FGColor=255,255,255
-Font=helvetica,9,5,0,50,0
-Identation=0
-has frame=false
-isEnabled=true
-[Black&White__MODULETEXT]
-Alignement=0
-BGColor=255,255,255
-FGColor=0,0,0
-Font=helvetica,9,5,0,50,0
-Identation=0
-has frame=true
-isEnabled=true
-[Black&White__MODULETEXT__FRAME]
-Color=0,0,0
-Thickness=2
-[Rainbow__DESCRIPTION]
-Alignement=2
-BGColor=255,255,213
-FGColor=255,148,8
-Font=helvetica,9,5,0,50,0
-Identation=0
-has frame=false
-isEnabled=true
-[Rainbow__HEADER]
-Alignement=0
-BGColor=255,255,255
-FGColor=255,148,8
-Font=helvetica,9,5,0,50,0
-Identation=0
-has frame=true
-isEnabled=true
-[Rainbow__HEADER__FRAME]
-Color=42,156,213
-Thickness=1
-[Rainbow__MODULETEXT]
-Alignement=0
-BGColor=255,255,255
-FGColor=0,0,0
-Font=futura,13,5,0,50,0
-Identation=0
-has frame=true
-isEnabled=true
-[Rainbow__MODULETEXT__FRAME]
-Color=42,156,213
-Thickness=1
-[Settings]
-Filename=
-Paper size=0
-Printer=lp
-left margin=39
-lower margin=39
-preview application=gv
-right margin=39
-upper margin=39
-[Standard__DESCRIPTION]
-Alignement=24
-BGColor=255,255,255
-FGColor=0,0,0
-Font=helvetica,10,5,0,0,0
-Identation=0
-has frame=false
-isEnabled=true
-[Standard__HEADER]
-Alignement=2
-BGColor=255,255,255
-FGColor=0,0,192
-Font=futura,16,5,0,75,0
-Identation=8
-has frame=true
-isEnabled=true
-[Standard__HEADER__FRAME]
-Color=0,0,0
-Thickness=1
-[Standard__MODULETEXT]
-Alignement=0
-BGColor=220,220,220
-FGColor=0,0,0
-Font=arial,14,5,0,0,0
-Identation=0
-has frame=true
-isEnabled=true
-[Standard__MODULETEXT__FRAME]
-Color=128,128,128
-Thickness=1
-[Styles]
-styles=Standard,Black&White,Rainbow
diff --git a/bibletime/dirlist b/bibletime/dirlist
new file mode 100644
index 0000000..08e65ca
--- /dev/null
+++ b/bibletime/dirlist
@@ -0,0 +1,7 @@
+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
index eb504bf..163e94b 100644
--- a/bibletime/frontend/Makefile.am
+++ b/bibletime/frontend/Makefile.am
@@ -3,41 +3,45 @@ libfrontend_a_METASOURCES = AUTO
 noinst_LIBRARIES = libfrontend.a
 
 libfrontend_a_SOURCES = \
-chtmldialog.cpp \
-chtmlwidget.cpp \
-ctoolclass.cpp \
+btinstallmgr.cpp \
 cbtconfig.cpp \
 cinputdialog.cpp \
 coptionsdialog.cpp \
+cswordsetupdialog.cpp \
 cprofilemgr.cpp \
 cprofile.cpp \
 cprofilewindow.cpp \
 cexportmanager.cpp \
 cmdiarea.cpp \
 kstartuplogo.cpp \
-cpointers.cpp
+ctooltipmanager.cpp \
+ctooltip.cpp \
+cdragdropmgr.cpp
 
-all_headers=cmdiarea.h \
-kstartuplogo.h \
-chtmlwidget.h \
-chtmldialog.h \
-ctoolclass.h \
+all_headers = cmdiarea.h \
+btinstallmgr.h \
 cbtconfig.h \
 cinputdialog.h \
+coptionsdialog.h \
+cswordsetupdialog.h \
 cprofilemgr.h \
 cprofile.h \
 cprofilewindow.h \
-cpointers.h \
-cexportmanager.h
+cexportmanager.h \
+cmdiarea.h \
+kstartuplogo.h \
+ctooltipmanager.h \
+ctooltip.h \
+cdragdropmgr.h
 
 EXTRA_DIST = $(libfrontend_a_SOURCES) $(all_headers)
 
 SUBDIRS = \
-groupmanager \
+mainindex \
 keychooser \
-presenters \
-searchdialog \
-thirdparty
+displaywindow \
+display \
+searchdialog
 
 
 
diff --git a/bibletime/frontend/Makefile.in b/bibletime/frontend/Makefile.in
index f212e71..6847af6 100644
--- a/bibletime/frontend/Makefile.in
+++ b/bibletime/frontend/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,161 +229,275 @@ 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@
-micodir = @micodir@
+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 =  chtmldialog.cpp chtmlwidget.cpp ctoolclass.cpp cbtconfig.cpp cinputdialog.cpp coptionsdialog.cpp cprofilemgr.cpp cprofile.cpp cprofilewindow.cpp cexportmanager.cpp cmdiarea.cpp kstartuplogo.cpp cpointers.cpp
-
-
-all_headers = cmdiarea.h kstartuplogo.h chtmlwidget.h chtmldialog.h ctoolclass.h cbtconfig.h cinputdialog.h cprofilemgr.h cprofile.h cprofilewindow.h cpointers.h cexportmanager.h
+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 =  groupmanager keychooser presenters searchdialog thirdparty
+SUBDIRS = \
+mainindex \
+keychooser \
+displaywindow \
+display \
+searchdialog
 
+subdir = bibletime/frontend
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libfrontend_a_LIBADD = 
-#>- libfrontend_a_OBJECTS =  chtmldialog.$(OBJEXT) chtmlwidget.$(OBJEXT) \
-#>- ctoolclass.$(OBJEXT) cbtconfig.$(OBJEXT) cinputdialog.$(OBJEXT) \
-#>- coptionsdialog.$(OBJEXT) cprofilemgr.$(OBJEXT) cprofile.$(OBJEXT) \
-#>- cprofilewindow.$(OBJEXT) cexportmanager.$(OBJEXT) cmdiarea.$(OBJEXT) \
-#>- kstartuplogo.$(OBJEXT) cpointers.$(OBJEXT)
-#>+ 10
+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 = chtmldialog.$(OBJEXT) chtmlwidget.$(OBJEXT) \
-ctoolclass.$(OBJEXT) cbtconfig.$(OBJEXT) cinputdialog.$(OBJEXT) \
-coptionsdialog.$(OBJEXT) cprofilemgr.$(OBJEXT) cprofile.$(OBJEXT) \
-cprofilewindow.$(OBJEXT) cexportmanager.$(OBJEXT) cmdiarea.$(OBJEXT) \
-kstartuplogo.$(OBJEXT) cpointers.$(OBJEXT)\
-cinputdialog.moc.o cmdiarea.moc.o coptionsdialog.moc.o chtmldialog.moc.o chtmlwidget.moc.o  \
-libfrontend_a_meta_unload.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)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=chtmlwidget.h cexportmanager.h cprofilewindow.h cpointers.h cmdiarea.h ctoolclass.h coptionsdialog.h chtmldialog.h cprofilemgr.h cprofile.h kstartuplogo.h cbtconfig.h cinputdialog.h 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/cbtconfig.P .deps/cexportmanager.P \
-#>- .deps/chtmldialog.P .deps/chtmlwidget.P .deps/cinputdialog.P \
-#>- .deps/cmdiarea.P .deps/coptionsdialog.P .deps/cpointers.P \
-#>- .deps/cprofile.P .deps/cprofilemgr.P .deps/cprofilewindow.P \
-#>- .deps/ctoolclass.P .deps/kstartuplogo.P
-#>+ 12
-@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cinputdialog.moc.P $(DEPDIR)/cmdiarea.moc.P $(DEPDIR)/coptionsdialog.moc.P $(DEPDIR)/chtmldialog.moc.P $(DEPDIR)/chtmlwidget.moc.P $(DEPDIR)/libfrontend_a_meta_unload.P  $(DEPDIR)/libfrontend_a.all_cpp.P \
-	  .deps/cbtconfig.P .deps/cexportmanager.P \
-.deps/chtmldialog.P .deps/chtmlwidget.P .deps/cinputdialog.P \
-.deps/cmdiarea.P .deps/coptionsdialog.P .deps/cpointers.P \
-.deps/cprofile.P .deps/cprofilemgr.P .deps/cprofilewindow.P \
-.deps/ctoolclass.P .deps/kstartuplogo.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cinputdialog.moc.P $(DEPDIR)/cmdiarea.moc.P $(DEPDIR)/coptionsdialog.moc.P $(DEPDIR)/chtmldialog.moc.P $(DEPDIR)/chtmlwidget.moc.P $(DEPDIR)/libfrontend_a_meta_unload.P   .deps/cbtconfig.P .deps/cexportmanager.P \
-.deps/chtmldialog.P .deps/chtmlwidget.P .deps/cinputdialog.P \
-.deps/cmdiarea.P .deps/coptionsdialog.P .deps/cpointers.P \
-.deps/cprofile.P .deps/cprofilemgr.P .deps/cprofilewindow.P \
-.deps/ctoolclass.P .deps/kstartuplogo.P
 
+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)
-OBJECTS = $(libfrontend_a_OBJECTS)
 
-#>- all: all-redirect
+#>- all: all-recursive
 #>+ 1
-all: docs-am  all-redirect
+all: docs-am  all-recursive
+
 .SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/Makefile
+.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: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
+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)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+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 *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
+@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@
 
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
 
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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
@@ -365,19 +506,8 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
-
-maintainer-clean-libtool:
-
-libfrontend.a: $(libfrontend_a_OBJECTS) $(libfrontend_a_DEPENDENCIES)
-	-rm -f libfrontend.a
-	$(AR) cru libfrontend.a $(libfrontend_a_OBJECTS) $(libfrontend_a_LIBADD)
-	$(RANLIB) libfrontend.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
+	-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.
@@ -385,13 +515,8 @@ libfrontend.a: $(libfrontend_a_OBJECTS) $(libfrontend_a_DEPENDENCIES)
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -411,13 +536,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -433,288 +563,349 @@ 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)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+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
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-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)
 
-subdir = bibletime/frontend
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/frontend/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
 check-am: all-am
 check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
+all-am: Makefile $(LIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
 
-install-data-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
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
 
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-#>- clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-moc-classes clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
+	@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
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
+#>- 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
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+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
-cinputdialog.moc.cpp: $(srcdir)/cinputdialog.h
-	$(MOC) $(srcdir)/cinputdialog.h -o cinputdialog.moc.cpp
+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
 
-#>+ 3
-coptionsdialog.moc.cpp: $(srcdir)/coptionsdialog.h
-	$(MOC) $(srcdir)/coptionsdialog.h -o coptionsdialog.moc.cpp
+#>+ 2
+mocs: cmdiarea.moc.cpp
 
 #>+ 3
-chtmldialog.moc.cpp: $(srcdir)/chtmldialog.h
-	$(MOC) $(srcdir)/chtmldialog.h -o chtmldialog.moc.cpp
+cswordsetupdialog.moc.cpp: $(srcdir)/cswordsetupdialog.h
+	$(MOC) $(srcdir)/cswordsetupdialog.h -o cswordsetupdialog.moc.cpp
+
+#>+ 2
+mocs: cswordsetupdialog.moc.cpp
 
 #>+ 3
-chtmlwidget.moc.cpp: $(srcdir)/chtmlwidget.h
-	$(MOC) $(srcdir)/chtmlwidget.h -o chtmlwidget.moc.cpp
+cinputdialog.moc.cpp: $(srcdir)/cinputdialog.h
+	$(MOC) $(srcdir)/cinputdialog.h -o cinputdialog.moc.cpp
+
+#>+ 2
+mocs: cinputdialog.moc.cpp
 
 #>+ 3
 clean-metasources:
-	-rm -f  cinputdialog.moc.cpp cmdiarea.moc.cpp coptionsdialog.moc.cpp chtmldialog.moc.cpp chtmlwidget.moc.cpp
+	-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:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  bibletime/frontend/Makefile
 	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/Makefile.in
 
 
-#>+ 10
-libfrontend_a_meta_unload.cpp:  cinputdialog.moc.cpp cmdiarea.moc.cpp chtmlwidget.moc.cpp chtmldialog.moc.cpp coptionsdialog.moc.cpp
-	@echo 'creating libfrontend_a_meta_unload.cpp'
-	@-rm -f libfrontend_a_meta_unload.cpp
-	@echo 'static const char * _metalist_libfrontend_a[] = {' > libfrontend_a_meta_unload.cpp
-	@cat  cinputdialog.moc.cpp cmdiarea.moc.cpp chtmlwidget.moc.cpp chtmldialog.moc.cpp coptionsdialog.moc.cpp | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libfrontend_a_meta_unload.cpp
-	@echo '0};' >> libfrontend_a_meta_unload.cpp
-	@echo '#include <kunload.h>' >> libfrontend_a_meta_unload.cpp
-	@echo '_UNLOAD(libfrontend_a)' >> libfrontend_a_meta_unload.cpp
-
+#>+ 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
 
-#>+ 3
-clean-moc-classes:
-	-rm -f  libfrontend_a_meta_unload.cpp
 
 #>+ 11
-libfrontend_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chtmldialog.cpp $(srcdir)/chtmlwidget.cpp $(srcdir)/ctoolclass.cpp $(srcdir)/cbtconfig.cpp $(srcdir)/cinputdialog.cpp $(srcdir)/coptionsdialog.cpp $(srcdir)/cprofilemgr.cpp $(srcdir)/cprofile.cpp $(srcdir)/cprofilewindow.cpp $(srcdir)/cexportmanager.cpp $(srcdir)/cmdiarea.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/cpointers.cpp libfrontend_a_meta_unload.cpp  cinputdialog.moc.cpp cmdiarea.moc.cpp coptionsdialog.moc.cpp chtmldialog.moc.cpp chtmlwidget.moc.cpp
+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 chtmldialog.cpp chtmlwidget.cpp ctoolclass.cpp cbtconfig.cpp cinputdialog.cpp coptionsdialog.cpp cprofilemgr.cpp cprofile.cpp cprofilewindow.cpp cexportmanager.cpp cmdiarea.cpp kstartuplogo.cpp cpointers.cpp libfrontend_a_meta_unload.cpp  cinputdialog.moc.cpp cmdiarea.moc.cpp coptionsdialog.moc.cpp chtmldialog.moc.cpp chtmlwidget.moc.cpp; do \
+	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; \
+	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
 
-#>+ 2
+#>+ 3
 final:
 	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_final_OBJECTS)" all-am
-#>+ 2
+
+#>+ 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) -f $(top_srcdir)/admin/Makefile.common 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
new file mode 100644
index 0000000..8e11278
--- /dev/null
+++ b/bibletime/frontend/btinstallmgr.cpp
@@ -0,0 +1,295 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..5f7debb
--- /dev/null
+++ b/bibletime/frontend/btinstallmgr.h
@@ -0,0 +1,98 @@
+/***************************************************************************
+                          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
index 7147093..9df717b 100644
--- a/bibletime/frontend/cbtconfig.cpp
+++ b/bibletime/frontend/cbtconfig.cpp
@@ -17,6 +17,9 @@
 
 //BibleTime includes
 #include "cbtconfig.h"
+#include "backend/cswordmoduleinfo.h"
+#include "util/cpointers.h"
+
 
 //Qt includes
 #include <qapplication.h>
@@ -25,10 +28,12 @@
 #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.
@@ -36,15 +41,16 @@
 
 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 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";
+		case standardHebrewMorphLexicon:	  return "standardHebrewMorphLexicon";
+		case standardGreekMorphLexicon:		  return "standardGreekMorphLexicon";
 	}
 	return QString::null;
 }
@@ -52,101 +58,24 @@ const QString CBTConfig::getKey( const CBTConfig::strings ID){
 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
+		// 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 "Eastons";
-		case standardHebrewStrongsLexicon: return "StrongsHebrew";
+		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
+		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::fonts ID){
-	switch ( ID ){
-		case standard: 	return "standard";
-		case unicode: 	return "unicode";
-	}
-	return QString::null;	
-}
-
-const QFont CBTConfig::getDefault( const CBTConfig::fonts ID){
-	switch ( ID ){
-		case standard: 	return QApplication::font();
-		case unicode: //find an Unicode font
-		{	
-			KCharsets* cs = KGlobal::charsets();
-			QFontDatabase db;
-			QFont uniFont;
-			if (!cs->isAvailable(QFont::Unicode)) { //no unicode font installed!
-				qWarning("NO UNICODE FONT INSTALLED!");
-			}			
-			cs->setQFont(uniFont, QFont::Unicode);
-//			qWarning("the unicode font found by KDE is %s", uniFont.family().latin1());
-			
-//			QStringList families = KGlobal::charsets()->availableFamilies(QFont::Unicode);
-//			for (QStringList::Iterator it = families.begin();it != families.end();++it) {
-//				qWarning((*it).latin1());
-//				if (!cs->hasUnicode(*it))
-//					qWarning("font %s DOESN'T have UNICODE!", (*it).latin1());				
-//			}			
-//
-//			QMap<QString, int> uniFontMap;
-//			for (QStringList::Iterator it = families.begin();it != families.end();++it) {
-//				const QString font = *it;
-//				if (db.isScalable(font)) {
-//					if (db.isSmoothlyScalable(font)) {
-//						qWarning("font %s is SMOOTHLY scalable!", font.latin1());								
-//					}
-//					else if (db.isBitmapScalable(font)) {
-//						qWarning("font %s is BITMAP scalable!", font.latin1());								
-//					}
-//					else {
-//						qWarning("font %s is SMOOTHLY scalable!", font.latin1());								
-//					}					
-//				}
-//				
-//				//find how many charsets are supported!
-//				QList<QFont::CharSet> fonts = cs->availableCharsets(font);//db.charSets(font).count()				
-//				uniFontMap.insert(font, fonts.count());
-//				
-//				fonts.setAutoDelete(true);
-//				fonts.clear();
-//			}
-//			
-//			//now find the unicode font with the most charsets
-//			QString bestFont = uniFont.family();
-//			int oldCount = 0;
-//			for (QMap<QString, int>::Iterator it = uniFontMap.begin(); it != uniFontMap.end(); ++it) {			
-//				if (it.data() > oldCount) {
-//					oldCount = it.data();
-//					bestFont = it.key();
-//				}
-//			}
-//			qWarning("the best font is %s and supports %i charsets", bestFont.latin1(), oldCount);
-			
-//			qWarning("--------");			
-//			QStringList fonts = db.families(false);
-//			for (QStringList::Iterator it = fonts.begin();it != fonts.end();++it) {
-//				QStringList charsets = db.charSets(*it);
-//				for (QStringList::Iterator cs = charsets.begin(); cs != charsets.end(); ++cs) {
-//					qWarning("Font %s has charset %s", (*it).latin1(), (*cs).latin1());
-//				}
-//			}
-//			qWarning("--------");						
-			return uniFont;
-		}
-		
-	}
-	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";
@@ -156,16 +85,6 @@ const QString CBTConfig::getKey( const CBTConfig::bools ID){
 
 		case lexiconCache: 				return "lexicon_chache";
 
-		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 lineBreaks: 					return "lineBreaks";
 		case verseNumbers: 				return "verseNumbers";
 		case scroll:			 				return "scroll";
@@ -173,13 +92,33 @@ const QString CBTConfig::getKey( const CBTConfig::bools ID){
 		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;
@@ -189,31 +128,41 @@ const bool CBTConfig::getDefault( const CBTConfig::bools ID){
 
 		case lexiconCache: 				return true;
 
-		case footnotes: 					return true;
-		case strongNumbers:  			return false;
-  	case headings: 						return true;
-  	case morphTags: 					return false;
-		case lemmas: 							return false;
-		case hebrewPoints: 				return false;
-		case hebrewCantillation: 	return false;
-		case greekAccents: 				return false;
-		case textualVariants:			return false;
-
-		case lineBreaks: 					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 false;
+		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";
@@ -227,12 +176,13 @@ const QString CBTConfig::getKey( const CBTConfig::colors ID){
 const QColor CBTConfig::getDefault( const CBTConfig::colors ID){
 	switch ( ID ){
 		case textColor: 							return QColor(Qt::black);
-		case backgroundColor: 				return QColor(Qt::white);
+		case backgroundColor: 				return QColor(QString::fromLatin1("#fffaee"));
+		case background2Color: 				return QColor(QString::fromLatin1("#f1f1f1"));
 		case highlightedVerseColor:		return QColor(Qt::red);
-		case footnotesColor: 					return QColor(Qt::black);
-		case strongsColor: 						return QColor(Qt::green);
-		case morphsColor: 						return QColor(Qt::green);
-		case jesuswordsColor: 				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;
@@ -254,42 +204,101 @@ const QValueList<int> CBTConfig::getDefault( const CBTConfig::intLists ID){
 
 const QString CBTConfig::getKey( const CBTConfig::stringLists ID){
 	switch ( ID ){
-		case searchCompletionTexts: return QString::fromLatin1("searchCompletionTexts");
-		case searchTexts: return QString::fromLatin1("searchTexts");
+		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:
-			return QStringList();
+		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 QFont CBTConfig::get(const CBTConfig::fonts ID){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "fonts");
-	QFont defaultFont = getDefault(ID);
-	return config->readFontEntry(getKey(ID), &defaultFont);
-}
-
 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");		
+	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");
@@ -297,7 +306,7 @@ const QColor CBTConfig::get( const CBTConfig::colors ID){
 	return config->readColorEntry(getKey(ID),&defaultColor);
 }
 
-const QValueList<int>	CBTConfig::get( const CBTConfig::intLists ID ){
+const QValueList<int> CBTConfig::get( const CBTConfig::intLists ID ){
 	KConfig* config = KGlobal::config();
 	KConfigGroupSaver groupSaver(config, "lists");
 	return config->readIntListEntry(getKey(ID));
@@ -305,19 +314,55 @@ const QValueList<int>	CBTConfig::get( const CBTConfig::intLists ID ){
 
 const QStringList	CBTConfig::get( const CBTConfig::stringLists ID ){
 	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "lists");
+	KConfigGroupSaver groupSaver(config, "stringlists");
 	return config->readListEntry(getKey(ID));
 }
 
-void CBTConfig::set( const CBTConfig::strings ID, const QString value ){
+const CBTConfig::StringMap CBTConfig::get( const CBTConfig::stringMaps ID ){
 	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "strings");
-	config->writeEntry(getKey(ID), value);
+	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);
 }
 
-void CBTConfig::set( const CBTConfig::fonts ID, const QFont value ){
+const CBTConfig::FontSettingsPair	CBTConfig::get( const CLanguageMgr::Language& language ){
 	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "fonts");
+	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);
 }
 
@@ -328,6 +373,12 @@ void CBTConfig::set(const  CBTConfig::bools ID,const  bool value ){
 	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");
@@ -342,24 +393,73 @@ void CBTConfig::set( const CBTConfig::intLists ID, const QValueList<int> value )
 
 void CBTConfig::set( const CBTConfig::stringLists ID, const QStringList value ){
 	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "lists");
+	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::DisplayOptionsBool CBTConfig::getDisplayOptionDefaults(){
-  CSwordBackend::DisplayOptionsBool options;
+const CSwordBackend::DisplayOptions CBTConfig::getDisplayOptionDefaults(){
+  CSwordBackend::DisplayOptions options;
 
-	options.lineBreaks = 		get(CBTConfig::lineBreaks);
+	options.lineBreaks   = 	get(CBTConfig::lineBreaks);
   options.verseNumbers = 	get(CBTConfig::verseNumbers);
 
 	return options;
 }
 
-const CSwordBackend::FilterOptionsBool CBTConfig::getFilterOptionDefaults(){
+const CSwordBackend::FilterOptions CBTConfig::getFilterOptionDefaults(){
 
-  CSwordBackend::FilterOptionsBool options;
+  CSwordBackend::FilterOptions options;
 
   options.footnotes =						get(CBTConfig::footnotes);
   options.strongNumbers = 			get(CBTConfig::strongNumbers);
@@ -369,6 +469,68 @@ const CSwordBackend::FilterOptionsBool CBTConfig::getFilterOptionDefaults(){
   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
index 425a6fc..d55ac33 100644
--- a/bibletime/frontend/cbtconfig.h
+++ b/bibletime/frontend/cbtconfig.h
@@ -22,32 +22,41 @@
 #include <qcolor.h>
 #include <qfont.h>
 #include <qvaluelist.h>
+#include <qmap.h>
 
 #include "backend/cswordbackend.h"
-/**This class is the interface to the config object of BibleTime
-  *@author The BibleTime team
-  */
+#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:
-	enum strings{
+  typedef QMap<QString, QString> StringMap;
+	enum strings {
 		bibletimeVersion,
 		language,
 		standardBible,
 		standardCommentary,
 		standardLexicon,
+		standardDailyDevotional,    
 		standardHebrewStrongsLexicon,
 		standardGreekStrongsLexicon,
 		standardHebrewMorphLexicon,
 		standardGreekMorphLexicon
 	};
-	enum fonts{
-		standard,
-		unicode
-	};
-	enum colors{
+//	enum fonts {
+//		standard,
+//		unicode
+//	};
+	enum colors {
 		textColor,
 		backgroundColor,
+		background2Color,
 		highlightedVerseColor,
 		footnotesColor,
 		strongsColor,
@@ -55,8 +64,9 @@ public:
 		jesuswordsColor,
 		swordRefColor  //SWORD hyperlink
 	};
-	enum bools{
+	enum bools {
 		firstSearchDialog,
+    readOldBookmarks,
 
 		toolbar,
 		mainIndex,
@@ -66,6 +76,17 @@ public:
 
 		lexiconCache,
 
+		lineBreaks,
+		verseNumbers,
+		scroll,
+
+		tips,
+		logo,
+		restoreWorkspace,
+    crashedLastTime,
+    crashedTwoTimes
+	};
+	enum ints {
   	footnotes,
   	strongNumbers,
   	headings,
@@ -75,56 +96,74 @@ public:
 		hebrewCantillation,
 		greekAccents,
 		textualVariants,
-
-		lineBreaks,
-		verseNumbers,
-		scroll,
-
-		tips,
-		logo,
-		restoreWorkspace
-	};
-	enum intLists{
+    transliteration,
+    scriptureReferences
+  };
+  enum intLists {
 		splitterSizes
 	};
-	enum stringLists{
+	enum stringLists {
 		searchCompletionTexts,
-		searchTexts		
+		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 QFont 			get( const CBTConfig::fonts );
   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 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::fonts, 		const QFont 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 CSwordBackend::FilterOptionsBool getFilterOptionDefaults();
-  static const CSwordBackend::DisplayOptionsBool getDisplayOptionDefaults();
-
+  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::fonts );
 	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 				 getDefault( const CBTConfig::strings );
-	static const QFont	 				 getDefault( const CBTConfig::fonts );
-	static const bool		 				 getDefault( const CBTConfig::bools );
-	static const QColor	 				 getDefault( const CBTConfig::colors );
-	static const QValueList<int> getDefault( const CBTConfig::intLists );
-	static const QStringList		 getDefault( const CBTConfig::stringLists );
+	static const QString getKey( const CBTConfig::stringMaps );
+	static const QString getKey( const CLanguageMgr::Language& );    
 };
 
 
diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp
new file mode 100644
index 0000000..6707772
--- /dev/null
+++ b/bibletime/frontend/cdragdropmgr.cpp
@@ -0,0 +1,271 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..41d01c5
--- /dev/null
+++ b/bibletime/frontend/cdragdropmgr.h
@@ -0,0 +1,160 @@
+/***************************************************************************
+                          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
index 641538f..cdf971a 100644
--- a/bibletime/frontend/cexportmanager.cpp
+++ b/bibletime/frontend/cexportmanager.cpp
@@ -16,172 +16,306 @@
  ***************************************************************************/
 
 #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"
-#include "ctoolclass.h"
 
 //Qt includes
-#include <qprogressdialog.h>
 #include <qclipboard.h>
+#include <qptrlist.h>
+#include <qprogressdialog.h>
 
 //KDE includes
+#include <kprogress.h>
 #include <kfiledialog.h>
 #include <klocale.h>
-#include <kapp.h>
+#include <kapplication.h>
 
 //Sword includes
 #include <swkey.h>
 #include <listkey.h>
 
-/** Saves the key to disk. */
-const bool CExportManager::saveKey( CSwordKey* key, const bool withText ) {
-	const QString file = KFileDialog::getSaveFileName(QString::null, i18n("*.txt | Text files\n *.* | All files (*.*)"), 0, i18n("Save search result ..."));
-  if (key && !file.isEmpty()) {
-		QString text = QString::fromLatin1("%1").arg(key->key());
-		if (withText)
-			text += QString::fromLatin1("\n\t%1").arg(key->strippedText());
-		CToolClass::savePlainFile(file, text);		
-		return true;
+
+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;
-}
+};
 
-/** Saves the key to disk. */
-const bool CExportManager::saveKeyList( ListKey* list, CSwordModuleInfo* module, const QString& label, const bool withText, const bool showProgress ){
-	bool ret = false;
-	const QString file = KFileDialog::getSaveFileName(QString::null, i18n("*.txt | Text files\n *.* | All files (*.*)"), 0, i18n("Save search result ..."));
-	if (!file.isEmpty()) {
-		QProgressDialog progress( label, i18n("Cancel"), list->Count(), 0,"progress", true );	
-		progress.setProgress(0);	
-		progress.setMinimumDuration(10);	
-		progress.show();
-	
-		util::scoped_ptr<CSwordKey> key(CSwordKey::createInstance(module));
-	
-		QString text;	
-		int index = 0;
-		*list = TOP;
-		while (!list->Error() && !progress.wasCancelled()) {
-			key->key((const char*)(*list));
-			if (!key)
-				break;
-			progress.setProgress(index++);
-			KApplication::kApplication()->processEvents(10); //do not lock the GUI!																		
-		
-			if (withText)
-				text += QString::fromLatin1("%1:\n\t%2\n").arg( key->key() ).arg( key->strippedText() );
-			else
-				text += key->key() + "\n";
-
-			(*list)++;
-		}	
-		if (!progress.wasCancelled()) {
-			progress.setProgress(index);	
-			CToolClass::savePlainFile(file, text);
-			ret = true;
-		}
-	}
-	
-	return ret;
-}
+const bool CExportManager::saveKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText ) {
+  if (!list.count())
+    return false;
 
-const bool CExportManager::saveKeyList( QList<CSwordKey>& list, CSwordModuleInfo* module, const QString& label, const bool withText, const bool showProgress ){
-	bool ret = false;
-	const QString file = KFileDialog::getSaveFileName(QString::null, i18n("*.txt | Text files\n *.* | All files (*.*)"), 0, i18n("Save search result ..."));	
-	if (!file.isEmpty()){
-	
-		QProgressDialog progress( label, i18n("Cancel"), list.count(), 0,"progress", true );	
-		progress.setProgress(0);	
-		progress.setMinimumDuration(10);	
-		progress.show();
-
-		QString text;	
-		CSwordKey* key = 0;
-		for (list.first(); list.current(); list.next()) {
-			key = list.current();
-			if (!key)
-				break;
-			progress.setProgress(list.at());
-			KApplication::kApplication()->processEvents(10); //do not lock the GUI!
-			
-			if (withText)
-				text += QString::fromLatin1("%1:\n\t%2\n").arg( key->key() ).arg( key->strippedText() );
-			else
-				text += key->key() + "\n";
+	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() );
 		}
-		
-		if (!progress.wasCancelled()) {
-			progress.setProgress(list.count());	
-			CToolClass::savePlainFile(file, text);
+ 		else {
+ 			text += k->key() + lineBreak(format);
 		}
-	}
-	
-	return ret;
-}
+    incProgress();
+  };
 
+  if (!progressWasCancelled()) {
+ 		CToolClass::savePlainFile(filename, text);
+ 		closeProgressDialog();
+ 		return true;
+ 	}
+  return false;
+};
 
-///////// copy functions
-const bool CExportManager::copyKey( CSwordKey* key, const bool withText ) {
-	bool ret = true;
-	QString text = (withText) ? QString::fromLatin1("%1:\n\t%2").arg(key->key()).arg(key->strippedText()) : key->key()+"\n";
+const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bool addText) {
+  if (!key)
+    return false;
 
-	KApplication::clipboard()->setText(text);
+  QString text = QString::null;
+  if (addText) {
+    CPointers::backend()->setFilterOptions(m_filterOptions);
+    CPointers::backend()->setDisplayOptions(m_displayOptions);
 
-	return ret;
-}
+    CSwordModuleInfo* module = key->module();
+  	if (CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key) ) {
+      CSwordVerseKey startKey(module);
+      CSwordVerseKey stopKey(module);
 
-const bool CExportManager::copyKeyList( ListKey* list, CSwordModuleInfo* module, const QString& label, const bool withText, const bool showProgress ){
-	QProgressDialog progress( label, i18n("Cancel"), list->Count(), 0,"progress", true );	
-	progress.setProgress(0);	
-	progress.setMinimumDuration(10);	
-	progress.show();
-	
-	QString text;	
-	int index = 0;	
-	util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-	*list = TOP;
-	while (!list->Error() && !progress.wasCancelled()) {
-		key->key((const char*)(*list));
-		if (!key)
-			break;
-		progress.setProgress(index++);
-		KApplication::kApplication()->processEvents(10); //do not lock the GUI!																		
-		
-		text += (withText) ? QString::fromLatin1("%1:\n\t%2\n").arg(key->key()).arg(key->strippedText()) : key->key()+"\n";
-		(*list)++;
-	}
-	if (progress.wasCancelled())
-		return false;
-		
-	progress.setProgress(index);	
-	KApplication::clipboard()->setText(text);		
-	return true;
-}
+  		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);
 
-//////// printing functions //////////
+        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() );
 
-const bool CExportManager::printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description ){
-	printer()->appendItem( new CPrintItem(module, startKey, stopKey, description) );	
+      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::printKeyList( ListKey* list, CSwordModuleInfo* module, const QString& label, const bool showProgress ){
-	QProgressDialog progress( label, i18n("Cancel"), list->Count(), 0,"progress", true );	
-	progress.setProgress(0);	
-	progress.setMinimumDuration(10);	
-	progress.show();
-	
-	int index = 0;	
-	QList<CPrintItem> itemList;
+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 = TOP;
-	while (!list->Error() && !progress.wasCancelled()) {
-		VerseKey* vk = dynamic_cast<VerseKey*>(list);
+
+	(*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()) );
@@ -189,24 +323,174 @@ const bool CExportManager::printKeyList( ListKey* list, CSwordModuleInfo* module
 		else {
 			startKey = QString::fromLocal8Bit((const char*)*list);
 			stopKey = QString::null;
-		}
-		itemList.append( new CPrintItem(module, startKey, stopKey) );
-		
-		progress.setProgress(index++);
-		KApplication::kApplication()->processEvents(10); //do not lock the GUI!
-				
+		//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 (progress.wasCancelled()) {
-		itemList.setAutoDelete(true);	
-		itemList.clear();//delete all items		
+	if (progressWasCancelled()) {
+		itemList.setAutoDelete(true);
+		itemList.clear();//delete all items
 		return false;
 	}
-	
-	progress.setProgress(list->Count());	
-	printer()->appendItems(itemList);	
-	
+
+  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
index 853e2da..4ed1171 100644
--- a/bibletime/frontend/cexportmanager.h
+++ b/bibletime/frontend/cexportmanager.h
@@ -19,35 +19,88 @@
 #define CEXPORTMANAGER_H
 
 //BibleTime includes
-#include "cpointers.h"
+#include "cbtconfig.h"
+
+#include "util/cpointers.h"
 
 //Qt includes
 #include <qstring.h>
-#include <qlist.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: // Public methods
-  //save functions
-  static const bool saveKey( CSwordKey* key, const bool withText = true );
-  static const bool saveKeyList( ListKey* list, CSwordModuleInfo* module, const QString& label, const bool withText = true, const bool showProgress = true );
-  static const bool saveKeyList( QList<CSwordKey>& list, CSwordModuleInfo* module, const QString& label, const bool withText = true, const bool showProgress = true );
+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 );  
 
-  //clipboard functions
-  static const bool copyKey( CSwordKey* key, const bool withText = true );
-  static const bool copyKeyList( ListKey* list, CSwordModuleInfo* module, const QString& label, const bool withText = true, const bool showProgress = true );
+  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 );
 
-  //print function
-  static const bool printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopkey = QString::null, const QString& description = QString::null );
-  static const bool printKeyList( ListKey* list, CSwordModuleInfo* module, const QString& label, const bool showProgress = true );
+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/chtmldialog.cpp b/bibletime/frontend/chtmldialog.cpp
deleted file mode 100644
index 6be6c83..0000000
--- a/bibletime/frontend/chtmldialog.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/***************************************************************************
-                          chtmldialog.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 "chtmldialog.h"
-#include "ctoolclass.h"
-
-//QT includes
-#include <qlayout.h>
-#include <qhbox.h>
-#include <qfile.h>
-#include <qtextbrowser.h>
-#include <qtoolbar.h>
-#include <qtoolbutton.h>
-#include <qpushbutton.h>
-
-//KDE includes
-#include <kcombobox.h>
-#include <klocale.h>
-#include <kiconloader.h>
-#include <kapp.h>
-
-
-CHTMLDialog::CHTMLDialog(QWidget* parent, const char *name )
-	: QDialog ( parent, name, true, WStyle_MinMax | WStyle_DialogBorder | WStyle_Dialog )
-{
-	init(false);
-}
-
-CHTMLDialog::CHTMLDialog(const QString& url, QWidget* parent, const char *name)
-	: QDialog ( parent, name, true, WStyle_MinMax | WStyle_DialogBorder | WStyle_Dialog )
-{
-	init();
-	QString file = CToolClass::locatehtml(url);
-	
-	m_textBrowser->mimeSourceFactory()->setFilePath(file);
-	m_textBrowser->setSource(file);
-}
-
-CHTMLDialog::~CHTMLDialog(){
-}
-
-/** Sets the content of the widget */
-void CHTMLDialog::setText(const QString& text){
-	m_textBrowser->setText(text);
-}
-
-/** Initializes this widget. */
-void CHTMLDialog::init(const bool enableHistory){
-	resize(600,400);		
-	QVBoxLayout* layout = new QVBoxLayout(this, 5);
-		
-	m_textBrowser = new QTextBrowser(this);		
-	KURL url(CToolClass::locatehtml("bibletime/helpdialog/index.docbook"));	
-	m_textBrowser->mimeSourceFactory()->addFilePath(url.directory());
-	url.cd(QString::fromLatin1(".."));
-	m_textBrowser->mimeSourceFactory()->addFilePath(url.directory());
-	url.cd(QString::fromLatin1(".."));
-	m_textBrowser->mimeSourceFactory()->addFilePath(url.directory());
-	url.cd(QString::fromLatin1(".."));
-	m_textBrowser->mimeSourceFactory()->addFilePath(url.directory());
-	
-	
-	if (enableHistory) {
-		QHBox* toolBar = new QHBox(this, "history toolbar");
-		
-		QToolButton *button = 0;		
-		button = new QToolButton(toolBar);
-		button->setIconSet(SmallIcon("back"));
-		button->setTextLabel(i18n("Backward"));		
-		button->setEnabled(false);		
-		button->setUsesTextLabel(true);
-		button->setFixedSize(button->sizeHint());
-		connect(button, SIGNAL(clicked()), m_textBrowser, SLOT(backward()));
-		connect(m_textBrowser, SIGNAL(backwardAvailable(bool)),
-			button, SLOT(setEnabled(bool)));		
-    connect( m_textBrowser, SIGNAL( textChanged() ),	
-	     this, SLOT( textChanged() ) );
-
-		m_historyCombo = new KComboBox(toolBar);
-		toolBar->setStretchFactor(m_historyCombo, 5);		
-    connect( m_historyCombo, SIGNAL( activated( const QString & ) ),
-	     this, SLOT( historyItemSelected( const QString & ) ) );
-		
-	     				
-		button = new QToolButton(toolBar);		
-		button->setEnabled(false);
-		button->setTextLabel(i18n("Forward"));		
-		button->setUsesTextLabel(true);		
-		button->setIconSet(SmallIcon("forward"));
-		button->setFixedSize(button->sizeHint());
-		connect(button, SIGNAL(clicked()), m_textBrowser, SLOT(forward()));		
-		connect(m_textBrowser, SIGNAL(forwardAvailable(bool)),
-			button, SLOT(setEnabled(bool)));
-			
-		layout->addWidget(toolBar);		
-	}		
-	layout->addSpacing(5);	
-	layout->addWidget(m_textBrowser,5);
-	
-	QHBoxLayout* hBox = new QHBoxLayout();
-	QPushButton* closeButton = new QPushButton(this);
-	closeButton->setText(i18n("Close"));
-	connect(closeButton, SIGNAL(pressed()), this, SLOT(close()));
-	hBox->addStretch(5);
-	hBox->addWidget(closeButton,1);
-	
-	layout->addLayout(hBox);
-}
-
-/** Is called when an item of the history combo was chosen. */
-void CHTMLDialog::historyItemSelected( const QString & file ){
-	m_textBrowser->setSource(file);
-}
-
-/** Called when the content of the textbrowser was changed. */
-void CHTMLDialog::textChanged(){
-	if ( m_textBrowser->documentTitle().isNull() )
-		setCaption( m_textBrowser->context() );
-	else
-		setCaption( m_textBrowser->documentTitle() ) ;
-
-	QString selectedURL = caption();
-	if ( !selectedURL.isEmpty() && m_historyCombo ) {
-		bool exists = false;
-		int i;
-		for ( i = 0; i < m_historyCombo->count(); ++i ) {
-			if ( m_historyCombo->text( i ) == selectedURL ) {
-				exists = true;
-				break;
-			}
-		}
-		if ( !exists ) {
-	    m_historyCombo->insertItem( selectedURL, -1 );
-	    m_historyCombo->setCurrentItem( 0 );
-		} else
-	    m_historyCombo->setCurrentItem( i );
-		selectedURL = QString::null;
-	}	
-}
diff --git a/bibletime/frontend/chtmldialog.h b/bibletime/frontend/chtmldialog.h
deleted file mode 100644
index fd22061..0000000
--- a/bibletime/frontend/chtmldialog.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/***************************************************************************
-                          chtmldialog.h  -  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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CHTMLDIALOG_H
-#define CHTMLDIALOG_H
-
-//Qt includes
-#include <qwidget.h>
-#include <qdialog.h>
-
-//forward declarations
-class QTextBrowser;
-class KComboBox;
-
-/** This is a general dialog to show long error messages or report and solutions
-	* (Perhaps from an FAQ file).
-  * @author The BibleTime Team
-  */
-class CHTMLDialog : public QDialog  {
-  Q_OBJECT
-
-public:
-	CHTMLDialog(QWidget* parent=0, const char *name=0);
-	CHTMLDialog(const QString& url, QWidget* parent=0, const char *name=0);
-	~CHTMLDialog();
-  /**
- 	* Sets the content of the widget. Not URL is used.
- 	*/
-  virtual void setText(const QString&);
-
-protected:
-	QTextBrowser* m_textBrowser;
-  /**
-  * Initializes this widget.
-  */
-  void init(const bool enableHistory = true);
-
-protected slots: // Protected slots
-  /**
-  * Called when the content of the textbrowser was changed.
-  */
-  void textChanged();
-  /**
-  * Is called when an item of the history combo was chosen.
-  */
-  void historyItemSelected( const QString & );
-
-private:
-	KComboBox* m_historyCombo;
-};
-
-#endif
-
diff --git a/bibletime/frontend/chtmlwidget.cpp b/bibletime/frontend/chtmlwidget.cpp
deleted file mode 100644
index 7fe6e2d..0000000
--- a/bibletime/frontend/chtmlwidget.cpp
+++ /dev/null
@@ -1,747 +0,0 @@
-/***************************************************************************
-                          chtmlwidget.cpp  -  description
-                             -------------------
-    begin                : Sun Feb 27 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 "chtmlwidget.h"
-#include "ctoolclass.h"
-#include "backend/creferencemanager.h"
-#include "backend/cswordldkey.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordbackend.h"
-#include "backend/cswordmoduleinfo.h"
-#include "presenters/cswordpresenter.h"
-#include "thirdparty/qt3stuff/qt3stuff.h"
-#include "thirdparty/qt3stuff/qrichtext_p.h"
-#include "resource.h"
-#include "tooltipdef.h"
-#include "whatsthisdef.h"
-#include "cbtconfig.h"
-
-#include "util/scoped_resource.h"
-
-#include <stdio.h>
-
-//QT includes
-#include <qurl.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qclipboard.h>
-#include <qevent.h>
-#include <qdragobject.h>
-#include <qpixmapcache.h>
-#include <qstylesheet.h>
-#include <qwidget.h>
-#include <qtoolbutton.h>
-#include <qapplication.h>
-
-//KDE includes
-#include <kapp.h>
-#include <kaction.h>
-#include <kstdaction.h>
-#include <klocale.h>
-#include <kurl.h>
-#include <kfiledialog.h>
-#include <kcmenumngr.h>
-#include <kglobal.h>
-#include <kcursor.h>
-#include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
-#include <kcolorbutton.h>
-
-//Sword includes
-#include <swmodule.h>
-
-CHTMLWidget::ToolTip::ToolTip(QWidget* parent)
-	: QToolTip(parent) {
-
-}
-
-void CHTMLWidget::ToolTip::maybeTip(const QPoint& p) {
-//	qWarning("void CHTMLWidget::ToolTip::maybeTip(const QPoint& p) ");
-	if (!parentWidget()->inherits("CHTMLWidget"))
-		return;
-
-	CHTMLWidget* htmlWidget = dynamic_cast<CHTMLWidget*>(parentWidget());	
-	ASSERT(htmlWidget);
-	QPoint p1 = htmlWidget->viewportToContents(p);
-	QString link = QString::null;
-	QString text = QString::null;
-
-  link = htmlWidget->anchorAt(p1);
-	if ( link.isEmpty() )
-		return;
-	else {
-//		qWarning("link is valid");
-	  Qt3::QTextCursor c( htmlWidget->getDocument() );
-	  htmlWidget->placeCursor( p1, &c );
-		QRect rect = c.parag()->rect();
-		
-		//map rect coordinates to widget's ones
-    rect.setX( htmlWidget->contentsToViewport(rect.topLeft()).x() );
-    rect.setY( htmlWidget->contentsToViewport(rect.topLeft()).y() );
-    rect.setWidth( htmlWidget->contentsToViewport(rect.bottomRight()).x() - rect.x() );
-    rect.setHeight( htmlWidget->contentsToViewport(rect.bottomLeft()).y() - rect.y() );
-        				
-		QString module = QString::null;
-		QString ref = QString::null;
-		CReferenceManager::Type type;		
-		const bool ok = CReferenceManager::decodeHyperlink(link, module, ref, type);
-		if (!ok || ref.isEmpty())
-			return;
-
-		const QFont oldFont = font();				
-		
-		CSwordModuleInfo* m	= 0;
-		if (module.isEmpty() || module.isNull()) {
-			module = CReferenceManager::preferredModule( type );
-		}		
-		m = backend()->findModuleByName(module);
-		if (m){
-			if (m->type() == CSwordModuleInfo::Bible || m->type() == CSwordModuleInfo::Commentary) {
-				CSwordModuleInfo* module = htmlWidget->modules().first();
-				if (module) {
-					ref = CReferenceManager::parseVerseReference(ref);
-				}
-			}
-			util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance( m ) );
-			if (key) {
-				backend()->setFilterOptions( CBTConfig::getFilterOptionDefaults() );				
-				
-				key->key(ref);
-				text = key->renderedText();
-			}
-			if (m->isUnicode()) {
-				setFont( CBTConfig::get(CBTConfig::unicode) );
-			}
-		}
-		if (!text.isEmpty()) {
-			text = QString::fromLatin1("<B>%1</B><HR>%2").arg(ref).arg(text);
-			tip(rect, text);
-		}
-		setFont(oldFont);
-	}
-}
-
-CHTMLWidget::CHTMLWidget(const bool useColorsAndFonts,QWidget *parent, const char *name )
-	: Qt3::QTextEdit(parent, name),m_moduleList( new ListCSwordModuleInfo ) {
-	
-	m_popup = 0;
-	m_anchor = QString::null;
-	m_anchorMenu = 0;
-	m_selectedWord = false;
-	mousePressed = inDoubleClick = false;		
-	setTextFormat( Qt::RichText );
-	setReadOnly(true);
-
-	QFont unicodeFont = CBTConfig::get(CBTConfig::unicode);
- 	if (!document()->charsetMap->contains(unicodeFont.family()))
- 		document()->charsetMap->insert(unicodeFont.family(), QFont::Unicode);
-		
-	initView();	
-	initConnections();
-	if (useColorsAndFonts) {
-		initColors();
-		initFonts();	
-	}
-}
-
-CHTMLWidget::~CHTMLWidget(){
-	delete m_moduleList;
-	m_moduleList = 0;
-}
-
-/**  */
-void CHTMLWidget::initColors(){
-//	qDebug("CHTMLWidget::initColors()");
-//	setLinkColor( m_config->readColorEntry("Versenumber/URL", &Qt::darkBlue) );		
-//	QColor textColor = m_config->readColorEntry("Normal Text", &Qt::red);	
-	const QColor bgColor = CBTConfig::get(CBTConfig::backgroundColor);
-	setPaper(QBrush(bgColor));
-	
-//using a standard text color doesn't work at the moment!
-
-//	QPalette p = palette();
-//	p.setBrush( QPalette::Active, QColorGroup::Base, QBrush(bgColor) );	
-//	QColorGroup cg = p.active();
-//	p.setColor(QPalette::Active, QColorGroup::Text, textColor);
-//	cg.setColor(QColorGroup::Base, bgColor);
-//	p.setActive(cg);	
-//	setPalette(p);		
-//	refresh();
-}
-
-/** Initializes the fonts of the HTML-widget */
-void CHTMLWidget::initFonts(){
-// ACHTUNG: CBTCONFIG benutzen
-//	ConfigGroupSaver groupSaver(m_config, "Fonts");		
-//	if (document()->charsetMap->contains(font().family())) { //remove old standard font
-//		document()->charsetMap->remove(font().family());
-//	}
-//	
-//	QFont f = m_config->readFontEntry(i18n("Display window"));	
-//	document()->setDefaultFont( f );
-//	setFont(f);
-//	
-//	document()->charsetMap->replace(f.family(), f.charSet());
-}
-
-/**  */
-void CHTMLWidget::initView(){
-	m_toolTip = new ToolTip(this);
-	disconnect(dragStartTimer, SIGNAL(timeout()),
-		this, SLOT(startDrag()));
-	
-//	QStringList paths;	
-	
-	setAcceptDrops(true);
-	viewport()->setAcceptDrops(true);
-}
-
-
-/** Initializes the connections to SIGNALs */
-void CHTMLWidget::initConnections(){
-	connect( this, SIGNAL( linkClicked( const QString & ) ),
-		this, SLOT( setSource( const QString & ) ) );	
-	if (!isReadOnly()) {
-	 	connect(this, SIGNAL(currentFontChanged(const QFont&)),
-			SLOT(slotCurrentFontChanged(const QFont&)));
-		connect(this, SIGNAL(currentColorChanged(const QColor&)),
-			SLOT(slotCurrentColorChanged(const QColor&)));
-		connect(this, SIGNAL(currentAlignmentChanged(int)),
-			SLOT(slotCurrentAlignementChanged(int)));	
-	}
-	else {
-	 	disconnect(this, SIGNAL(currentFontChanged(const QFont&)),
-			this, SLOT(slotCurrentFontChanged(const QFont&)));
-		disconnect(this, SIGNAL(currentColorChanged(const QColor&)),
-			this, SLOT(slotCurrentColorChanged(const QColor&)));
-		disconnect(this, SIGNAL(currentAlignmentChanged(int)),
-			this, SLOT(slotCurrentAlignementChanged(int)));		
-	}
-}
-
-/** Reinitialize the colors, fonts etc. */
-void CHTMLWidget::refresh(){
-//	qDebug("CHTMLWidget::refresh()");
-	initColors();
-	initFonts();
-}
-
-/** Loads a HTML file in the widget. */
-void CHTMLWidget::setHTMLSource(const QString& url){
-	if (url.left(1) != "/") {	//a filename without path
-		QString myFile = CToolClass::locatehtml( url );
-		if (QFile::exists(myFile)) {
-			KURL kurl(myFile);
-  		mimeSourceFactory()->addFilePath( kurl.directory() );
-			
-			//read in the HTML file and use setText()
-			QFile file(myFile);
-			if ( file.open(IO_ReadOnly) ) {    // file opened successfully
-				QTextStream t( &file );        // use a text stream
-				const QString text = t.read();
-				file.close();
-				setText( text/*, kurl.directory()*/ );
-			}
-		}
-		else
-			setText( i18n("Unable to find the page %1!").arg(url) );
-	}
-	else {
-		if (QFile::exists(url)) {
-			//read in the HTML file and use setText()
-			KURL kurl(url);
-  		mimeSourceFactory()->addFilePath( kurl.directory() );			
-			QFile file(url);
-			if ( file.open(IO_ReadOnly) ) {    // file opened successfully
-				QTextStream t( &file );        // use a text stream
-				const QString text = t.read();
-				file.close();
-				setText( text/*, kurl.directory()*/ );
-			}
-		}
-	}
-}
-
-/** Saves the HTML page */
-void CHTMLWidget::slotSaveAsHTML(){
-	QString file = KFileDialog::getSaveFileName (QString::null, i18n("*.html *.htm *.shtml *.shtm | HTML files\n *.* | All files (*.*)"), 0, i18n("Save text as HTML page ..."));	
-	if (!file.isNull())
-		CToolClass::savePlainFile( file, text().utf8());
-}
-
-/** Saves the HTML page */
-void CHTMLWidget::slotSaveAsText(){
-	const QString file = KFileDialog::getSaveFileName (QString::null, i18n("*.txt | Text file (*.txt)\n*.* | All files (*.*)"), 0, i18n("Save text as plain text ..."));
-
-	if (!file.isNull()) {
-		QString html = document()->plainText();
-		CToolClass::savePlainFile( file, html);
-	}
-}
-
-//**  */
-void CHTMLWidget::contentsDragEnterEvent(QDragEnterEvent* e){
-	Qt3::QTextEdit::contentsDragEnterEvent(e);
-  e->accept(QTextDrag::canDecode(e));
-}
-
-/**  */
-void CHTMLWidget::contentsDragMoveEvent(QDragMoveEvent* e){
-	Qt3::QTextEdit::contentsDragMoveEvent(e);
-  e->accept(QTextDrag::canDecode(e));
-}
-
-/**  */
-void CHTMLWidget::contentsDropEvent(QDropEvent* e){
- 	QString str;
- 	QCString submime;
-
-	if (isReadOnly()) {
-	 	if ( ( QTextDrag::decode(e,str,submime=BOOKMARK) || QTextDrag::decode(e,str,submime=REFERENCE) ) && !str.isEmpty() ){
-			QString ref = QString::null;
-			QString mod = QString::null;		
-	 		CReferenceManager::decodeReference(str,mod,ref);
-	 		emit referenceDropped(/*mod,*/ ref);
-		}
-		else
-			e->ignore();
-	}
-	else {
-		QString text = QString::null;
-	 	if ( ( QTextDrag::decode(e,str,submime=BOOKMARK) || QTextDrag::decode(e,str,submime=REFERENCE) ) && !str.isEmpty() ){
-			QString ref = QString::null;
-			QString mod = QString::null;
-	 		CReferenceManager::decodeReference(str,mod,ref);
-			CSwordModuleInfo* module = backend()->findModuleByName(mod);
-	 		if (module) {		 			
-	 			CSwordKey* key = CSwordKey::createInstance(module);; 					
-				key->key(ref);
-				text = key->strippedText();
-				delete key;
-		 	}
-		}
-		else if (QTextDrag::decode(e,str) && !str.isEmpty())
-			text = str;
-
-		if (!text.isEmpty())
-			insert(text);
-		else {
-			e->ignore();
-		}
-	}
-}
-
-
-/** Reimplementation. */
-void CHTMLWidget::contentsMousePressEvent(QMouseEvent* e) {	
-  m_pressedPos = e->pos();
-  m_anchor = anchorAt(e->pos());
-	viewport()->setCursor(anchorAt(e->pos()).isEmpty() ? arrowCursor : KCursor::handCursor() );
-	Qt3::QTextEdit::contentsMousePressEvent(e);
-		
- 	if (!onLink.isEmpty() && (e->button() == RightButton) && m_anchorMenu) {	//popup installed menu 	
-		m_anchorMenu->exec( e->globalPos() );
-  }
-  else if (m_popup && e->button() == RightButton){ //popup normal menu
-    m_selectedWord = false;
-    QString selectedWord = QString::null;
-
-   	drawCursor(false);
-   	placeCursor(e->pos());    	
-   	ensureCursorVisible();
-		emit cursorPositionChanged(cursor);
-		
-    if (selectedText().isEmpty()) {
-    	Qt3::QTextCursor c1 = *cursor;
-	    Qt3::QTextCursor c2 = *cursor;
-	    c1.gotoWordLeft();
-	    c2.gotoWordRight();
-	    doc->setSelectionStart( Qt3::QTextDocument::Standard, &c1 );
-	    doc->setSelectionEnd( Qt3::QTextDocument::Standard, &c2 );
-	    *cursor = c2;
-	    selectedWord = selectedText();
-			emit cursorPositionChanged(cursor);		    	
-	   	ensureCursorVisible();			
-	    repaintChanged();
-	    m_selectedWord = true;
-	  }
-		m_popup->exec( e->globalPos() );		
-		if (m_selectedWord && (selectedWord == selectedText()) ) {
-			m_selectedWord = false;
-			selectAll(false);
-		}		
-  }	
-}
-
-/** Reimplementation.*/
-void CHTMLWidget::contentsMouseMoveEvent(QMouseEvent* e) {
-  if ( mousePressed ) {
-		if ( mightStartDrag ) { //we might start a drag
-	    dragStartTimer->stop();
-	    if ( ( e->pos() - dragStartPos ).manhattanLength() > KApplication::startDragDistance() )
-				startDrag();
-	    if ( !isReadOnly() )
-				viewport()->setCursor( ibeamCursor );
-	    return;
-		}
-		else if (!m_anchor.isEmpty()/*!anchorAt(e->pos()).isEmpty() && !hasSelectedText()*/) {
-			QString module = QString::null;
-			QString key = QString::null;
-			CReferenceManager::Type type;			
-			const bool ok = CReferenceManager::decodeHyperlink(m_anchor, module, key, type);
-			if (!ok)
-				return;
-			
-			mousePressed = false;
-			inDoubleClick = false;				 				
-			mightStartDrag = false;
-					
-			QTextDrag *d = new QTextDrag(CReferenceManager::encodeReference(module,key),viewport());
-	    d->setSubtype(REFERENCE);
-	    d->setPixmap(REFERENCE_ICON_SMALL);
-	    d->drag();
-			return;
-		}		
-		mousePos = e->pos();
-		doAutoScroll();
-		oldMousePos = mousePos;
-	}
-
-	if ( !isReadOnly() && !mousePressed ) {
-		if ( doc->hasSelection( Qt3::QTextDocument::Standard ) && doc->inSelection( Qt3::QTextDocument::Standard, e->pos() ) )
-	    viewport()->setCursor( arrowCursor );
-		else
-	    viewport()->setCursor( ibeamCursor );
-	}
-	if ( isReadOnly() && linksEnabled() ) {
-		Qt3::QTextCursor c = *cursor;
-		placeCursor( e->pos(), &c );
-		if ( c.parag() && c.parag()->at( c.index() ) &&
-	     !anchorAt(e->pos()).isEmpty() ) {
-			viewport()->setCursor( pointingHandCursor );
-	    onLink = c.parag()->at( c.index() )->format()->anchorHref();
-	    QUrl u( doc->context(), onLink, true );
-			m_hoverPos = e->pos();
-	    emitHighlighted( u.toString( false, false ) );			
-		} else {
-	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-	    onLink = QString::null;
-	    emitHighlighted( QString::null );
-		}
-	}
-}
-
-/** Installes a menu which will popup if the right mouse button was pressed on an anchor. */
-void CHTMLWidget::installAnchorMenu( QPopupMenu* anchorMenu ){
-//	qDebug("CHTMLWidget::installAnchorMenu( QPopupMenu* anchorMenu )");
-	ASSERT( anchorMenu );
-	m_anchorMenu = anchorMenu;
-}
-
-/** Returns the current anchor. */
-QString CHTMLWidget::getCurrentAnchor(){
-	return anchorAt(m_pressedPos);
-}
-
-/** No descriptions */
-void CHTMLWidget::installPopup( QPopupMenu* popup ){
-	ASSERT(popup);
-	m_popup = popup;
-}
-
-/** Sets the HTML widget editable or not */
-void CHTMLWidget::setReadOnly( const bool readOnly ){
-	m_readOnly = readOnly;
-	initConnections();
-		
-	viewport()->setCursor( m_readOnly ? arrowCursor : ibeamCursor );
-	viewport()->update();	
-}
-
-/** Returns true if this HTML widget is read only, false if it's editable */
-bool CHTMLWidget::isReadOnly() const {
-	return m_readOnly;
-}
-
-/** This function returns the edit toolbar used for the HTML widget. The items of the toolbar are already connected to the correct slots. */
-void CHTMLWidget::createEditToolbar( KToolBar* bar ){
-	ASSERT(bar);
-	if (!bar)
-		return;
-
-	m_docSaveAction = new KAction(i18n("Save"), ICON_FILE_SAVE, 0, this, SLOT(slotSaveDocument()),bar, "saveDoc_action");	
-	m_docSaveAction->setToolTip( TT_PRESENTER_EDIT_SAVE );
-	m_docSaveAction->setWhatsThis( WT_PRESENTER_EDIT_SAVE );	
-	m_docSaveAction->plug(bar);
-	
-	m_docDeleteAction = new KAction(i18n("Delete"), ICON_FILE_DELETE, 0, this, SIGNAL(sigDeleteDocument()),bar, "deleteDoc_action");	
-	m_docDeleteAction->setToolTip( TT_PRESENTER_EDIT_DELETE );
-	m_docDeleteAction->setWhatsThis( WT_PRESENTER_EDIT_DELETE );	
-	m_docDeleteAction->plug(bar);
-			
-	m_colorChooser = new KColorButton(black, bar);
-	connect(m_colorChooser, SIGNAL(changed(const QColor&)),SLOT(slotSetCurrentColor(const QColor&)));		
-	m_fontAction = new KFontAction(i18n("Choose a font:"), 0, bar);
-	connect(m_fontAction, SIGNAL(activated(const QString&)), SLOT(slotSetCurrentFont(const QString&)));
-	m_fontAction->plug(bar);
-	
-	m_fontSizeAction = new KFontSizeAction(i18n("Choose font size"), 0, bar);		
-	connect(m_fontSizeAction, SIGNAL(fontSizeChanged(int)), SLOT(setPointSize(int)));
-	m_fontSizeAction->plug(bar);
-	
-	m_boldAction = new KToggleAction(i18n("Bold"), ICON_EDIT_BOLD,0,this, SLOT(slotToggleBold()), bar);
-	m_boldAction->plug(bar);
-	m_italicAction = new KToggleAction(i18n("Italic"), ICON_EDIT_ITALIC,0, this, SLOT(slotToggleItalic()),bar);	
-	m_italicAction->plug(bar);	
-	m_underlineAction = new KToggleAction(i18n("Underlined"), ICON_EDIT_UNDER,0, this, SLOT(slotToggleUnderline()),bar);	
-	m_underlineAction->plug(bar);
-			
-	m_alignLeftAction = new KToggleAction(i18n("Left"), ICON_EDIT_LEFT,0, this, SLOT(slotAlignLeft()),bar);
-	m_alignLeftAction->plug(bar);
-	m_alignCenterAction = new KToggleAction(i18n("Center"), ICON_EDIT_CENTER,0, this, SLOT(slotAlignCenter()),bar);
-	m_alignCenterAction->plug(bar);
-	m_alignRightAction = new KToggleAction(i18n("Right"), ICON_EDIT_RIGHT,0, this, SLOT(slotAlignRight()),bar);
-	m_alignRightAction->plug(bar);
-	m_alignJustifyAction = new KToggleAction(i18n("Justify"), ICON_EDIT_JUST,0, this, SLOT(slotAlignJustify()),bar);
-	m_alignJustifyAction->plug(bar);
-}
-
-/** emit a signal to save the text */
-void CHTMLWidget::slotSaveDocument(){
-	emit sigSaveDocument(text());
-}
-
-/** No descriptions */
-void CHTMLWidget::slotToggleBold(){
-	Qt3::QTextEdit::setBold( !bold() );
-	m_boldAction->setChecked(bold());	
-}
-
-/** No descriptions */
-void CHTMLWidget::slotToggleItalic(){
-	Qt3::QTextEdit::setItalic(!italic() );
-	m_italicAction->setChecked(italic());	
-}
-
-/** No descriptions */
-void CHTMLWidget::slotToggleUnderline(){
-	Qt3::QTextEdit::setUnderline( !underline() );
-	m_underlineAction->setChecked(underline());		
-}
-
-/** No descriptions */
-void CHTMLWidget::slotSetCurrentFontSize( int size ){
-	if (size > 0)
-		setPointSize(size);
-}
-
-void CHTMLWidget::slotSetCurrentFont(const QString& font) {
-	QFont newFont(font, pointSize());
-	newFont.setBold(bold());
-	newFont.setItalic(italic());
-	newFont.setUnderline(underline());	
-	
-	setFont( newFont );
-}
-
-/** Is calledwhen a new color was selected. */
-void CHTMLWidget::slotSetCurrentColor( const QColor& color){
-	setColor(color);
-}
-
-/** No descriptions */
-void CHTMLWidget::slotCurrentFontChanged( const QFont& f){
-	m_fontAction->setFont( f.family() );	
-	m_fontSizeAction->setFontSize( f.pointSize() );	
-
-	m_boldAction->setChecked( f.bold() );
-	m_italicAction->setChecked( f.italic() );
-	m_underlineAction->setChecked( f.underline() );	
-}
-
-/** No descriptions */
-void CHTMLWidget::slotCurrentColorChanged( const QColor& c){
-	m_colorChooser->setColor(c);
-}
-
-/** No descriptions */
-void CHTMLWidget::slotCurrentAlignementChanged(int a){
-	m_alignLeftAction->setChecked( (a == AlignLeft) || (a == Qt3::AlignAuto) );
-	m_alignCenterAction->setChecked( a == AlignHCenter );
-	m_alignRightAction->setChecked( a == AlignRight );
-	m_alignJustifyAction->setChecked( a == Qt3::AlignJustify );	
-}
-
-/** No descriptions */
-void CHTMLWidget::slotAlignLeft(){
-	m_alignLeftAction->setChecked(true);	
-	m_alignCenterAction->setChecked(false);	
-	m_alignRightAction->setChecked(false);	
-	m_alignJustifyAction->setChecked(false);		
-		
-	setAlignment(AlignLeft);
-}
-
-/** No descriptions */
-void CHTMLWidget::slotAlignCenter(){
-	m_alignLeftAction->setChecked(false);	
-	m_alignCenterAction->setChecked(true);	
-	m_alignRightAction->setChecked(false);	
-	m_alignJustifyAction->setChecked(false);		
-	
-	setAlignment(AlignHCenter);
-}
-
-/** No descriptions */
-void CHTMLWidget::slotAlignRight(){
-	m_alignLeftAction->setChecked(false);	
-	m_alignCenterAction->setChecked(false);	
-	m_alignRightAction->setChecked(true);	
-	m_alignJustifyAction->setChecked(false);		
-		
-	setAlignment(AlignRight);
-}
-
-/** No descriptions */
-void CHTMLWidget::slotAlignJustify(){
-	m_alignLeftAction->setChecked(false);	
-	m_alignCenterAction->setChecked(false);	
-	m_alignRightAction->setChecked(false);	
-	m_alignJustifyAction->setChecked(true);		
-		
-	setAlignment(Qt3::AlignJustify);
-}
-
-/** No descriptions */
-void CHTMLWidget::slotSelectAll(){
-	selectAll(false);//workaround
-	selectAll(true);
-}
-
-/** Returns true if the links are enabled. */
-bool CHTMLWidget::linksEnabled() const {
-	return true;
-}
-
-/** Reimplementation from QTextView. */
-void CHTMLWidget::emitLinkClicked( const QString& link){
-	if (link.left(7) == QString::fromLatin1("mailto:")) {
-		qDebug("open mailer for %s", link.mid(7).latin1());
-		KApplication::kApplication()->invokeMailer(link.mid(7), QString::null);
-		return;
-	}
-	
-	if (CReferenceManager::isHyperlink(link)) {
-		QString ref;
-		QString module;
-		CReferenceManager::Type type;			
-		CReferenceManager::decodeHyperlink(link, module, ref, type);
-		CSwordModuleInfo* m = backend()->findModuleByName(module);
-		CSwordKey* key = CSwordKey::createInstance(m);
-		if (key) {
-			emit referenceClicked(module, key->key(ref));
-			delete key;			
-		}
-	}
-	else {
-		QString url = link;
-		if (link.left(1) == "/")
-			url = link.mid(1);
-		emit linkClicked(url);
-	}
-}
-
-/** Copies the displayed document into the clipboard. */
-void CHTMLWidget::copyDocument(){
-	if (!document()->text().isEmpty()) {
-		QClipboard* cb = KApplication::clipboard();			
-		cb->setText(document()->plainText());
-	}	
-}
-
-/** Sets the source of this widget. */
-void CHTMLWidget::setSource(const QString& name){
-	if ( isVisible() )
-		qApp->setOverrideCursor( waitCursor );
-	QString source = name;
-	QString mark;
-	int hash = name.find('#');
-	if ( hash != -1) {
-		source  = name.left( hash );
-		mark = name.mid( hash+1 );
-	}
-	if ( source.left(5) == "file:" )
-		source = source.mid(6);
-
-	QString url = mimeSourceFactory()->makeAbsolute( source, context() );
-	QString txt;
-	bool dosettext = false;
-
-	if ( !source.isEmpty()/* && url != d->curmain */) {
-		const QMimeSource* m = mimeSourceFactory()->data( source, context() );
-		if ( !m )
-			qWarning("CHTMLWidget: no mimesource for %s", source.latin1() );
-		else if ( !QTextDrag::decode( m, txt ) )
-			qWarning("CHTMLWidget: cannot decode %s", source.latin1() );
-		dosettext = true;
-	}	
-	if ( !mark.isEmpty() ) {
-		url += "#";
-		url += mark;
-	}	
-	if ( dosettext )
-		setText( txt, url );
-
-	if ( isVisible() && !mark.isEmpty() )
-		scrollToAnchor( mark );
-	else
-		setContentsPos( 0, 0 );	
-	if ( isVisible() )
-		qApp->restoreOverrideCursor();
-}
-
-/** Is called if a link was highlighted. Normally a signal should be emitted. */
-void CHTMLWidget::emitHighlighted( const QString& s ){
-}
-
-/** Returns the document used by this widget */
-Qt3::QTextDocument* CHTMLWidget::getDocument() const{
-	return Qt3::QTextEdit::document();
-}
-
-/** Places the cursor at position pos */
-void CHTMLWidget::placeCursor( const QPoint &pos, Qt3::QTextCursor *c ){
-	Qt3::QTextEdit::placeCursor(pos, c);
-}
-
-/** Returns a list of modules which are used by the display window which uses this HTML widget. */
-ListCSwordModuleInfo& CHTMLWidget::modules() const {
-	if (m_moduleList)
-		return *m_moduleList;
-}
-
-/** Sets the list of modules used by the display window which uses this widget. */
-void CHTMLWidget::setModules( ListCSwordModuleInfo& modules ) {
-	*m_moduleList = modules; //copy entries
-	//add data path of all modules tom our config
-	for (m_moduleList->first(); m_moduleList->current(); m_moduleList->next()) {
-		const QString path = m_moduleList->current()->config(CSwordModuleInfo::AbsoluteDataPath);
-		mimeSourceFactory()->addFilePath( path );		
-	};
-}
diff --git a/bibletime/frontend/chtmlwidget.h b/bibletime/frontend/chtmlwidget.h
deleted file mode 100644
index 7ed504c..0000000
--- a/bibletime/frontend/chtmlwidget.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/***************************************************************************
-                          chtmlwidget.h  -  description
-                             -------------------
-    begin                : Sun Feb 27 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 CHTMLWIDGET_H
-#define CHTMLWIDGET_H
-
-//BibleTime includes
-#include "cpointers.h"
-#include "backend/cswordbackend.h"
-
-#define private public // It's a really bad hack, but I don't know how to do it in another way
-#include "thirdparty/qt3stuff/qtextedit.h"
-#undef private
-
-//Qt includes
-#include <qwidget.h>
-#include <qguardedptr.h>
-#include <qtooltip.h>
-
-class CHTMLDialog;
-class CBiblePresenter;
-class KPopupMenu;
-class KAction;
-class KToggleAction;
-class KFontSizeAction;
-class KToolBar;
-class QToolButton;
-class KFontAction;
-class QComboBox;
-class KColorButton;
-
-
-/** This widget enhances the KHTMLWidget to support BibleTime's colour
-	* management and to support verse references and the like.
-  * @author The BibleTime Team
-  */
-class CHTMLWidget : public Qt3::QTextEdit, public CPointers {
-   Q_OBJECT
-   friend class CHTMLDialog;
-
-public:
-	/**
-	* The constructor of the CHTMLWidget class.
-	* @param useColorsAndFonts Set this to false if you don't want to use the standard colorsa dnfonts defined in the optionsdialog of BibleTime
-	*/
-	CHTMLWidget(const bool useColorsAndFonts = true, QWidget *parent=0, const char *name=0);
-	virtual ~CHTMLWidget();
-  /**
- 	* Reinitialize the colors, fonts etc.
- 	*/
-  virtual void refresh();
-  /**
- 	* Loads a HTML file in the widget.
- 	*/
-  virtual void setHTMLSource(const QString& url);
-  /**
- 	* Installes a menu which will popup if the right mouse button was pressed on an anchor.
- 	*/
-  virtual void installAnchorMenu( QPopupMenu* );
-  /**
- 	* Returns the current anchor.
- 	*/
-  virtual QString getCurrentAnchor();
-  /**
-  * No descriptions
-  */
-  void installPopup( QPopupMenu* popup);
-  /**
-  * Returns true if this HTML widget is read only, false if it's editable
-  */
-  virtual bool isReadOnly() const;
-  /**
-  * Sets the HTML widget ediatable or not
-  */
-  virtual void setReadOnly( const bool readOnly = true);
-  /**
-  * This function returns the edit toolbar used for the HTML widget.
-	* The items of the toolbar are already connected to the correct slots.
-	*/
-  void createEditToolbar( KToolBar* bar );
-  /**
-  * Returns the document used by this widget
-  */
-  virtual Qt3::QTextDocument* getDocument() const;
-  /**
-  * Places the cursor at position pos
-  */
-  virtual void placeCursor( const QPoint &pos, Qt3::QTextCursor *c = 0);
-  /**
-  * Sets the list of modules used by the display window which uses this widget.
-  */
-  void setModules( ListCSwordModuleInfo& modules ) ;
-  /**
-  * Returns a list of modules which are used by the display window which uses this HTML widget.
-  */
-  ListCSwordModuleInfo& modules() const;
-
-  QPoint m_pressedPos;
-
-public slots: // Public slots
-  /**
-  * Saves the HTML page
-  */
-  void slotSaveAsHTML();
-  /**
-  * Saves the plain text page
-  */
-  void slotSaveAsText();
-  /**
-  * Copies the displayed document into the clipboard.
-  */
-  void copyDocument();
-  /**
-  * Sets the source of this widget.
-  */
-  void setSource(const QString& name);
-
-
-protected: // Protected attributes
-  /*
-  * Initializes the colors of this widget (backgrouznd, links, text)
-  */
-  void initColors();
-  /**
-  * Initializes the fonts of the HTML-widget
-  */
-  void initFonts();
-  /**
-  * Initializes the connections to SIGNALs
-  */
-  void initConnections();
-  /**
-  * Initializes the view of this widget (childs, popups etc.)
-  */
-  void initView();
-  /**
- 	* Reimplementation.
- 	*/
-  virtual void contentsDragEnterEvent(QDragEnterEvent* e);
-  /**
- 	* Reimplementation.
- 	*/
-  virtual void contentsDragMoveEvent (QDragMoveEvent* e);
-  /**
- 	* Reimplementation.
- 	*/
-  virtual void contentsDropEvent(QDropEvent* e);
-  /**
- 	* Reimplementation.
- 	*/
-  virtual void contentsMousePressEvent(QMouseEvent* e);
-  /**
- 	* Reimplementation.
- 	*/
-  virtual void contentsMouseMoveEvent(QMouseEvent* e);
-  /**
-  * Returns true if the links are enabled.
-  */
-  virtual bool linksEnabled() const;
-
-protected slots: // Protected slots
-  /**
-  * No descriptions
-  */
-  void slotSaveDocument();
-  /**
-  * No descriptions
-  */
-  void slotToggleBold();
-  /**
-  * No descriptions
-  */
-  void slotToggleItalic();
-  /**
-  * No descriptions	
-  */
-  void slotToggleUnderline();
-	/**
-	*
-	*/
-	void slotSetCurrentFont(const QString& font);	
-  /**
-  *
-  */
-  void slotSetCurrentFontSize( int );	
-	/**
-	*
-	*/
-	void slotSetCurrentColor( const QColor& color);
-  /**
-  * No descriptions
-  */
-  void slotCurrentColorChanged( const QColor& );
-  /**
-  * No descriptions
-  */
-  void slotCurrentFontChanged( const QFont& );
-  /**
-  * No descriptions
-  */
-  void slotCurrentAlignementChanged( int );
-  /**
-  * No descriptions
-  */
-  void slotAlignRight();
-  /**
-  * No descriptions
-  */
-  void slotAlignCenter();
-  /**
-  * No descriptions
-  */
-  void slotAlignLeft();
-  /**
-  * No descriptions
-  */
-  void slotAlignJustify();
-  /**
-  * No descriptions
-  */
-  void slotSelectAll();
-	
-private:
-  virtual void emitLinkClicked( const QString& s);
-  virtual void emitHighlighted( const QString& s);
-
-	class ToolTip : public QToolTip, public CPointers {
-		public:
-			ToolTip(QWidget* parent);
-			void maybeTip( const QPoint &pos);
-	};
-	ToolTip* m_toolTip;
-
-	bool m_readOnly;
-	bool m_selectedWord;
-	QString m_anchor;
-
-
-  QPopupMenu* m_popup;
-  QGuardedPtr<QPopupMenu>	m_anchorMenu;
-    		
-	KAction* m_docDeleteAction;	
-	KAction* m_docSaveAction;
-	
-	KToggleAction* m_boldAction;
-	KToggleAction* m_italicAction;
-	KToggleAction* m_underlineAction;
-	
-	KToggleAction* m_alignLeftAction;			
-	KToggleAction* m_alignCenterAction;		
-	KToggleAction* m_alignRightAction;	
-	KToggleAction* m_alignJustifyAction;
-	
-	KFontSizeAction* m_fontSizeAction;
-	KFontAction* m_fontAction;
-	KColorButton* m_colorChooser;
-	QPoint m_hoverPos;
-	
-	ListCSwordModuleInfo* m_moduleList;
-			
-signals: // Signals
-  void sigDeleteDocument();
-  void sigSaveDocument(const QString);
-	/**
-	* First parameter is the module, the second the key.
-	*/
-  void referenceClicked(const QString& module, const QString& key);
-	/**
-	* First parameter is the module, the second the key.
-	*/
-  void referenceDropped(const QString& key);
-  void linkClicked(const QString&);
-	void insertReference(const QString& reference);
-};
-
-
-#endif
diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp
index 77ab827..61d6b51 100644
--- a/bibletime/frontend/cinputdialog.cpp
+++ b/bibletime/frontend/cinputdialog.cpp
@@ -21,7 +21,7 @@
 //Qt includes
 #include <qwidget.h>
 #include <qlabel.h>
-#include <qmultilineedit.h>
+#include <qtextedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 
@@ -39,8 +39,8 @@ CInputDialog::CInputDialog(const QString& caption, const QString& description, c
 	
 	topLayout->addSpacing(10);
 	
-	m_editWidget = new QMultiLineEdit(this, "edit widget");
-	m_editWidget->setWordWrap( QMultiLineEdit::WidgetWidth);
+	m_editWidget = new QTextEdit(this, "edit widget");
+	m_editWidget->setWordWrap( QTextEdit::WidgetWidth );
 	m_editWidget->setText(text);
 	if (!text.isEmpty())
 		m_editWidget->selectAll();
@@ -76,20 +76,16 @@ CInputDialog::CInputDialog(const QString& caption, const QString& description, c
 	m_editWidget->setFocus();
 }
 
-CInputDialog::~CInputDialog(){
-}
+//CInputDialog::~CInputDialog(){
+//}
 
 /** Returns the text entered at the moment. */
 const QString CInputDialog::text() {
-	ASSERT(m_editWidget);
 	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){
-	qDebug("CInputDialog::getText( const QString& caption, const QString& description, const QString& text, bool* ok, QWidget* parent, bool modal)");
-	ASSERT(ok);
-	
 	CInputDialog* dlg = new CInputDialog(caption, description, text, parent, "", modal);	
 	QString ret = QString::null;
 		
diff --git a/bibletime/frontend/cinputdialog.h b/bibletime/frontend/cinputdialog.h
index 7b3b4b0..8fa2c11 100644
--- a/bibletime/frontend/cinputdialog.h
+++ b/bibletime/frontend/cinputdialog.h
@@ -21,7 +21,7 @@
 //KDE includes
 #include <kdialog.h>
 
-class QMultiLineEdit;
+class QTextEdit;
 class QWidget;
 
 /** This is a small input dialog with
@@ -40,10 +40,10 @@ public:
  	* Returns the text entered at the moment.
  	*/
   const QString text();
-	~CInputDialog();
+//	~CInputDialog();
 
 private:
-	QMultiLineEdit* m_editWidget;
+	QTextEdit* m_editWidget;
 };
 
 #endif
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
index 960a082..c1d35bc 100644
--- a/bibletime/frontend/cmdiarea.cpp
+++ b/bibletime/frontend/cmdiarea.cpp
@@ -18,17 +18,15 @@
 #include "cmdiarea.h"
 #include "backend/cswordmoduleinfo.h"
 #include "backend/cswordversekey.h"
-#include "presenters/cbiblepresenter.h"
-#include "presenters/clexiconpresenter.h"
-#include "presenters/ccommentarypresenter.h"
-#include "keychooser/ckeychooser.h"
-#include "resource.h"
-#include "whatsthisdef.h"
+
+#include "frontend/displaywindow/cdisplaywindow.h"
+#include "frontend/keychooser/ckeychooser.h"
+
 #include "config.h"
 
 //KDE includes
 #include <kpopupmenu.h>
-#include <kapp.h>
+#include <kapplication.h>
 #include <klocale.h>
 
 //QT includes
@@ -36,16 +34,20 @@
 #include <qtimer.h>
 #include <qevent.h>
 #include <qwhatsthis.h>
+#include <qtimer.h>
+
 
 CMDIArea::CMDIArea(QWidget *parent, const char *name )
-	: QWorkspace(parent, name) {			
-	m_childEvent = false;
-	guiOption = Nothing;
-	m_appCaption = QString::null;
-	
+	: QWorkspace(parent, name),
+    m_guiOption(Nothing),
+    m_childEvent(false),
+    m_deleting(false),
+    m_appCaption(QString::null)
+{			
 	initView();
 	initConnections();
 	readSettings();
+//  setAcceptDrops(true);
 }
 
 CMDIArea::~CMDIArea(){
@@ -53,7 +55,8 @@ CMDIArea::~CMDIArea(){
 
 /** Initializes the view of the MDI area */
 void CMDIArea::initView(){
-	QWhatsThis::add(this, WT_MDI_AREA_WIDGET );	
+//	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 */
@@ -64,68 +67,83 @@ void CMDIArea::initConnections(){
 
 /** Called whan a client window was activated */
 void CMDIArea::slotClientActivated(QWidget* client){
-//	qWarning("slotClientActivated(QWidget* client)");
-	if (!client)
-		return;				
-	CSwordPresenter* sp = dynamic_cast<CSwordPresenter*>(client);	
-	if (sp && !sp->initialized())
+	if (!client || !isUpdatesEnabled()) {
+    return;
+  }
+
+	CDisplayWindow* sp = dynamic_cast<CDisplayWindow*>(client);	
+	if (!sp || !sp->isReady())
 		return;
-	
-	m_appCaption = client->caption().stripWhiteSpace();	
-//	qWarning("caption is %s", m_appCaption.latin1());
-	emit sigSetToplevelCaption( m_appCaption );	
 
-	CBiblePresenter* p = dynamic_cast<CBiblePresenter*>(client);
-	if (p && p->keyChooser())
-		syncCommentaries( p->keyChooser()->key() );
+  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 ){
-	if (m_childEvent)
-		return;	
-	QWorkspace::childEvent(e);		
+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 sigSetToplevelCaption( KApplication::kApplication()->makeStdCaption(m_appCaption) );
 		emit sigLastPresenterClosed();
 	}	
-	if (!e) {
-		m_childEvent = false;
-		return;
-	}
-	
-	if (e->inserted() || e->removed()) {
-		switch (guiOption) {
+
+  if (!m_deleting && isUpdatesEnabled() && (e->inserted() || e->removed()) ) {
+		switch (m_guiOption) {
 	 		case autoTile:
-				QTimer::singleShot( 0, this, SLOT(tile()) );
-//				tile();
+				QTimer::singleShot(0, this, SLOT(myTile()));
 	 			break;
 	 		case autoCascade:
-				QTimer::singleShot( 0, this, SLOT(cascade()) );
-//				cascade();
+				myCascade();
 	 			break;
 	 		default:
 	 			break;
 		}
+
 	}
 
-	m_childEvent = false;
+  m_childEvent = false;
+
+  if (windowList().count() == 0) {
+    m_deleting = false;
+  }
 }
 
 /** Reimplementation */
-void CMDIArea::resizeEvent(QResizeEvent* e){	
+void CMDIArea::resizeEvent(QResizeEvent* e){
 	QWorkspace::resizeEvent(e);	
-	switch (guiOption) {
+
+  if (m_deleting ||  !isUpdatesEnabled()) {
+    return;
+  };
+  
+  switch (m_guiOption) {
  		case autoTile:
- 			QTimer::singleShot( 0, this, SLOT(tile()) );
-//			tile();
+			myTile();
  			break;
  		case autoCascade:
- 			QTimer::singleShot( 0, this, SLOT(cascade()) );
-//			cascade();
+			myCascade();
  			break;
  		default:
  			break;
@@ -141,144 +159,79 @@ void CMDIArea::readSettings(){
 }
 
 /** Deletes all the presenters in the MDI area. */
-void CMDIArea::deleteAll(){
-	QWidgetList windows = windowList();
-	
-	setUpdatesEnabled(false);
-	for ( QWidget* w = windows.first(); w; w = windows.next() ) {
-		w->setUpdatesEnabled(false);
-		m_deleteWindows.clear();
-		delete w;
-	}
-	setUpdatesEnabled(true);		
+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( mdiOption new_GUIOption){
-	guiOption = new_GUIOption;
+void CMDIArea::setGUIOption( const MDIOption& newOption ){
 	//now do the initial action
-	switch (guiOption) {
+	switch (( m_guiOption = newOption )) { //set new value and decide what to do
  		case autoTile:
-			tile();
+			myTile();
  			break;
  		case autoCascade:
-			cascade();
+			myCascade();
  			break;
- 		case Nothing:
+ 		default:
  			break;
-	}	
+ 	}
 }
 
 /**  */
-void CMDIArea::tile(){
-	if (!isUpdatesEnabled() || !windowList().count() )	
-		return;
-	if (windowList().count() == 1 /*&& !windowList().at(0)->isHidden() && !windowList().at(0)->isMinimized()*/) {
+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)->showMaximized();
+		windowList().at(0)->parentWidget()->showMaximized();
 	}
-	else
-		QWorkspace::tile();
+	else {
+    QWidget* active = activeWindow();
+	  tile();
+    active->setFocus();
+  }
 }
 
 /**  */
-void CMDIArea::cascade(){
-	if (!isUpdatesEnabled() || !windowList().count() )
-		return;		
-	if (windowList().count() == 1 /*&& !windowList().at(0)->isHidden() && !windowList().at(0)->isMinimized()*/) {
-		m_appCaption = windowList().at(0)->caption();		
-		windowList().at(0)->showMaximized();
-	}
- 	else
-		QWorkspace::cascade();
-}
-
-/** Sync the commentaries to the given key. */
-void CMDIArea::syncCommentaries(CSwordKey* syncKey){
-	QWidgetList windows = windowList();	
-	if (!windows.count())
-		return;	
-	
-	for (windows.first(); windows.current(); windows.next()) {
-		CCommentaryPresenter* p = dynamic_cast<CCommentaryPresenter*>(windows.current());
-		if (p)
-			p->synchronize(syncKey);
-	}	
-}
-
-/** Look up the text in the module. If the module has already a display window of it opne use it, otherwise create a new one. */
-void CMDIArea::lookupInLexicon(const QString& text, const QString& module){
-//	qWarning("CMDIArea::lookupInLexicon(const QString& text, const QString& module)");
-	CSwordModuleInfo* m = backend()->findModuleByName(module);
-	ASSERT(m);
-	if (!m)
-		return;
-	CLexiconPresenter* p = 0;
-	
-	QWidgetList windows = windowList();	
-	if (!windows.count())
-		return;
-	bool found = false;
-	for (windows.first(); windows.current(); windows.next()) {
-		p = dynamic_cast<CLexiconPresenter*>(windows.current());
-		if (p && (m == p->getModuleList().first())) {
-			found = true;
-			break;
-		}
-	}
-	if (!found)
-		emit createNewSwordPresenter(m, text);
-	else
-		p->lookup(module, text);
-}
-
-/** Look up the text in the module. If the module has already a display window of it opne use it, otherwise create a new one. */
-void CMDIArea::lookupInModule(const QString& module, const QString& key){
-//	qWarning("CMDIArea::lookupInLexicon(const QString& text, const QString& module)");
-	CSwordModuleInfo* m = backend()->findModuleByName(module);
-	if (!m)
+void CMDIArea::myCascade(){
+	if (m_deleting || !isUpdatesEnabled() || !windowList().count() ) {
 		return;
-	CSwordPresenter* p = 0;
-
-	bool found = false;	
-	QWidgetList windows = windowList();	
-	for (windows.first(); windows.current(); windows.next()) {
-		p = dynamic_cast<CSwordPresenter*>(windows.current());
-		if (p && (p->getModuleList().containsRef(m))) {
-			found = true;
-			break;
-		}
+  }
+    
+	if ((windowList().count() == 1) && windowList().at(0)) {
+    m_appCaption = windowList().at(0)->caption();
+		windowList().at(0)->parentWidget()->showMaximized();
 	}
-	if (!found)
-		emit createNewSwordPresenter(m, key);
-	else
-		p->lookup(module, key);
-}
-
-/** Closes and deletes the presenter given as argument. */
-void CMDIArea::closePresenter(CSwordPresenter* p){
-	if (!p)
-		return;
-	
-	m_deleteWindows.append(p);
-  QTimer::singleShot(5000, this, SLOT(deleteCurrentPresenter()) );	
-}
-
-/** Delete the presenter. */
-void CMDIArea::deleteCurrentPresenter(){
-	setUpdatesEnabled(false);
-	CSwordPresenter* p = m_deleteWindows.first();
-//	if ( p ) {
-		delete p;
-		m_deleteWindows.removeRef(p);
-//	}
-	setUpdatesEnabled(true);
-	slotClientActivated(activeWindow());
-	if (activeWindow())
-		m_appCaption = activeWindow()->caption();
+ 	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
index a1816f5..978363a 100644
--- a/bibletime/frontend/cmdiarea.h
+++ b/bibletime/frontend/cmdiarea.h
@@ -18,19 +18,18 @@
 #ifndef CMDIAREA_H
 #define CMDIAREA_H
 
-#include "cpointers.h"
+//BibleTime includes
+#include "util/cpointers.h"
+#include "backend/cswordmoduleinfo.h"
 
-#define private protected
+//Qt includes
 #include <qworkspace.h>
-#undef private
-
-#include <qlist.h>
+#include <qptrlist.h>
 #include <qstrlist.h>
 #include <qevent.h>
 
 class KPopupMenu;
 class CSwordModuleInfo;
-class CSwordPresenter;
 class CSwordKey;
 
 /** The MDI widget we use in BibleTime.
@@ -44,7 +43,7 @@ public:
 	/**
 	* The options you can set for this widget.
 	*/
-	enum mdiOption {
+	enum MDIOption {
 		autoTile,
 		autoCascade,
 		Nothing
@@ -60,8 +59,9 @@ public:
   /**
   * Enable / disable autoCascading
   */
-  void setGUIOption( mdiOption );
-  /** This works around a problem/limitation in QWorkspace. QWorkspace sets every time the 	
+  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).
 	*/
@@ -76,28 +76,18 @@ public slots:
   * 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 cascade();
-  /**
- 	*
+  void myCascade();
+  /** Our own cascade version which, if only one window is left, shows this maximized.
+ 	* Also necessary for autoTile feature
  	*/
-  void tile();
-  /**
-  * Sync the commentaries to the given key.
-  */
-  void syncCommentaries(CSwordKey* syncKey);
+  void myTile();
   /**
-  * Look up the text in the module. If the module has already a display window
-  * of it opne use it, otherwise create a new one.
+  * Emits the signal to create a new display window in the MDI area.
   */
-  void lookupInLexicon(const QString& text, const QString& module);
-  void lookupInModule(const QString& module, const QString& key);
-  /**
-  * Closes and deletes the presenter given as argument.
-  */
-  void closePresenter(CSwordPresenter* p);
+  void emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName );
 
 protected: // Protected methods
   /**
@@ -126,18 +116,12 @@ signals: // Signals
   * Is emitted when the last presenter was closed.
   */
   void sigLastPresenterClosed();
-  void createNewSwordPresenter(CSwordModuleInfo*, const QString&);
+  void createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& keyName);
 
 private:
-	mdiOption guiOption;
+	MDIOption m_guiOption;
 	bool m_childEvent;
-	QList<CSwordPresenter> m_deleteWindows;
+  bool m_deleting;
 	QString m_appCaption;
-		
-private slots: // Private slots
-  /**
-  * Delete the presenter.
-  */
-  void deleteCurrentPresenter();
 };
 #endif
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp
index c0d8491..f921320 100644
--- a/bibletime/frontend/coptionsdialog.cpp
+++ b/bibletime/frontend/coptionsdialog.cpp
@@ -17,17 +17,18 @@
 
 #include "coptionsdialog.h"
 #include "cprofile.h"
-#include "ctoolclass.h"
-#include "presenters/cswordpresenter.h"
-#include "presenters/cbiblepresenter.h"
-#include "presenters/ccommentarypresenter.h"
-#include "presenters/clexiconpresenter.h"
-#include "presenters/cbookpresenter.h"
-#include "resource.h"
-#include "whatsthisdef.h"
+
 #include "backend/cswordbackend.h"
 #include "backend/cswordmoduleinfo.h"
-#include "cbtconfig.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>
@@ -53,19 +54,25 @@
 #include <kapp.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kstddirs.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("Optionsdialog"), Ok | Cancel | Apply, Ok, parent, name, true, true, QString::null, QString::null, QString::null) {
+	: 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);
@@ -80,12 +87,16 @@ COptionsDialog::COptionsDialog(QWidget *parent, const char *name, KAccel* accel
 
 /**  */
 void COptionsDialog::newDisplayWindowFontSelected(const QFont &newFont){
-	m_settings.fonts.fontMap.replace(m_settings.fonts.usage->currentText(), 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){
-	m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[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 */
@@ -119,7 +130,7 @@ void COptionsDialog::slotApply(){
 /** Adds a new view profile to the list. */
 void COptionsDialog::addNewProfile(){
 	bool ok = false;
-	QString name = QInputDialog::getText(i18n("Create new profile"), i18n("Please enter the name of the new profile"), QString::null, &ok);
+	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);				
@@ -142,8 +153,7 @@ void COptionsDialog::renameProfile(){
 	CProfile* profile = m_settings.profiles.mgr.profile(currentProfile);
 	if (!profile)
 		return;
-		
-	const QString newName = QInputDialog::getText(i18n("Rename profile"), i18n("Please enter the new name of the profile"),profile->name(), &ok);
+	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());
@@ -151,7 +161,7 @@ void COptionsDialog::renameProfile(){
 }
 
 /** Opens the page which contaisn the given part ID. */
-const bool COptionsDialog::showPart(  COptionsDialog::Parts ID ){
+const bool COptionsDialog::showPart( COptionsDialog::Parts ID ){
 	bool ret = false;
 	switch (ID) {
 		case COptionsDialog::ViewProfiles:
@@ -167,13 +177,14 @@ const bool COptionsDialog::showPart(  COptionsDialog::Parts ID ){
 
 /** Initializes the startup section of the OD. */
 void COptionsDialog::initStartup(){
-	QFrame* page = addPage(i18n("Startup"), QString::null, OD_ICON_GENERAL);
+	QFrame* page = addPage(i18n("Startup"), QString::null, DesktopIcon(CResMgr::settings::startup::icon,32));
 	QVBoxLayout* layout = new QVBoxLayout(page,5);
-	{//daily tips
+
+  {//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, TT_OD_GENERAL_DAILY_TIP);	
-		QWhatsThis::add(m_settings.startup.showTips, WT_OD_GENERAL_DAILY_TIP);
+		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) );
 	}
@@ -182,20 +193,21 @@ void COptionsDialog::initStartup(){
 	{ //startup logo
 		m_settings.startup.showLogo = new QCheckBox(page);
 		m_settings.startup.showLogo->setText(i18n("Show startuplogo"));
-		QWhatsThis::add(m_settings.startup.showLogo, WT_OD_GENERAL_SHOW_STARTUPLOGO);
-		QToolTip::add(m_settings.startup.showLogo, TT_OD_GENERAL_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
+
+  { //workspace
 		m_settings.startup.restoreWorkspace = new QCheckBox(page);
-		m_settings.startup.restoreWorkspace->setText(i18n("Restore windows in workspace area"));
-		QToolTip::add(m_settings.startup.restoreWorkspace, TT_OD_GENERAL_RESTORE_WORKSPACE);		
-		QWhatsThis::add(m_settings.startup.restoreWorkspace, WT_OD_GENERAL_RESTORE_WORKSPACE);
-		
-		m_settings.startup.restoreWorkspace->setChecked(CBTConfig::get(CBTConfig::restoreWorkspace));			
-	}		
+		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);
@@ -203,132 +215,220 @@ void COptionsDialog::initStartup(){
 
 /** Init fonts section. */
 void COptionsDialog::initFonts(){
-	QFrame* page = addPage(i18n("Fonts"), QString::null, OD_ICON_FONTS);
+	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("Choose fonts"), i18n("The fonts you can choose here are used in the display windows. Use the drop-down box below to choose the area of application. Then select a font for it. Make sure the charset \"iso10646-1\" is available for the selected Unicode font.!")) );
+ 	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);
- 					
- 	m_settings.fonts.usage = new QComboBox(page);		
- 	QToolTip::add(m_settings.fonts.usage, TT_OD_FONTS_TYPE_CHOOSER);	 	
- 	QWhatsThis::add(m_settings.fonts.usage, WT_OD_FONTS_TYPE_CHOOSER);	
- 	layout->addWidget(m_settings.fonts.usage);
-	 	
- 	m_settings.fonts.fontMap.insert(i18n("Standard"), CBTConfig::get(CBTConfig::standard));
- 	m_settings.fonts.fontMap.insert(i18n("Unicode"),  CBTConfig::get(CBTConfig::unicode));
-
- 	for( QMap<QString, QFont>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it )
- 		m_settings.fonts.usage->insertItem(it.key());
-		
+
+
+  //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"));
+ 	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&)));
- 	QWhatsThis::add(m_settings.fonts.fontChooser, WT_OD_FONTS_CHOOSER);
-		 	
- 	m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()] );
- 	m_settings.fonts.fontChooser->setMinimumSize(m_settings.fonts.fontChooser->sizeHint());		
+
+ 	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, OD_ICON_COLORS);
+	QFrame* page = addPage(i18n("Colors"), QString::null, DesktopIcon(CResMgr::settings::colors::icon,32));
 //	QVBoxLayout* layout = new QVBoxLayout(page);
-	QGridLayout* gridLayout = new QGridLayout(page,5,5,5,5);
+	QGridLayout* gridLayout = new QGridLayout(page,8,5,5,5);
   gridLayout->setResizeMode(QLayout::Minimum);
-		
+
   gridLayout->addMultiCellWidget(
   	CToolClass::explanationLabel(page,
   		i18n("Choose colors"),
-  		i18n("Choose the colors to change the look of the display windows to your own preferences. Some options like \"Words of Jesus\" do only apply to texts which support this special feature.")
-  	),  	
+  		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);		
-	QLabel* label = new QLabel(m_settings.colors.text, i18n("Text"), page);			
+
+	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);
-	
-	m_settings.colors.background = new KColorButton(CBTConfig::get(CBTConfig::backgroundColor), page);			
-	label = new QLabel(m_settings.colors.background, i18n("Background"), page);		
-	gridLayout->addWidget(label,1,3);
-	gridLayout->addWidget(m_settings.colors.background,1,4);
-		
+  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);
-	gridLayout->addWidget(label,2,0);
-	gridLayout->addWidget(m_settings.colors.highlightedVerse,2,1);
+  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);
 
-	m_settings.colors.swordrefs = new KColorButton(CBTConfig::get(CBTConfig::swordRefColor), page);
 	label = new QLabel(m_settings.colors.swordrefs,i18n("Hyperlinks"), page);
-	gridLayout->addWidget(label,2,3);
-	gridLayout->addWidget(m_settings.colors.swordrefs,2,4);
-
-	m_settings.colors.footnotes = new KColorButton(CBTConfig::get(CBTConfig::footnotesColor), page);		
-	label = new QLabel(m_settings.colors.footnotes,i18n("Footnotes"), page);			
-	gridLayout->addWidget(label,3,0);
-	gridLayout->addWidget(m_settings.colors.footnotes,3,1);
-
-	m_settings.colors.strongs = new KColorButton(CBTConfig::get(CBTConfig::strongsColor), page);		
-	label = new QLabel(m_settings.colors.strongs, i18n("Strong's numbers"), page);			
-	gridLayout->addWidget(label,3,3);
-	gridLayout->addWidget(m_settings.colors.strongs,3,4);
-
-	m_settings.colors.morph = new KColorButton(CBTConfig::get(CBTConfig::morphsColor), page);		
-	label = new QLabel(m_settings.colors.morph, i18n("Morphologic tags"), page);			
-	gridLayout->addWidget(label,4,0);
-	gridLayout->addWidget(m_settings.colors.morph,4,1);
-
-	m_settings.colors.jesuswords = new KColorButton(CBTConfig::get(CBTConfig::jesuswordsColor), page);		
-	label = new QLabel(m_settings.colors.jesuswords, i18n("Words of Jesus"), page);			
-	gridLayout->addWidget(label,4,3);
-	gridLayout->addWidget(m_settings.colors.jesuswords,4,4);
-	
-	gridLayout->setRowStretch(5, 5);
+  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("Profiles"),QString::null, OD_ICON_PROFILES);
+	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 your profiles"),
-			i18n("Profiles define the appereance of the work area, \
+			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. \
-Don't forget that new profiles only work after you've saved something in them.")
+New sessions only work after you've saved something into them.")
 		),
 		0,0,0,-1
 	);
-	
-	m_settings.profiles.profiles = new QListBox(page);					
+
+	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 profile"), page);
+
+	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 profile"), page);	
+
+	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 profile"), page);		
+
+	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);	
+  gridLayout->addWidget(m_settings.profiles.renameProfile,2,2);
 
   //fill the profile list box
-	QList<CProfile> profiles = m_settings.profiles.mgr.profiles();
-	if (profiles.count()) {
-		for (CProfile* p = profiles.first(); p; p = profiles.next()) {
+	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);
@@ -337,111 +437,124 @@ Don't forget that new profiles only work after you've saved something in them.")
 
 /** Init accel key section. */
 void COptionsDialog::initAccelerators(){
-	QVBox* page = addVBoxPage(i18n("Accelerators"),QString::null, OD_ICON_KEY_BINDINGS);
+  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"));
+	currentTab->setMargin(3);
+  tabCtl->addTab(currentTab, i18n("Application-wide"));
 
-	m_settings.keys.application.dict = m_settings.keys.application.accel->keyDict();
- 	m_settings.keys.application.keyChooser = new KKeyChooser( &m_settings.keys.application.dict, currentTab, false );	
- 	QToolTip::add(m_settings.keys.application.keyChooser, TT_OD_KEYS_CHOOSER);
-	QWhatsThis::add(m_settings.keys.application.keyChooser, WT_OD_KEYS_CHOOSER);	
+	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
-//	CSwordPresenter::insertKeyboardActions( m_settings.keys.general.accel );		
-//	m_settings.keys.general.accel->readSettings();
-// 	m_settings.keys.general.dict = m_settings.keys.general.accel->keyDict();
-// 	m_settings.keys.general.keyChooser = new KKeyChooser( &m_settings.keys.general.dict, currentTab, false );	
-// 	QToolTip::add(m_settings.keys.general.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_GENERAL);
+	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);	
+	currentTab->setMargin(3);
 	tabCtl->addTab(currentTab, i18n("Bible windows"));
 
 	m_settings.keys.bible.accel = new KAccel(this); //delete in destructor
-	CBiblePresenter::insertKeyboardActions( m_settings.keys.bible.accel );
-	m_settings.keys.bible.accel->readSettings();		
- 	m_settings.keys.bible.dict = m_settings.keys.bible.accel->keyDict();
- 	m_settings.keys.bible.keyChooser = new KKeyChooser( &m_settings.keys.bible.dict, 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);
+	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);	
+	currentTab->setMargin(3);
 	tabCtl->addTab(currentTab, i18n("Commentary windows"));
 
 	m_settings.keys.commentary.accel = new KAccel(this); //delete in destructor
-	CCommentaryPresenter::insertKeyboardActions( m_settings.keys.commentary.accel );		
-	m_settings.keys.commentary.accel->readSettings();	
- 	m_settings.keys.commentary.dict = m_settings.keys.commentary.accel->keyDict();
- 	m_settings.keys.commentary.keyChooser = new KKeyChooser( &m_settings.keys.commentary.dict, 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);
+	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);	
+	currentTab->setMargin(3);
 	tabCtl->addTab(currentTab, i18n("Lexicon windows"));
 
 	m_settings.keys.lexicon.accel = new KAccel(this); //delete in destructor
-	CLexiconPresenter::insertKeyboardActions( m_settings.keys.lexicon.accel );		
-	m_settings.keys.lexicon.accel->readSettings();	 	
- 	m_settings.keys.lexicon.dict = m_settings.keys.lexicon.accel->keyDict(); 	
- 	m_settings.keys.lexicon.keyChooser = new KKeyChooser( &m_settings.keys.lexicon.dict, 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);
+	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();
 
-	
-// ----- new tab: Lexicon windows ------ //
+ 	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);	
+	currentTab->setMargin(3);
 	tabCtl->addTab(currentTab, i18n("Book windows"));
 
 	m_settings.keys.book.accel = new KAccel(this); //delete in destructor
-	CBookPresenter::insertKeyboardActions( m_settings.keys.book.accel );		
-	m_settings.keys.book.accel->readSettings();	 	
- 	m_settings.keys.book.dict = m_settings.keys.book.accel->keyDict(); 	
- 	m_settings.keys.book.keyChooser = new KKeyChooser( &m_settings.keys.book.dict, currentTab, false );	
+	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, OD_ICON_SWORD);
+	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, which speeds up opening large lexicon modules a lot. \
-However these files consume some disk space (usually not much), and reside in \
+			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.sword.lexiconCache = new QCheckBox(currentTab);
-	m_settings.sword.lexiconCache->setText(i18n("Use key cache for lexicons"));
-	QToolTip::add(m_settings.sword.lexiconCache, TT_OD_SWORD_USE_LEXICON_CACHE);	
-	QWhatsThis::add(m_settings.sword.lexiconCache, WT_OD_SWORD_USE_LEXICON_CACHE);
-		
-	m_settings.sword.lexiconCache->setChecked( CBTConfig::get(CBTConfig::lexiconCache) );
- 	gridLayout->addMultiCellWidget(m_settings.sword.lexiconCache,1,1,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"),
@@ -449,115 +562,125 @@ $KDEHOME/share/apps/bibletime/cache.")),
 if you want it to move to the <i>previous</i> verse.")),
 		2,2,0,-1
   );
- 		
- 	m_settings.sword.useDownArrow = new QCheckBox(currentTab);
- 	m_settings.sword.useDownArrow->setText(i18n("Use down arrow to scroll to next verse"));
- 	m_settings.sword.useDownArrow->setChecked(CBTConfig::get(CBTConfig::scroll));		
- 	QWhatsThis::add(m_settings.sword.useDownArrow, WT_OD_GENERAL_SCROLL_PREVIOUS);
- 	QToolTip::add(m_settings.sword.useDownArrow, TT_OD_GENERAL_SCROLL_PREVIOUS);
- 	gridLayout->addMultiCellWidget(m_settings.sword.useDownArrow,3,3,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 choose. If you want to \
+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.sword.localeCombo = new QComboBox(currentTab);
- 	QLabel* label = new QLabel(m_settings.sword.localeCombo, i18n("Language for booknames"), currentTab); 	
- 	QToolTip::add(m_settings.sword.localeCombo, TT_OD_GENERAL_INTERNATIONAL_BOOKNAMES);				
- 	QWhatsThis::add(m_settings.sword.localeCombo, WT_OD_GENERAL_INTERNATIONAL_BOOKNAMES);		
+
+ 	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.sword.localeCombo, 5,1);
+ 	gridLayout->addWidget(m_settings.swords.localeCombo, 5,1);
 
  	gridLayout->setRowStretch(6,5); //eat up remaining space :)
- 	 	 										
- 	m_settings.sword.localeCombo->insertItem( i18n("English") );
- 	list <string> locales = LocaleMgr::systemLocaleMgr.getAvailableLocales();
- 	for (list <string>::iterator it = locales.begin(); it != locales.end(); it++) {
- 		m_settings.sword.localeCombo->insertItem( i18n(LocaleMgr::systemLocaleMgr.getLocale((*it).c_str())->getDescription()) );
+
+ 	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.sword.localeCombo->count(); test_item++) {
- 		SWLocale* locale = LocaleMgr::systemLocaleMgr.getLocale(CBTConfig::get(CBTConfig::language).local8Bit());
- 		if (locale && m_settings.sword.localeCombo->text(test_item).contains(i18n(locale->getDescription())) )
+ 	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.sword.localeCombo->setCurrentItem(current_item);
+ 		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,9,2, 5,5); //the last row is for stretching available space
+	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. This may happen with references into modules like Bibles or Lexicons.")),
+  	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.sword.standardBible = new QComboBox(currentTab);
-  label = new QLabel(m_settings.sword.standardBible, i18n("Default Bible"), currentTab);
+
+ 	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.sword.standardBible, TT_OD_SWORD_STANDARD_BIBLE);	
- 	QWhatsThis::add(m_settings.sword.standardBible, WT_OD_SWORD_STANDARD_BIBLE);		
- 	gridLayout->addWidget(label,1,0); 	
- 	gridLayout->addWidget(m_settings.sword.standardBible,1,1);
- 	 	
- 	m_settings.sword.standardCommentary = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.sword.standardCommentary, i18n("Default Commentary"), currentTab);
-  label->setAutoResize(true); 	
- 	QToolTip::add(m_settings.sword.standardCommentary, TT_OD_SWORD_STANDARD_COMMENTARY);	
- 	QWhatsThis::add(m_settings.sword.standardCommentary, WT_OD_SWORD_STANDARD_COMMENTARY);		
+ 	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.sword.standardCommentary,2,1);
+ 	gridLayout->addWidget(m_settings.swords.standardCommentary,2,1);
 
 
- 	m_settings.sword.standardLexicon = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.sword.standardLexicon, i18n("Default Lexicon"), currentTab);
-  label->setAutoResize(true); 	
- 	QToolTip::add(m_settings.sword.standardLexicon, TT_OD_SWORD_STANDARD_LEXICON);	
- 	QWhatsThis::add(m_settings.sword.standardLexicon, WT_OD_SWORD_STANDARD_LEXICON);		
- 	gridLayout->addWidget(label,3,0); 	
- 	gridLayout->addWidget(m_settings.sword.standardLexicon,3,1); 	
-		
- 	m_settings.sword.standardHebrewStrong = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.sword.standardHebrewStrong, i18n("Default Hebrew Strong's Lexicon"), currentTab);
-  label->setAutoResize(true); 	 	
- 	QToolTip::add(m_settings.sword.standardHebrewStrong, TT_OD_SWORD_STANDARD_HEBREW_STRONG);
- 	QWhatsThis::add(m_settings.sword.standardHebrewStrong, WT_OD_SWORD_STANDARD_HEBREW_STRONG);
+ 	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.sword.standardHebrewStrong,4,1);
-		
- 	m_settings.sword.standardGreekStrong = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.sword.standardGreekStrong, i18n("Default Greek Strong's Lexicon"), currentTab);
-  label->setAutoResize(true); 	 	
- 	QToolTip::add(m_settings.sword.standardGreekStrong, TT_OD_SWORD_STANDARD_GREEK_STRONG); 	
- 	QWhatsThis::add(m_settings.sword.standardGreekStrong, WT_OD_SWORD_STANDARD_GREEK_STRONG);
+ 	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.sword.standardGreekStrong,5,1);
-		
- 	m_settings.sword.standardHebrewMorph = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.sword.standardHebrewMorph, i18n("Default Hebrew Morphological Lexicon"), currentTab);
- 	QToolTip::add(m_settings.sword.standardHebrewMorph, TT_OD_SWORD_STANDARD_HEBREW_MORPH);
- 	QWhatsThis::add(m_settings.sword.standardHebrewMorph, WT_OD_SWORD_STANDARD_HEBREW_MORPH);
+ 	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.sword.standardHebrewMorph,6,1);
+ 	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.sword.standardGreekMorph = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.sword.standardGreekMorph, i18n("Default Greek Morphological Lexicon"), currentTab);
+ 	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.sword.standardGreekMorph, TT_OD_SWORD_STANDARD_GREEK_MORPH);
- 	QWhatsThis::add(m_settings.sword.standardGreekMorph, WT_OD_SWORD_STANDARD_GREEK_MORPH);
- 	gridLayout->addWidget(label,7,0);
- 	gridLayout->addWidget(m_settings.sword.standardGreekMorph,7,1);
+ 	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(8,5);							
+ 	gridLayout->setRowStretch(9,5);							
 		
  	//fill the comboboxes with the right modules
  	ListCSwordModuleInfo& modules = backend()->moduleList();
@@ -566,49 +689,61 @@ create a new locale, see http://www.crosswire.org/sword/develop for details.")),
 		modDescript = modules.current()->config(CSwordModuleInfo::Description);
  		switch (modules.current()->type()) {
  			case CSwordModuleInfo::Bible:
- 				m_settings.sword.standardBible->insertItem(modDescript);
+ 				m_settings.swords.standardBible->insertItem(modDescript);
  				break;
  			case CSwordModuleInfo::Commentary:
- 				m_settings.sword.standardCommentary->insertItem(modDescript);				
+ 				m_settings.swords.standardCommentary->insertItem(modDescript);				
  				break;
  			case CSwordModuleInfo::Lexicon:
  			{
-				m_settings.sword.standardLexicon->insertItem(modDescript);
+        bool inserted = false;
  				if (modules.current()->has(CSwordModuleInfo::HebrewDef)) {
-					m_settings.sword.standardHebrewStrong->insertItem(modDescript);				
+					m_settings.swords.standardHebrewStrong->insertItem(modDescript);
+          inserted = true;          
  				}
  				if (modules.current()->has(CSwordModuleInfo::GreekDef)) {
-					m_settings.sword.standardGreekStrong->insertItem(modDescript);				
+					m_settings.swords.standardGreekStrong->insertItem(modDescript);
+          inserted = true;
  				}
  				if (modules.current()->has(CSwordModuleInfo::HebrewParse)) {
-					m_settings.sword.standardHebrewMorph->insertItem(modDescript);				
+					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()->has(CSwordModuleInfo::GreekParse)) {
-					m_settings.sword.standardGreekMorph->insertItem(modDescript);				
+ 				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					
+ 			default://unknown type
  				break;
  		}
   }
 
 //using two lists and one loop is better than six loops with almost the same code :)
- 	QList<QComboBox> comboList;
+ 	QPtrList<QComboBox> comboList;
  	comboList.setAutoDelete(false);//don't delete the combos accidentally
- 	comboList.append(m_settings.sword.standardBible);
- 	comboList.append(m_settings.sword.standardCommentary);
- 	comboList.append(m_settings.sword.standardLexicon);
- 	comboList.append(m_settings.sword.standardHebrewStrong);
- 	comboList.append(m_settings.sword.standardGreekStrong);
- 	comboList.append(m_settings.sword.standardHebrewMorph);
- 	comboList.append(m_settings.sword.standardGreekMorph);
+ 	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)
@@ -636,85 +771,131 @@ create a new locale, see http://www.crosswire.org/sword/develop for details.")),
   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 choose the default settings of the various filter settings. You can change the settings in each display window, too.")) );
+  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.sword.lineBreaks = new QCheckBox(currentTab);
- 	m_settings.sword.lineBreaks->setText(i18n("Show line break after each verse"));
- 	m_settings.sword.lineBreaks->setChecked(CBTConfig::get(CBTConfig::lineBreaks));		
- 	layout->addWidget(m_settings.sword.lineBreaks);
-
- 	m_settings.sword.verseNumbers = new QCheckBox(currentTab);
- 	m_settings.sword.verseNumbers->setText(i18n("Show verse numbers"));
- 	m_settings.sword.verseNumbers->setChecked(CBTConfig::get(CBTConfig::verseNumbers));		
- 	layout->addWidget(m_settings.sword.verseNumbers);
-
- 	m_settings.sword.footnotes = new QCheckBox(currentTab);
- 	m_settings.sword.footnotes->setText(i18n("Show footnotes"));
- 	m_settings.sword.footnotes->setChecked(CBTConfig::get(CBTConfig::footnotes));		
- 	layout->addWidget(m_settings.sword.footnotes);
-
- 	m_settings.sword.strongNumbers = new QCheckBox(currentTab);
- 	m_settings.sword.strongNumbers->setText(i18n("Show Strong's Numbers"));
- 	m_settings.sword.strongNumbers->setChecked(CBTConfig::get(CBTConfig::strongNumbers));		
- 	layout->addWidget(m_settings.sword.strongNumbers);
-
- 	m_settings.sword.headings = new QCheckBox(currentTab);
- 	m_settings.sword.headings->setText(i18n("Show headings"));
- 	m_settings.sword.headings->setChecked(CBTConfig::get(CBTConfig::headings));		
- 	layout->addWidget(m_settings.sword.headings);
-
- 	m_settings.sword.morphTags = new QCheckBox(currentTab);
- 	m_settings.sword.morphTags->setText(i18n("Show morphologic tags"));
- 	m_settings.sword.morphTags->setChecked(CBTConfig::get(CBTConfig::morphTags));		
- 	layout->addWidget(m_settings.sword.morphTags);
-
- 	m_settings.sword.lemmas = new QCheckBox(currentTab);
- 	m_settings.sword.lemmas->setText(i18n("Show lemmas"));
- 	m_settings.sword.lemmas->setChecked(CBTConfig::get(CBTConfig::lemmas));		
- 	layout->addWidget(m_settings.sword.lemmas);
+ 	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.sword.hebrewPoints = new QCheckBox(currentTab);
- 	m_settings.sword.hebrewPoints->setText(i18n("Show Hebrew vowel points"));
- 	m_settings.sword.hebrewPoints->setChecked(CBTConfig::get(CBTConfig::hebrewPoints));		
- 	layout->addWidget(m_settings.sword.hebrewPoints);
-
- 	m_settings.sword.hebrewCantillation = new QCheckBox(currentTab);
- 	m_settings.sword.hebrewCantillation->setText(i18n("Show Hebrew cantillation marks"));
- 	m_settings.sword.hebrewCantillation->setChecked(CBTConfig::get(CBTConfig::hebrewCantillation));		
- 	layout->addWidget(m_settings.sword.hebrewCantillation);
-
- 	m_settings.sword.greekAccents = new QCheckBox(currentTab);
- 	m_settings.sword.greekAccents->setText(i18n("Show Greek accents"));
- 	m_settings.sword.greekAccents->setChecked(CBTConfig::get(CBTConfig::greekAccents));		
- 	layout->addWidget(m_settings.sword.greekAccents);
-
- 	m_settings.sword.textualVariants = new QCheckBox(currentTab);
- 	m_settings.sword.textualVariants->setText(i18n("Use textual variants"));
- 	m_settings.sword.textualVariants->setChecked(CBTConfig::get(CBTConfig::textualVariants));		
- 	layout->addWidget(m_settings.sword.textualVariants);
+  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(){
-	m_settings.keys.application.accel->setKeyDict( m_settings.keys.application.dict );	
- 	m_settings.keys.application.accel->writeSettings(); 	
- 	
-// 	m_settings.keys.general.accel->setKeyDict( m_settings.keys.general.dict );			
+//#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->setKeyDict( m_settings.keys.bible.dict );					
- 	m_settings.keys.bible.accel->writeSettings();		
-		
- 	m_settings.keys.commentary.accel->setKeyDict( m_settings.keys.commentary.dict );					
- 	m_settings.keys.commentary.accel->writeSettings();
-		
- 	m_settings.keys.lexicon.accel->setKeyDict( m_settings.keys.lexicon.dict );					
- 	m_settings.keys.lexicon.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.book.accel->setKeyDict( m_settings.keys.book.dict );					
- 	m_settings.keys.book.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 */
@@ -731,15 +912,12 @@ void COptionsDialog::saveColors(){
 
 /** No descriptions */
 void COptionsDialog::saveFonts(){
-	for(QMap<QString, QFont>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ){
- 		if (it.key() == i18n("Standard")) {
- 			CBTConfig::set(CBTConfig::standard, it.data());
- 		}
- 		else if (it.key() == i18n("Unicode")) {
- 			QFont font = it.data();
- 			font.setCharSet(QFont::Unicode); //try to set the unicode charset
- 			CBTConfig::set(CBTConfig::unicode, font);
- 		}
+	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());
  	}
 }
 
@@ -757,50 +935,67 @@ void COptionsDialog::saveStartup(){
 /** No descriptions */
 void COptionsDialog::saveSword(){
   bool old_lexiconCache = CBTConfig::get(CBTConfig::lexiconCache);
-  bool new_lexiconCache = m_settings.sword.lexiconCache->isChecked();
-   		
-  CBTConfig::set( CBTConfig::lexiconCache, new_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);			
+   		dir.remove((*it),false);
   }
-       	
-  CBTConfig::set(CBTConfig::standardBible, m_settings.sword.standardBible->currentText());
-  CBTConfig::set(CBTConfig::standardCommentary, m_settings.sword.standardCommentary->currentText());
-  CBTConfig::set(CBTConfig::standardLexicon, m_settings.sword.standardLexicon->currentText());
-  CBTConfig::set(CBTConfig::standardHebrewStrongsLexicon, m_settings.sword.standardHebrewStrong->currentText());
-  CBTConfig::set(CBTConfig::standardGreekStrongsLexicon, m_settings.sword.standardGreekStrong->currentText() );  	
-  CBTConfig::set(CBTConfig::standardHebrewMorphLexicon, m_settings.sword.standardHebrewMorph->currentText());
-  CBTConfig::set(CBTConfig::standardGreekMorphLexicon, m_settings.sword.standardGreekMorph->currentText() );  	
-
- 	const QString currentText = m_settings.sword.localeCombo->currentText();
- 	list <string> locales = LocaleMgr::systemLocaleMgr.getAvailableLocales();
+
+  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 <string>::iterator it = locales.begin(); it != locales.end(); it++) {
- 		if ( i18n(LocaleMgr::systemLocaleMgr.getLocale((*it).c_str())->getDescription()) == currentText ) {
+ 	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())
+ 	if (!localeName.isEmpty()) {
  		CBTConfig::set(CBTConfig::language, localeName);
- 	else
+	}
+ 	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;
 
- 	CBTConfig::set(CBTConfig::scroll, m_settings.sword.useDownArrow->isChecked());
- 	CBTConfig::set(CBTConfig::lineBreaks, m_settings.sword.lineBreaks->isChecked());
- 	CBTConfig::set(CBTConfig::verseNumbers, m_settings.sword.verseNumbers->isChecked());
- 	CBTConfig::set(CBTConfig::footnotes, m_settings.sword.footnotes->isChecked());
- 	CBTConfig::set(CBTConfig::strongNumbers, m_settings.sword.strongNumbers->isChecked());
- 	CBTConfig::set(CBTConfig::headings, m_settings.sword.headings->isChecked());
- 	CBTConfig::set(CBTConfig::morphTags, m_settings.sword.morphTags->isChecked());
- 	CBTConfig::set(CBTConfig::lemmas, m_settings.sword.lemmas->isChecked());
- 	CBTConfig::set(CBTConfig::hebrewPoints, m_settings.sword.hebrewPoints->isChecked());
- 	CBTConfig::set(CBTConfig::hebrewCantillation, m_settings.sword.hebrewCantillation->isChecked());
- 	CBTConfig::set(CBTConfig::greekAccents, m_settings.sword.greekAccents->isChecked());
- 	CBTConfig::set(CBTConfig::textualVariants, m_settings.sword.textualVariants->isChecked()); 		 	
+  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
index c63d80b..ca52da8 100644
--- a/bibletime/frontend/coptionsdialog.h
+++ b/bibletime/frontend/coptionsdialog.h
@@ -19,7 +19,8 @@
 #define COPTIONSDIALOG_H
 
 #include "cprofilemgr.h"
-#include "cpointers.h"
+#include "cbtconfig.h"
+#include "util/cpointers.h"
 
 //QT includes
 #include <qwidget.h>
@@ -35,7 +36,7 @@
 #include <kdialogbase.h>
 #include <kfontdialog.h>
 #include <kaccel.h>
-#include <kcolorbtn.h>
+#include <kcolorbutton.h>
 #include <kapp.h>
 
 class QHBox;
@@ -44,7 +45,6 @@ class QRadioButton;
 class KListBox;
 class KKeyChooser;
 class KTabCtl;
-class CBackEnd;
 
 /**
 	* The optionsdialog of BibleTime
@@ -81,6 +81,7 @@ private:
 			QComboBox* standardBible;
 			QComboBox* standardCommentary;
 			QComboBox* standardLexicon;
+			QComboBox* standardDailyDevotional;
 			QComboBox* standardHebrewStrong;
 			QComboBox* standardGreekStrong;
 			QComboBox* standardHebrewMorph;
@@ -98,13 +99,13 @@ private:
 			QCheckBox* hebrewCantillation;
 			QCheckBox* greekAccents;
 			QCheckBox* textualVariants;
-		} sword;
+      QCheckBox* scriptureReferences;
+		} swords; // not: sword -> namespace error
 		
 		struct KeySettings {
 			struct WindowType {
 				KKeyChooser* keyChooser;
-				KKeyEntryMap dict;			
-				KAccel* accel;		
+				KAccel* accel;
 			};
 			WindowType application;
 			WindowType general;
@@ -117,6 +118,7 @@ private:
 		struct ColorSettings {
 			KColorButton* text;
 			KColorButton* background;
+//			KColorButton* background2;
 			KColorButton* highlightedVerse;
 			KColorButton* swordrefs;
 			KColorButton* footnotes;
@@ -125,10 +127,12 @@ private:
 			KColorButton* jesuswords;
 		} colors;
 		
-		struct FontSettings {		
+    struct FontSettings {		
 			KFontChooser* fontChooser;
 			QComboBox* usage;
-			QMap<QString,QFont> fontMap;			
+      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 {
@@ -170,6 +174,10 @@ protected slots: // Protected slots
   * 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
   /**
diff --git a/bibletime/frontend/cpointers.cpp b/bibletime/frontend/cpointers.cpp
deleted file mode 100644
index 01dc2b3..0000000
--- a/bibletime/frontend/cpointers.cpp
+++ /dev/null
@@ -1,52 +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"
-
-//the static pointers
-static CSwordBackend* m_backend = 0;
-static CPrinter* m_printer = 0;
-
-/** Returns a pointer to the backend ... */
-CSwordBackend* const CPointers::backend() {
-	return m_backend;
-}
-
-/** Returns a pointer to the printer object. */
-CPrinter* const CPointers::printer() {
-	return m_printer;
-}
-
-void CPointers::setPrinter(CPrinter* const printer) {
-	m_printer = printer;
-}
-
-void CPointers::setBackend(CSwordBackend* backend) {
-	m_backend = backend;
-}
-
-void CPointers::deletePrinter() {
-	delete m_printer;
-	m_printer = 0;
-}
-
-void CPointers::deleteBackend() {
-	delete m_backend;
-	m_backend = 0;
-}
diff --git a/bibletime/frontend/cpointers.h b/bibletime/frontend/cpointers.h
deleted file mode 100644
index 0fad9b8..0000000
--- a/bibletime/frontend/cpointers.h
+++ /dev/null
@@ -1,48 +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
-
-
-class CSwordBackend;
-class CPrinter;
-
-/** 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 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();
-};
-
-#endif
diff --git a/bibletime/frontend/cprofile.cpp b/bibletime/frontend/cprofile.cpp
index 176b7ea..54eb79c 100644
--- a/bibletime/frontend/cprofile.cpp
+++ b/bibletime/frontend/cprofile.cpp
@@ -22,18 +22,19 @@
 #include <qfile.h>
 #include <qstring.h>
 #include <qtextstream.h>
+#include <qregexp.h>
 
 //KDE includes
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 #include <klocale.h>
 
-#define CURRENT_SYNTAX_VERSION 1
+#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(0,0,640,480)
+	m_geometry(10,20,640,480)
 {
 	
 	m_profileWindows.setAutoDelete(true);
@@ -44,11 +45,12 @@ CProfile::CProfile( const QString& file, const QString& name ):
 		m_filename = name;
 		m_filename.replace(QRegExp("\\s=#."),"_");
 		KStandardDirs stdDirs;
-		m_filename = stdDirs.saveLocation("data", "bibletime/profiles/") + m_filename + ".xml";
+		m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml";
 		init(m_filename);
 	}
-	else
+	else {
 		qWarning("CProfile: empty file name!");
+  }
 }
 
 CProfile::~CProfile(){
@@ -56,10 +58,10 @@ CProfile::~CProfile(){
 }
 
 /** Loads the profile from the file given in the constructor. */
-QList<CProfileWindow> CProfile::load(){
+QPtrList<CProfileWindow> CProfile::load(){
 	QFile file(m_filename);	
 	if (!file.exists())
-		return QList<CProfileWindow>();
+		return QPtrList<CProfileWindow>();
 	
 	QDomDocument doc;	
 	if (file.open(IO_ReadOnly)) {		
@@ -70,7 +72,7 @@ QList<CProfileWindow> CProfile::load(){
 	}
 	
   QDomElement document = doc.documentElement();
-  if(document.tagName() != "BibleTime") {
+  if( document.tagName() != "BibleTimeProfile" && document.tagName() != "BibleTime" ) { //BibleTime was used in syntax version 1.0
 		qWarning("CProfile::load: Missing BibleTime doc");
 		return m_profileWindows;
 	}
@@ -136,6 +138,12 @@ QList<CProfileWindow> CProfile::load(){
 			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;
 						
@@ -191,7 +199,7 @@ QList<CProfileWindow> CProfile::load(){
 }
 
 /** Saves the profile to the file given in the constructor. */
-const bool CProfile::save(QList<CProfileWindow> windows){
+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
 	*/
@@ -199,7 +207,7 @@ const bool CProfile::save(QList<CProfileWindow> windows){
   QDomDocument doc("DOC");
   doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
 
-  QDomElement content = doc.createElement("BibleTime");
+  QDomElement content = doc.createElement("BibleTimeProfile");
   content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
   content.setAttribute("name", m_name);
   doc.appendChild(content);
@@ -241,6 +249,8 @@ const bool CProfile::save(QList<CProfileWindow> windows){
 		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();
@@ -302,7 +312,7 @@ const QString& CProfile::name(){
 void CProfile::init(const QString file){
 	const QString oldFile = m_filename;
 	m_filename = file;
-	save(QList<CProfileWindow>());
+	save(QPtrList<CProfileWindow>());
 	m_filename = oldFile;
 }
 
diff --git a/bibletime/frontend/cprofile.h b/bibletime/frontend/cprofile.h
index 0187b09..e322401 100644
--- a/bibletime/frontend/cprofile.h
+++ b/bibletime/frontend/cprofile.h
@@ -21,7 +21,7 @@
 #include "cprofilewindow.h"
 
 //Qt includes
-#include <qlist.h>
+#include <qptrlist.h>
 
 /**	Manages one profile file. Provides functions to save and restore settings of the available display windows.
   *	@author The BibleTime team
@@ -35,7 +35,7 @@ public:
   * Saves the profile to the file given in the constructor.
   * @param windows The list of windows available in the profile.
   */
-  const bool save( QList<CProfileWindow> windows );
+  const bool save( QPtrList<CProfileWindow> windows );
   /**
   * Saves the profile to the file given in the constructor.
   */
@@ -44,7 +44,7 @@ public:
   * Loads the profile from the file given in the constructor.
   * @return The list of profiled window which exist in the profile.
   */
- 	QList<CProfileWindow> load();
+ 	QPtrList<CProfileWindow> load();
   /**
   * Returns the name of this profile.
   */
@@ -85,7 +85,7 @@ private:
   void loadBasics();
   void saveBasics();
 	
-	QList<CProfileWindow> m_profileWindows;
+	QPtrList<CProfileWindow> m_profileWindows;
 	QString m_name;
 	QString m_filename;
 	bool m_fullscreen;
diff --git a/bibletime/frontend/cprofilemgr.cpp b/bibletime/frontend/cprofilemgr.cpp
index 11ed004..542f20c 100644
--- a/bibletime/frontend/cprofilemgr.cpp
+++ b/bibletime/frontend/cprofilemgr.cpp
@@ -20,16 +20,16 @@
 //Qt includes
 #include <qdir.h>
 #include <qfile.h>
-#include <qlist.h>
+#include <qptrlist.h>
 
 //KDE includes
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 
 CProfileMgr::CProfileMgr() : m_startupProfile(0) {
 	m_profiles.setAutoDelete(true);
 	
 	KStandardDirs stdDirs;
-	m_profilePath = stdDirs.saveLocation("data", "bibletime/profiles/");	
+	m_profilePath = stdDirs.saveLocation("data", "bibletime/sessions/");	
 	
 	QDir d( m_profilePath );
 	QStringList files = d.entryList("*.xml");
@@ -46,7 +46,7 @@ CProfileMgr::~CProfileMgr(){
 }
 
 /** Returns a list of available profiles. */
-const QList<CProfile>& CProfileMgr::profiles(){	
+const QPtrList<CProfile>& CProfileMgr::profiles(){	
 	return m_profiles;
 }
 
diff --git a/bibletime/frontend/cprofilemgr.h b/bibletime/frontend/cprofilemgr.h
index 4cbbb0c..d26e6d2 100644
--- a/bibletime/frontend/cprofilemgr.h
+++ b/bibletime/frontend/cprofilemgr.h
@@ -40,7 +40,7 @@ public:
   /**
   * @return a list of available profiles
   */
-  const QList<CProfile>& profiles();
+  const QPtrList<CProfile>& profiles();
   /**
   * Removes the profile from the list and from the directory containg the profile files.
   */
@@ -63,7 +63,7 @@ public:
   void refresh();
 
 protected:	
-	QList<CProfile> m_profiles;	
+	QPtrList<CProfile> m_profiles;	
 	QString m_profilePath;
 	CProfile* m_startupProfile;
 };
diff --git a/bibletime/frontend/cprofilewindow.cpp b/bibletime/frontend/cprofilewindow.cpp
index 4f01cc5..63201b8 100644
--- a/bibletime/frontend/cprofilewindow.cpp
+++ b/bibletime/frontend/cprofilewindow.cpp
@@ -18,9 +18,17 @@
 #include "cprofilewindow.h"
 
 CProfileWindow::CProfileWindow(CSwordModuleInfo::ModuleType type)
-	: m_type(type), m_windowGeometry(),m_moduleList(), m_key(QString::null),
-	m_maximized(false), m_windowSettings(0) {
-
+	: 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(){
@@ -28,38 +36,34 @@ CProfileWindow::~CProfileWindow(){
 }
 
 /** Returns the size of the window including the x,y coordinates. */
-const QRect CProfileWindow::geometry() {
+const QRect& CProfileWindow::geometry() const {
 	return m_windowGeometry;
 }
 
 /** Sets the size of the window. */
-void CProfileWindow::setGeometry( const QRect rect ){
+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 CSwordModuleInfo::ModuleType CProfileWindow::type() const {
 	if (m_type != CSwordModuleInfo::Unknown)
 		return m_type;
+  return CSwordModuleInfo::Unknown;
 }
 
 /** Sets the modules. */
-void CProfileWindow::setModules( QStringList 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(){
-//	QStringList modules;
-//	for (CSwordModuleInfo* m = m_moduleList.first(); m; m = m_moduleList.next()) {
-//		modules.append(m->getName());
-//	}
-//	return modules;
+const QStringList& CProfileWindow::modules() const {
 	return m_moduleList;
 }
 
 /** Returns the current key set in the modules. */
-const QString& CProfileWindow::key(){
+const QString& CProfileWindow::key() const {
 	return m_key;
 }
 
@@ -69,37 +73,58 @@ void CProfileWindow::setKey( const QString& key ){
 }
 
 /** Sets the current position of the scrollbars. */
-void CProfileWindow::setScrollbarPositions(const int horizontal, const int vertical) {
+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 CProfileWindow::ScrollbarPos& CProfileWindow::scrollbarPositions() const {
 	return m_scrollbarPos;
 }
 
 /** Sets the type of the used modules. */
-void CProfileWindow::setType(const CSwordModuleInfo::ModuleType type){
+void CProfileWindow::setType(const CSwordModuleInfo::ModuleType& type){
 	m_type = type;
 }
 
 /** Returns true if the window is maximized. */
-const bool CProfileWindow::maximized(){
+const bool& CProfileWindow::maximized() const {
 	return m_maximized;
 }
 
 /** Sets the windows maximized state to true or false. */
-void CProfileWindow::setMaximized( const bool maximized ){
+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 int& CProfileWindow::windowSettings() const {
 	return m_windowSettings;
 }
 
 /** Sets the window specific settings. */
-void CProfileWindow::setWindowSettings( const int 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
index dec8125..10286b8 100644
--- a/bibletime/frontend/cprofilewindow.h
+++ b/bibletime/frontend/cprofilewindow.h
@@ -25,7 +25,7 @@
 #include <qstring.h>
 #include <qrect.h>
 #include <qstringlist.h>
-#include <qlist.h>
+#include <qptrlist.h>
 
 /** Contains the settings for one window saved in the profile.
   * @author The BibleTime team
@@ -42,27 +42,27 @@ public:
   /**
   * Sets the modules.
   */
-  void setModules( QStringList 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 CSwordModuleInfo::ModuleType type() const;
   /**
   * Sets the type of the used modules.
   */
-  void setType(const CSwordModuleInfo::ModuleType type);
+  void setType(const CSwordModuleInfo::ModuleType& type);
   /**
   * Sets the size of the window.
   */
-  void setGeometry( const QRect s );
+  void setGeometry( const QRect& s );
   /**
   * Returns the size of the window including the x,y coordinates.
   */
-  const QRect geometry();
+  const QRect& geometry() const;
   /**
   * Returns a list of module names which are chosen in the managed window profile.
   */
-  const QStringList modules();
+  const QStringList& modules() const;
   /**
   * Set the key used in the modules.
   */
@@ -70,31 +70,47 @@ public:
   /**
   * Returns the current key set in the modules.
   */
-  const QString& key();
+  const QString& key() const;
   /**
   * Sets the current position of the scrollbars.
   */
-  void setScrollbarPositions(const int x, const int y);
+  void setScrollbarPositions(const int& x, const int& y);
   /**
   * Sets the windows maximized state to true or false.
   */
-  void setMaximized( const bool maximized );
+  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 );
+  void setWindowSettings( const int& settings );
   /**
   * Returns an integer with the window specific settings
   */
-  const int windowSettings();
+  const int& windowSettings() const;
   /**
   * Returns true if the window is maximized.
   */
-  const bool 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 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;
@@ -103,7 +119,9 @@ private:
 	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
new file mode 100644
index 0000000..a76a108
--- /dev/null
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -0,0 +1,1402 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..2fe58f0
--- /dev/null
+++ b/bibletime/frontend/cswordsetupdialog.h
@@ -0,0 +1,218 @@
+/***************************************************************************
+                          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/ctoolclass.cpp b/bibletime/frontend/ctoolclass.cpp
deleted file mode 100644
index 2d7f209..0000000
--- a/bibletime/frontend/ctoolclass.cpp
+++ /dev/null
@@ -1,185 +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 "resource.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 <kstddirs.h>
-#include <kmessagebox.h>
-#include <kurl.h>
-#include <kfiledialog.h>
-#include <kapp.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#")," " );
-	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){
-	QFile saveFile(filename);
-	bool ret;
-		
-	if (saveFile.exists()) {
-		if (KMessageBox::warningYesNo(0,
-				QString::fromLatin1("<qt><B>%1</B><BR>%2</qt>")
-					.arg( i18n("The file does already exist!") )
-					.arg( i18n("Do you want to overwrite it?")))
-				== KMessageBox::No
-			)
-			return false;
-		else
-			saveFile.remove();
-	}
-	
-	if ( saveFile.open(IO_ReadWrite) ) {
-		QTextStream textstream( &saveFile );
-		textstream << text;
-		saveFile.close();
-		ret = true;
-	}
-	else {
-		KMessageBox::error(0, QString::fromLatin1("<qt>%1<BR><B>%2</B></qt>")
-			.arg( i18n("Sorry! But 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 QPixmap(BIBLE_ICON_SMALL);
-	
- 	switch (module_info->type()){
- 	  case CSwordModuleInfo::Bible:
- 	    if (module_info->isLocked())
- 	      return QPixmap(BIBLE_LOCKED_ICON_SMALL);
- 	    else
- 	      return QPixmap(BIBLE_ICON_SMALL);
- 	
- 	  case CSwordModuleInfo::Lexicon:
- 	    if (module_info->isLocked())
- 	      return QPixmap(LEXICON_LOCKED_ICON_SMALL);
- 	    else
- 	      return QPixmap(LEXICON_ICON_SMALL);
- 	
- 	  case CSwordModuleInfo::Commentary:
- 	    if (module_info->isLocked())
- 	      return QPixmap(COMMENTARY_LOCKED_ICON_SMALL);
- 	    else
- 	      return QPixmap(COMMENTARY_ICON_SMALL);
- 	
- 	  case CSwordModuleInfo::GenericBook:
- 	    if (module_info->isLocked())
- 	      return QPixmap(BOOK_LOCKED_ICON_SMALL);
- 	    else
- 	      return QPixmap(BOOK_ICON_SMALL); 	
- 	
- 	  case CSwordModuleInfo::Unknown:
- 	  default:
- 	    return QPixmap(BIBLE_ICON_SMALL);
- 	}
-}
-
-int CToolClass::makeLogicFontSize( const int s ) {
-	const int defSize = QApplication::font().pointSize();
-  if ( s < defSize - 4 )
-		return 1;
-	if ( s < defSize )
-		return 2;
-	if ( s < defSize + 4 )
-		return 3;
-	if ( s < defSize + 8 )
-		return 4;
-	if ( s < defSize + 12 )
-		return 5;
-	if (s < defSize + 16 )
-		return 6;
-	return 7;
-}
-
-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/frontend/ctoolclass.h b/bibletime/frontend/ctoolclass.h
deleted file mode 100644
index 046e732..0000000
--- a/bibletime/frontend/ctoolclass.h
+++ /dev/null
@@ -1,84 +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>
-
-
-#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);
-  /**
- 	* Returns the icon used for the module given as aparameter.
- 	*/
-  static QPixmap getIconForModule( CSwordModuleInfo* );
-  /**
- 	* Returns the logical font size which should
- 	* be used for the absolute size s
- 	*/
-  static int makeLogicFontSize( const int s );
-  static QLabel* explanationLabel(QWidget* parent, const QString& heading, const QString& text );
-  static bool inHTMLTag(int pos, QString & text);
-};
-
-#endif
diff --git a/bibletime/frontend/ctooltip.cpp b/bibletime/frontend/ctooltip.cpp
new file mode 100644
index 0000000..a147dac
--- /dev/null
+++ b/bibletime/frontend/ctooltip.cpp
@@ -0,0 +1,254 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..84ca3ca
--- /dev/null
+++ b/bibletime/frontend/ctooltip.h
@@ -0,0 +1,88 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..94605aa
--- /dev/null
+++ b/bibletime/frontend/ctooltipmanager.cpp
@@ -0,0 +1,210 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..a1b34b2
--- /dev/null
+++ b/bibletime/frontend/ctooltipmanager.h
@@ -0,0 +1,59 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..7a79921
--- /dev/null
+++ b/bibletime/frontend/display/Makefile.am
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..5e06d71
--- /dev/null
+++ b/bibletime/frontend/display/Makefile.in
@@ -0,0 +1,729 @@
+# 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
new file mode 100644
index 0000000..5fe8f4e
--- /dev/null
+++ b/bibletime/frontend/display/cdisplay.cpp
@@ -0,0 +1,207 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..4394ea6
--- /dev/null
+++ b/bibletime/frontend/display/cdisplay.h
@@ -0,0 +1,175 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..7241f3a
--- /dev/null
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -0,0 +1,363 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..2159e2c
--- /dev/null
+++ b/bibletime/frontend/display/chtmlreaddisplay.h
@@ -0,0 +1,141 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..2f21112
--- /dev/null
+++ b/bibletime/frontend/display/chtmlwritedisplay.cpp
@@ -0,0 +1,269 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..1a47503
--- /dev/null
+++ b/bibletime/frontend/display/chtmlwritedisplay.h
@@ -0,0 +1,105 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..0352583
--- /dev/null
+++ b/bibletime/frontend/display/cplainwritedisplay.cpp
@@ -0,0 +1,161 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..7407aff
--- /dev/null
+++ b/bibletime/frontend/display/cplainwritedisplay.h
@@ -0,0 +1,100 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..4b6bf15
--- /dev/null
+++ b/bibletime/frontend/display/creaddisplay.cpp
@@ -0,0 +1,116 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..e6d3a53
--- /dev/null
+++ b/bibletime/frontend/display/creaddisplay.h
@@ -0,0 +1,68 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..0456457
--- /dev/null
+++ b/bibletime/frontend/display/cwritedisplay.cpp
@@ -0,0 +1,31 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..283c744
--- /dev/null
+++ b/bibletime/frontend/display/cwritedisplay.h
@@ -0,0 +1,56 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..a86417c
--- /dev/null
+++ b/bibletime/frontend/displaywindow/Makefile.am
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 0000000..457e00d
--- /dev/null
+++ b/bibletime/frontend/displaywindow/Makefile.in
@@ -0,0 +1,836 @@
+# 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
new file mode 100644
index 0000000..fca7e8d
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
@@ -0,0 +1,354 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..ed702fa
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.h
@@ -0,0 +1,140 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..6507016
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
@@ -0,0 +1,168 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..5d2c4fb
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.h
@@ -0,0 +1,104 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..55ab15a
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cbuttons.cpp
@@ -0,0 +1,212 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..7a84c35
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cbuttons.h
@@ -0,0 +1,107 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..fd98ea6
--- /dev/null
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
@@ -0,0 +1,147 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..fa02bba
--- /dev/null
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
@@ -0,0 +1,72 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..a832465
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -0,0 +1,417 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..3639984
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.h
@@ -0,0 +1,262 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..5cb3f08
--- /dev/null
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
@@ -0,0 +1,149 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..7b85434
--- /dev/null
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.h
@@ -0,0 +1,78 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..c802cf1
--- /dev/null
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
@@ -0,0 +1,172 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..1bc9c4f
--- /dev/null
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.h
@@ -0,0 +1,103 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..69b7f1d
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
@@ -0,0 +1,136 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..180a651
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cmodulechooserbar.h
@@ -0,0 +1,84 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..cf9f40e
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
@@ -0,0 +1,209 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..71ba563
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
@@ -0,0 +1,76 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..7ec69f8
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
@@ -0,0 +1,201 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..c6d2f84
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cplainwritewindow.h
@@ -0,0 +1,102 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..4535aab
--- /dev/null
+++ b/bibletime/frontend/displaywindow/creadwindow.cpp
@@ -0,0 +1,163 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..e6950e3
--- /dev/null
+++ b/bibletime/frontend/displaywindow/creadwindow.h
@@ -0,0 +1,82 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..a354955
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cwritewindow.cpp
@@ -0,0 +1,183 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..d183d0f
--- /dev/null
+++ b/bibletime/frontend/displaywindow/cwritewindow.h
@@ -0,0 +1,89 @@
+/***************************************************************************
+                          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/groupmanager/Makefile.am b/bibletime/frontend/groupmanager/Makefile.am
deleted file mode 100644
index f14759b..0000000
--- a/bibletime/frontend/groupmanager/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDES = $(all_includes)
-libgroupmanager_a_METASOURCES = AUTO
-noinst_LIBRARIES = libgroupmanager.a
-
-libgroupmanager_a_SOURCES = \
-cgroupmanager.cpp \
-cgroupmanageritem.cpp 
-
-all_headers = cgroupmanager.h \
-cgroupmanageritem.h
-
-EXTRA_DIST = \
-$(libgroupmanager_a_SOURCES) $(all_headers)
-
-
-
-
-
diff --git a/bibletime/frontend/groupmanager/Makefile.in b/bibletime/frontend/groupmanager/Makefile.in
deleted file mode 100644
index 4cbd948..0000000
--- a/bibletime/frontend/groupmanager/Makefile.in
+++ /dev/null
@@ -1,608 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-INCLUDES = $(all_includes)
-#>- libgroupmanager_a_METASOURCES = AUTO
-noinst_LIBRARIES = libgroupmanager.a
-
-libgroupmanager_a_SOURCES =  cgroupmanager.cpp cgroupmanageritem.cpp 
-
-
-all_headers = cgroupmanager.h cgroupmanageritem.h
-
-
-EXTRA_DIST =  $(libgroupmanager_a_SOURCES) $(all_headers)
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libgroupmanager_a_LIBADD = 
-#>- libgroupmanager_a_OBJECTS =  cgroupmanager.$(OBJEXT) \
-#>- cgroupmanageritem.$(OBJEXT)
-#>+ 7
-libgroupmanager_a_final_OBJECTS = libgroupmanager_a.all_cpp.o 
-libgroupmanager_a_nofinal_OBJECTS = cgroupmanager.$(OBJEXT) \
-cgroupmanageritem.$(OBJEXT)\
-cgroupmanager.moc.o  \
-libgroupmanager_a_meta_unload.o 
-@KDE_USE_FINAL_FALSE@libgroupmanager_a_OBJECTS = $(libgroupmanager_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libgroupmanager_a_OBJECTS = $(libgroupmanager_a_final_OBJECTS)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=cgroupmanager.h cgroupmanageritem.h 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/cgroupmanager.P .deps/cgroupmanageritem.P
-#>+ 4
-@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cgroupmanager.moc.P $(DEPDIR)/libgroupmanager_a_meta_unload.P  $(DEPDIR)/libgroupmanager_a.all_cpp.P \
-	  .deps/cgroupmanager.P .deps/cgroupmanageritem.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cgroupmanager.moc.P $(DEPDIR)/libgroupmanager_a_meta_unload.P   .deps/cgroupmanager.P .deps/cgroupmanageritem.P
-
-SOURCES = $(libgroupmanager_a_SOURCES)
-OBJECTS = $(libgroupmanager_a_OBJECTS)
-
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/groupmanager/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/groupmanager/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/groupmanager/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libgroupmanager.a: $(libgroupmanager_a_OBJECTS) $(libgroupmanager_a_DEPENDENCIES)
-	-rm -f libgroupmanager.a
-	$(AR) cru libgroupmanager.a $(libgroupmanager_a_OBJECTS) $(libgroupmanager_a_LIBADD)
-	$(RANLIB) libgroupmanager.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/frontend/groupmanager
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/frontend/groupmanager/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-#>- clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-moc-classes clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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
-cgroupmanager.moc.cpp: $(srcdir)/cgroupmanager.h
-	$(MOC) $(srcdir)/cgroupmanager.h -o cgroupmanager.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  cgroupmanager.moc.cpp
-
-#>+ 2
-docs-am:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/groupmanager/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/groupmanager/Makefile.in
-
-
-#>+ 10
-libgroupmanager_a_meta_unload.cpp:  cgroupmanager.moc.cpp
-	@echo 'creating libgroupmanager_a_meta_unload.cpp'
-	@-rm -f libgroupmanager_a_meta_unload.cpp
-	@echo 'static const char * _metalist_libgroupmanager_a[] = {' > libgroupmanager_a_meta_unload.cpp
-	@cat  cgroupmanager.moc.cpp | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libgroupmanager_a_meta_unload.cpp
-	@echo '0};' >> libgroupmanager_a_meta_unload.cpp
-	@echo '#include <kunload.h>' >> libgroupmanager_a_meta_unload.cpp
-	@echo '_UNLOAD(libgroupmanager_a)' >> libgroupmanager_a_meta_unload.cpp
-
-
-#>+ 3
-clean-moc-classes:
-	-rm -f  libgroupmanager_a_meta_unload.cpp
-
-#>+ 11
-libgroupmanager_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cgroupmanager.cpp $(srcdir)/cgroupmanageritem.cpp libgroupmanager_a_meta_unload.cpp  cgroupmanager.moc.cpp
-	@echo 'creating libgroupmanager_a.all_cpp.cpp ...'; \
-	rm -f libgroupmanager_a.all_cpp.files libgroupmanager_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libgroupmanager_a.all_cpp.final; \
-	for file in cgroupmanager.cpp cgroupmanageritem.cpp libgroupmanager_a_meta_unload.cpp  cgroupmanager.moc.cpp; do \
-	  echo "#include \"$$file\"" >> libgroupmanager_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libgroupmanager_a.all_cpp.final; \
-	done; \
-	cat libgroupmanager_a.all_cpp.final libgroupmanager_a.all_cpp.files  > libgroupmanager_a.all_cpp.cpp; \
-	rm -f libgroupmanager_a.all_cpp.final libgroupmanager_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libgroupmanager_a.all_cpp.cpp
-
-#>+ 2
-final:
-	$(MAKE) libgroupmanager_a_OBJECTS="$(libgroupmanager_a_final_OBJECTS)" all-am
-#>+ 2
-no-final:
-	$(MAKE) libgroupmanager_a_OBJECTS="$(libgroupmanager_a_nofinal_OBJECTS)" all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/frontend/groupmanager/cgroupmanager.cpp b/bibletime/frontend/groupmanager/cgroupmanager.cpp
deleted file mode 100644
index af4f59d..0000000
--- a/bibletime/frontend/groupmanager/cgroupmanager.cpp
+++ /dev/null
@@ -1,1615 +0,0 @@
-/***************************************************************************
-                          cgroupmanager.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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#define BOOKMARK_FORMAT_VERSION	1
-
-
-//own includes
-#include "cgroupmanager.h"
-#include "cgroupmanageritem.h"
-
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordcommentarymoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordldkey.h"
-#include "backend/creferencemanager.h"
-#include "printing/cprintitem.h"
-#include "printing/cprinter.h"
-
-#include "frontend/chtmldialog.h"
-#include "frontend/cinputdialog.h"
-#include "frontend/searchdialog/csearchdialog.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cexportmanager.h"
-
-#include "whatsthisdef.h"
-#include "resource.h"
-
-#include <iostream.h>
-
-//QT includes
-#include <qheader.h>
-#include <qevent.h>
-#include <qmessagebox.h>
-#include <qdragobject.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qwhatsthis.h>
-#include <qinputdialog.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kstddirs.h>
-#include <kiconloader.h>
-#include <kconfig.h>
-#include <kapp.h>
-#include <kpopupmenu.h>
-#include <kglobalsettings.h>
-#include <kdestyle.h>
-#include <kpassdlg.h>
-#include <kfiledialog.h>
-#include <kmessagebox.h>
-
-
-CGroupManager::ToolTip::ToolTip(QWidget* parent) : QToolTip(parent) {
-}
-
-void CGroupManager::ToolTip::maybeTip(const QPoint& p) {
-	if (!parentWidget()->inherits("CGroupManager"))
-		return;
-	
-	CGroupManager* m = 0;
-	if ( !(m = dynamic_cast<CGroupManager*>(parentWidget())) )
-		return;	
-	CGroupManagerItem* i = 0;
-	if ( !( i = dynamic_cast<CGroupManagerItem*>(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->getToolTip();
-	if (!text.isEmpty()) {
-		const QFont oldFont = font();				
-		CSwordModuleInfo* m = dynamic_cast<CSwordModuleInfo*>(i->moduleInfo());
-
-		//Module is Unicode-based. Only set font if a bookmark should be displayed
-		if (i->getBookmarkKey() && m && m->isUnicode() )
-			setFont(CBTConfig::get( CBTConfig::unicode ));
-
-		tip(r, text);
-		setFont(oldFont);
-	}
-}
-
-
-CGroupManager::CGroupManager(QWidget *parent, const char *name, ListCSwordModuleInfo *swordList, const bool useBookmarks, const bool saveSettings, const bool useDnD, const bool useExtendedMode, const bool useRMBMenu, const bool showHelpDialogs)
-	: KListView(parent, name),
-		m_swordList(swordList),		
-		m_config( new KConfig("bt-groupmanager", false, false ) ),
-	  m_menu(false),
-		m_searchDialog(0),		
-		m_pressedItem(0),		
-		m_useBookmarks(useBookmarks),
-		m_saveSettings(saveSettings),
-		m_useDragDrop(useDnD),
-		m_useExtendedMode(useExtendedMode),
-		m_useRMBMenu(useRMBMenu),
-		m_showHelpDialogs(showHelpDialogs)
-{
-	initView();
-	initConnections();
-	readSettings();
-}
-
-CGroupManager::~CGroupManager(){	
-	saveSettings();
-	m_config->sync();
-	delete m_config;
-	m_config = 0;
-}
-
-/** Initializes the tree of this CGroupmanager */
-void CGroupManager::setupSwordTree() {
-	readGroups(m_config, 0);
-	readSwordModules(m_config, 0);	
-	if (m_useBookmarks)
-		readSwordBookmarks(m_config, 0);
-	setupStandardSwordTree();
-}
-
-/** Initializes the tree of this CGroupmanager */
-void CGroupManager::setupStandardSwordTree() {
-	if (!m_swordList || (m_swordList && !m_swordList->count())) {
-		qWarning("CGroupManager::setupStandardSwordTree: m_swordList is empty or qual to NULL. return now.");
-		return;
-	}
-	
-	const bool initialized = m_config->readBoolEntry("initialized", false);
-	CSwordModuleInfo* moduleInfo = 0;
-	QListViewItemIterator it( this );
-	
-	CGroupManagerItem* bibleGroup = findGroup(i18n("Bibles"));		
-	CGroupManagerItem* bookGroup = findGroup(i18n("Books"));	
-	CGroupManagerItem* commentaryGroup = findGroup(i18n("Commentaries"));			
-	CGroupManagerItem* lexiconGroup = findGroup(i18n("Lexicons"));
-	
-	for(moduleInfo = m_swordList->first(); moduleInfo; moduleInfo = m_swordList->next()) {
-		bool alreadyCreated = false;
-  	QListViewItemIterator it( this );
-		for ( ; it.current(); ++it ) {
-			CGroupManagerItem* item = dynamic_cast<CGroupManagerItem*>(it.current());
-			if (item && item->type() == CGroupManagerItem::Module && item->moduleInfo() == moduleInfo) { //already there
-				alreadyCreated = true;
-				break;
-			}
-		}
-		if ( moduleInfo && !alreadyCreated) { //module was probably newly installed, insert it
-			CGroupManagerItem* itemParent = 0;
-			switch (moduleInfo->type()) {
-				case CSwordModuleInfo::Bible:
-					itemParent = bibleGroup;
-					break;
-				case CSwordModuleInfo::Commentary:
-					itemParent = commentaryGroup;
-					break;
-				case CSwordModuleInfo::Lexicon:
-					itemParent = lexiconGroup;
-					break;
-				case CSwordModuleInfo::GenericBook:
-					itemParent = bookGroup;
-					break;					
-				default:
-					break;
-			}
-			if (itemParent)
-				(void)new CGroupManagerItem(itemParent,QString::null,QString::null, moduleInfo,0, CGroupManagerItem::Module);
-		}
-	}
-	if (!initialized) {
-		bibleGroup->sortChildItems(0,true);
-		lexiconGroup->sortChildItems(0,true);
-		commentaryGroup->sortChildItems(0,true);	
-		bookGroup->sortChildItems(0,true);				
-		sort();		
-	}
-	
-	// Now delete the groupes which have no child items
-	if (!bibleGroup->childCount()) {		
-		delete bibleGroup;
-		bibleGroup = 0;
-	}
-	if (!lexiconGroup->childCount()) {
-		delete lexiconGroup;
-		lexiconGroup = 0;
-	}
-	if (!commentaryGroup->childCount()) {
-		delete commentaryGroup;
-		commentaryGroup = 0;
-	}
-	if (!bookGroup->childCount()) {
-		delete bookGroup;
-		bookGroup = 0;
-	}	
-}
-
-/** Initializes the connections of this class */
-void CGroupManager::initConnections(){
-	connect(this, SIGNAL(returnPressed(QListViewItem*)), SLOT(slotReturnPressed(QListViewItem*)));
-	if (m_useRMBMenu)
-		connect(m_popupMenu, SIGNAL(aboutToShow()),
-			this, SLOT(slotPopupAboutToShow()));
-}
-
-/**  */
-void CGroupManager::saveSettings(){	
-	KConfigGroupSaver groupSaver(m_config, "Groupmanager");
-	
-	if (!m_saveSettings) {
-		return;
-	}
-			
-	//save column width	
-	m_config->writeEntry("initialized", true);
-	m_config->writeEntry("First column", columnWidth(0));
-	
-	//save the bookmarks and the groups
-	
-	saveGroups(m_config,0);
-	saveSwordModules(m_config,0);
-	saveSwordBookmarks(m_config, 0);
-
-	m_config->sync();
-}
-
-/**  */
-void CGroupManager::readSettings(){
-	KConfigGroupSaver groupSaver(m_config, "Groupmanager");
-	if (m_config->readBoolEntry("initialized"))
-		setupSwordTree();
-	else
-		setupStandardSwordTree();
-	setColumnWidth(0, m_config->readNumEntry("First column", visibleWidth()) );
-}
-
-/** Initializes this widget */
-void CGroupManager::initView(){
- 	m_toolTip = new ToolTip(this);
- 	
- 	QWhatsThis::add(this, WT_GM_WIDGET );
- 	m_singleClick = KGlobalSettings::singleClick();
- 	 		
-	setBackgroundMode(PaletteBase);
-	setSorting(-1);
-	 	
- 	if (m_useDragDrop)
-	 	viewport()->setAcceptDrops(true);
-	if (m_useExtendedMode)
-		setSelectionModeExt(KListView::Extended);
- 	setRootIsDecorated(false);
- 	setAllColumnsShowFocus(true);
- 			 	
- 	addColumn(i18n("Caption"));
- 	header()->hide();
-	
-	if (!m_useRMBMenu) {
-		m_popupMenu = 0;
-	}
-	else {		
-		m_popupMenu = new KPopupMenu(this);
-		m_popupMenu->insertTitle(i18n("Main index"));
-		m_popupMenu->insertItem(GROUP_NEW_ICON_SMALL, i18n("Create a new folder"),
-			this, SLOT(slotCreateNewGroup()),0,ID_GM_GROUP_CREATE);
-		m_popupMenu->setWhatsThis(ID_GM_GROUP_CREATE, WT_GM_NEW_GROUP);	
-		m_popupMenu->insertItem(GROUP_CHANGE_ICON_SMALL, i18n("Change this folder"),
-			this, SLOT(slotChangeGroup()),0,ID_GM_GROUP_CHANGE);
-		m_popupMenu->setWhatsThis(ID_GM_GROUP_CHANGE, WT_GM_CHANGE_GROUP);		
-		m_popupMenu->insertSeparator();	
-		m_popupMenu->insertItem(BOOKMARK_CHANGE_ICON_SMALL,i18n("Change this bookmark"),
-			this,SLOT(slotChangeBookmark()),0,ID_GM_BOOKMARK_CHANGE);
-		m_popupMenu->setWhatsThis(ID_GM_BOOKMARK_CHANGE, WT_GM_CHANGE_BOOKMARK);
-		m_popupMenu->insertItem(BOOKMARK_IMPORT_ICON_SMALL,i18n("Import bookmarks"),
-			this,SLOT(slotImportBookmarks()),0,ID_GM_BOOKMARKS_IMPORT);	
-		m_popupMenu->setWhatsThis(ID_GM_BOOKMARKS_IMPORT, WT_GM_IMPORT_BOOKMARKS);
-		m_popupMenu->insertItem(BOOKMARK_EXPORT_ICON_SMALL,i18n("Export bookmarks"),
-			this,SLOT(slotExportBookmarks()),0,ID_GM_BOOKMARKS_EXPORT);		
-		m_popupMenu->setWhatsThis(ID_GM_BOOKMARKS_EXPORT, WT_GM_EXPORT_BOOKMARKS);	
-		m_popupMenu->insertItem(BOOKMARK_PRINT_ICON_SMALL,i18n("Print bookmark"),
-			this,SLOT(slotPrintBookmark()),0,ID_GM_BOOKMARK_PRINT);
-		m_popupMenu->setWhatsThis(ID_GM_BOOKMARK_PRINT, WT_GM_PRINT_BOOKMARK);
-		m_popupMenu->insertItem(ITEMS_DELETE_ICON_SMALL, i18n("Remove selected item(s)"),
-			this, SLOT(slotDeleteSelectedItems()),0,ID_GM_ITEMS_DELETE);
-		m_popupMenu->insertSeparator();
-		m_popupMenu->insertItem(MODULE_SEARCH_ICON_SMALL,i18n("Search in selected module(s)"),
-			this, SLOT(slotSearchSelectedModules()),0,ID_GM_MODULES_SEARCH);
-		m_popupMenu->insertSeparator();
-		m_popupMenu->insertItem(MODULE_UNLOCK_ICON_SMALL,i18n("Unlock this module"),
-			this, SLOT(slotUnlockModule()),0,ID_GM_MODULE_UNLOCK);	
-		m_popupMenu->setWhatsThis(ID_GM_MODULE_UNLOCK, WT_GM_UNLOCK_MODULE);	
-		m_popupMenu->insertItem(MODULE_ABOUT_ICON_SMALL, i18n("About this module"),
-			this, SLOT(slotShowAbout()),0,ID_GM_MODULE_ABOUT);
-		m_popupMenu->setWhatsThis(ID_GM_MODULE_ABOUT, WT_GM_ABOUT_MODULE);
-	}
-}
-	
-/** Deletes the item given as parameter */
-void CGroupManager::slotDeleteSelectedItems(){
-	QListViewItemIterator it( this );
-	for ( ; it.current(); ++it ) {
-		if ( it.current()->isSelected() )
-			delete it.current();
-	}
-}	
-
-/** call the search dialog */
-void CGroupManager::slotSearchSelectedModules() {
-	ListCSwordModuleInfo searchList;
-	CGroupManagerItem *item = 0;
-	
-	QList<QListViewItem> items = selectedItems();
-	for (items.first(); items.current(); items.next()) {
- 		item = dynamic_cast<CGroupManagerItem*>(items.current());
- 		if (item && item->type() == CGroupManagerItem::Module)
- 			searchList.append(item->moduleInfo());
-	}
-	saveSettings();
-	m_config->sync();
-
-	if (!m_searchDialog)
-		m_searchDialog = new CSearchDialog(searchList,0,0);
-	else
-		m_searchDialog->setModuleList(searchList);
-	connect(m_searchDialog, SIGNAL(finished()),
-		this, SLOT(slotDeleteSearchdialog()));	
-	m_searchDialog->setSearchText(QString::null);
-	m_searchDialog->show();
-	m_searchDialog->raise();
-}	
-
-void CGroupManager::searchBookmarkedModule(const QString& text, CGroupManagerItem* item) {	
-//  qWarning("CGroupManager::searchBookmarkedModule(const QString& text, CGroupManagerItem* item)");
-//  ASSERT(item);
-  if (!item->moduleInfo())
-  	return;
-	ListCSwordModuleInfo searchList;
-	searchList.append(item->moduleInfo());
-	
-	if (!m_searchDialog)
-		m_searchDialog = new CSearchDialog(searchList,0,0);
-	else
-		m_searchDialog->setModuleList(searchList);
-	connect(m_searchDialog, SIGNAL(finished()),
-		this, SLOT(slotDeleteSearchdialog()));	
-		
-  m_searchDialog->setSearchText(text);
-	m_searchDialog->show();
-	m_searchDialog->raise();
-	m_searchDialog->startSearch();	
-}	
-
-/**  */
-void CGroupManager::createNewBookmark(CGroupManagerItem* parent, CSwordModuleInfo* module, const QString& ref){
-	CSwordModuleInfo* swordModule = dynamic_cast<CSwordModuleInfo*>(module);		
-	if (!swordModule)
-		return;
-	
-	CGroupManagerItem* myItem = 0;	
-	bool ok = false;
-	const QString description = CInputDialog::getText(i18n("Bookmark description - BibleTime"), i18n("Please enter here the description:"), QString::null, &ok);
-	if (!ok)
-		return;
-
-	myItem = 0;
-  if ( parent && (parent->type() == CGroupManagerItem::Group) ) {
-   	myItem = new CGroupManagerItem(parent,QString::null,QString::null,module, 0, CGroupManagerItem::Bookmark);
-   	parent->setOpen(true);
-  }
-	else
-		myItem = new CGroupManagerItem(this,QString::null,QString::null,module, 0, CGroupManagerItem::Bookmark);
-		
-	if (myItem) {	//it's a Sword module
-		CSwordKey* key = CSwordKey::createInstance(module);
-		if (key) {
-			key->key(ref);
-			myItem->setBookmarkKey(key);	//the key is deleted by the groupmmanager item
-		}
-	}		
-  if (myItem)	//set the description		
-		myItem->setDescription(description);
-	setFocus();		
-}
-
-
-/** Changes the current item */
-void CGroupManager::slotChangeBookmark(){
-	if (!m_pressedItem)
-		return;		
-	bool isOk;
-	QString description = CInputDialog::getText(i18n("Change bookmark description - BibleTime"),i18n("Please change the description of the item!"), m_pressedItem->description(), &isOk, 0);
-	if (isOk)
-		m_pressedItem->setDescription(description);
-}
-
-/** Changes a group. */
-void CGroupManager::slotChangeGroup(){
-	if (!m_pressedItem)
-		return;		
-	
-	bool isOk;
-	QString description = QInputDialog::getText(i18n("Change folder - BibleTime"),i18n("Please change the name of the group!"), m_pressedItem->text(0), &isOk, 0);	
-	if (isOk)
-		m_pressedItem->setText( 0, description );
-}
-
-/** Is called before the menu is shown */
-void CGroupManager::slotPopupAboutToShow(){
-	if (!m_useRMBMenu)
-		return;
-		
-	m_menu = true;
-	
-	
-	if (m_pressedItem) {
-		if (m_pressedItem->type() == CGroupManagerItem::Module) {
-			bool moduleIsEncrypted = m_pressedItem->moduleInfo()->isEncrypted();
-			
-			m_popupMenu->setItemEnabled(ID_GM_PRESENTER_CREATE, true);			
-			
-			m_popupMenu->setItemEnabled(ID_GM_GROUP_CREATE, false);
-			m_popupMenu->setItemEnabled(ID_GM_GROUP_CHANGE, false);
-			
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARK_CHANGE, false);
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARKS_IMPORT, false);
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARKS_EXPORT, false);			
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARK_PRINT, false);			
-
-			m_popupMenu->setItemEnabled(ID_GM_ITEMS_DELETE, false);
-						
-			m_popupMenu->setItemEnabled(ID_GM_MODULES_SEARCH, true);	
-			m_popupMenu->setItemEnabled(ID_GM_MODULE_UNLOCK, moduleIsEncrypted);			
-			m_popupMenu->setItemEnabled(ID_GM_MODULE_ABOUT, true);
-		}
-		else if (m_pressedItem->type() == CGroupManagerItem::Bookmark) {
-			m_popupMenu->setItemEnabled(ID_GM_PRESENTER_CREATE, true);
-						
-			m_popupMenu->setItemEnabled(ID_GM_GROUP_CREATE, false);			
-			m_popupMenu->setItemEnabled(ID_GM_GROUP_CHANGE, false);
-						
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARK_CHANGE, true);
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARKS_IMPORT, false);
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARKS_EXPORT, false);			
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARK_PRINT, true);
-			
-			m_popupMenu->setItemEnabled(ID_GM_ITEMS_DELETE, true);						
-			
-			m_popupMenu->setItemEnabled(ID_GM_MODULES_SEARCH, false);
-			m_popupMenu->setItemEnabled(ID_GM_MODULE_UNLOCK, false);			
-			m_popupMenu->setItemEnabled(ID_GM_MODULE_ABOUT, false);
-
-		}
-		else if (m_pressedItem->type() == CGroupManagerItem::Group) {
-			m_popupMenu->setItemEnabled(ID_GM_PRESENTER_CREATE, false);
-						
-			m_popupMenu->setItemEnabled(ID_GM_GROUP_CREATE, true);
-			m_popupMenu->setItemEnabled(ID_GM_GROUP_CHANGE, true);
-												
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARK_CHANGE, false);							
-			
-			//enable import and export only if a bookmark exists in this group
-			bool foundBookmark = false;
-	    QListViewItem * myChild = m_pressedItem->firstChild();
-	    while( myChild && !foundBookmark) {
-	    	CGroupManagerItem* i = dynamic_cast<CGroupManagerItem*>(myChild);
-				if (i && i->type() == CGroupManagerItem::Bookmark)
-					foundBookmark = true;
-				myChild = myChild->nextSibling();
-	    }
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARKS_IMPORT, true);
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARKS_EXPORT, foundBookmark);
-			m_popupMenu->setItemEnabled(ID_GM_BOOKMARK_PRINT, false);
-				
-			m_popupMenu->setItemEnabled(ID_GM_ITEMS_DELETE, true);
-
-			m_popupMenu->setItemEnabled(ID_GM_MODULES_SEARCH, false);
-			m_popupMenu->setItemEnabled(ID_GM_MODULE_UNLOCK, false);
-			m_popupMenu->setItemEnabled(ID_GM_MODULE_ABOUT, false);
-		}		
-	}
-	else { //top level
- 		m_popupMenu->setItemEnabled(ID_GM_PRESENTER_CREATE, false);
-						
- 		m_popupMenu->setItemEnabled(ID_GM_GROUP_CREATE, true);
- 		m_popupMenu->setItemEnabled(ID_GM_GROUP_CHANGE, false);
-			
- 		m_popupMenu->setItemEnabled(ID_GM_BOOKMARK_CHANGE, false);				
-			
- 		bool foundBookmark = false;	
-     QListViewItemIterator it( this );
-     for ( ; it.current() && !foundBookmark; ++it ) {
-     	CGroupManagerItem* i = dynamic_cast<CGroupManagerItem*>(it.current());
- 			if (i && i->type() == CGroupManagerItem::Bookmark)
- 				foundBookmark = true;
- 		}			
- 		m_popupMenu->setItemEnabled(ID_GM_BOOKMARKS_IMPORT, true);
- 		m_popupMenu->setItemEnabled(ID_GM_BOOKMARKS_EXPORT, foundBookmark);
- 		m_popupMenu->setItemEnabled(ID_GM_BOOKMARK_PRINT, false);
-						
- 		m_popupMenu->setItemEnabled(ID_GM_ITEMS_DELETE, false);
-						
- 		m_popupMenu->setItemEnabled(ID_GM_MODULES_SEARCH, false);
- 		m_popupMenu->setItemEnabled(ID_GM_MODULE_UNLOCK, false);			
- 		m_popupMenu->setItemEnabled(ID_GM_MODULE_ABOUT, false);			
-	}
-}
-
-/**  */
-void CGroupManager::slotShowAbout(){
-	CSwordModuleInfo* module = dynamic_cast<CSwordModuleInfo*>(m_pressedItem->moduleInfo());	
-	if (!m_pressedItem || !m_pressedItem->moduleInfo() || !module)
-		return;
-	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(backend()->modulePath(module->name()))
-		.arg(module->config(CSwordModuleInfo::AbsoluteDataPath))
-		.arg(i18n("Language"))
-		.arg(module->module()->Lang());
-
-	if (module->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));	
-	text += QString::fromLatin1("<b>%1:</b> %2<br>").arg(i18n("Encoding")).arg(module->isUnicode() ? i18n("Unicode") : i18n("iso8859-1"));
-
-	QString options;
-	unsigned int opts;
-	for (opts = CSwordBackend::filterOptionsMIN; opts <= CSwordBackend::filterOptionsMAX; ++opts){
-		if (module->has( (CSwordBackend::FilterOptions)opts)){
-  		if (!options.isEmpty())
-  			options += QString::fromLatin1(", ");
-  		options += CSwordBackend::translatedOptionName( (CSwordBackend::FilterOptions)opts);
-		}
-	}
-	if (!options.isEmpty())
-		text += QString("<b>%1:</b> %2<br>")
-			.arg(i18n("Features"))
-			.arg(options);
-
-	text += QString::fromLatin1("<b>%1:</b><br> <font size=\"-1\">%2</font>")
-						.arg("About")
-						.arg(module->config(CSwordModuleInfo::AboutInformation));
-
-	KMessageBox::about(this, text, module->config(CSwordModuleInfo::Description), false);
-}
-
-/**  */
-void CGroupManager::slotCreateNewPresenter(){
-	if (m_pressedItem && m_pressedItem->moduleInfo()) {
-		if (m_pressedItem->type() == CGroupManagerItem::Module || m_pressedItem->type() == CGroupManagerItem::Bookmark)
-			emit createSwordPresenter( m_pressedItem->moduleInfo(), QString::null );
-	}
-}
-
-/**  */
-void CGroupManager::contentsDragEnterEvent( QDragEnterEvent* e){
-  if (QTextDrag::canDecode(e)) {
-    e->accept(true);
-    QString str;
-	  QCString submime;
-  	if (QTextDrag::decode(e,str,submime=BOOKMARK))
-  		m_dragType = BOOKMARK;
-  	else if (QTextDrag::decode(e,str,submime=REFERENCE))
-  		m_dragType = REFERENCE;  	
-  	else if (QTextDrag::decode(e,str,submime=MODULE))
-  		m_dragType = MODULE;  	
-  	else if (QTextDrag::decode(e,str,submime=GROUP))
-  		m_dragType = GROUP;  	  		
-  	else if (QTextDrag::decode(e,str,submime=TEXT))
-  		m_dragType = TEXT;
-  	else
-  		m_dragType = "";
-  }
-  else {
-  	e->ignore();
-  	m_dragType = "";
-  }
-}
-
-/**  */
-void CGroupManager::contentsDragMoveEvent( QDragMoveEvent* e){
-  //open folders
-  CGroupManagerItem* item = (CGroupManagerItem*)itemAt( contentsToViewport(e->pos()) );			
-  e->accept(QTextDrag::canDecode(e));		
-	if (item && item->type() == CGroupManagerItem::Group && !item->isOpen())
-		item->setOpen(true);
-
-	m_afterItemDrop = item;
-	if (item)
-		m_parentItemDrop = (CGroupManagerItem*)item->parent();
-	else
-		m_parentItemDrop = 0;
-	
-	QRect tmpRect = drawDropVisualizer(0, m_parentItemDrop, m_afterItemDrop, m_dragType );
-	if (tmpRect != m_oldDragRect ) {
-		cleanDropVisualizer();
-		m_oldDragRect = tmpRect;
-		if (tmpRect.isValid())
-			viewport()->repaint(tmpRect);
-	}
-}
-
-/**  */
-void CGroupManager::contentsDragLeaveEvent( QDragLeaveEvent* e){	
-	KListView::contentsDragLeaveEvent(e);	
-	cleanDropVisualizer();
-	
-	m_oldDragRect = QRect();
-	m_dragType = "";
-}
-
-/** This define is used to use one block of code for the different sections (bookmarks,
-	* references, modules, groups etc.). We have only to maintain this code.
-	*/
-#define MOVE_ITEMS  \
-			for ( item = m_itemList->last(); item != 0; item = m_itemList->prev()){ \
-				if ( item && (item != target) ){ \
-					parentItem = dynamic_cast<CGroupManagerItem*>(item->parent()); \
-					if ( isChild(item, target) ) \
-						continue; \
-					if (parentItem && parentItem != item) \
-						parentItem->takeItem(item); \
-					else \
-						takeItem(item); \
-					if ( target && target!=item ) \
-						if (target->type()==CGroupManagerItem::Group) \
-							target->insertItem(item); \
-						else{ \
-							if (target->parent()) \
-								target->parent()->insertItem(item); \
-							else \
-								this->insertItem(item); \
-						}  \
-					else \
-						this->insertItem(item); \
-				} \
-			}
-
-/**  */
-void CGroupManager::contentsDropEvent( QDropEvent* e){
-  CGroupManagerItem* target = dynamic_cast<CGroupManagerItem *>(itemAt(contentsToViewport(e->pos())));
-
-  QString str;
-  QCString submime;
-  if (QTextDrag::decode(e,str,submime=BOOKMARK)){
-    //a bookmark was dragged
-    if ( e->source() != viewport() ){
-      return;
-    }
-    if ( !(m_itemList) ){
-      return;
-    }
-    CGroupManagerItem* item = 0;
-    CGroupManagerItem* parentItem = 0;
-    // Bookmark dragged on module - open a presenter
-    if ( (m_pressedItem && m_pressedItem->type() == CGroupManagerItem::Bookmark)
-    		&& target && (target->type() == CGroupManagerItem::Module) ){
-      emit createSwordPresenter(target->moduleInfo(),m_pressedItem->getKeyText() );
-    }
-    //move around bookmarks
-    else{    	
-    	MOVE_ITEMS    	
-    }//else
-  }//Bookmark
-  else if (QTextDrag::decode(e,str,submime=GROUP)){
-    //a group was dragged
-    if ( e->source() != this->viewport() )
-      return;
-    if ( !(m_itemList) )
-      return;
-    CGroupManagerItem* item = 0;
-    CGroupManagerItem* parentItem = 0;
-    //move around groups    	
-    MOVE_ITEMS
-  }//group
-  else if (QTextDrag::decode(e,str,submime=MODULE)){
-    //a module was dragged
-    if ( e->source() != this->viewport() ){
-      return;
-    }
-    if ( !(m_itemList) ){
-      return;
-    }
-    CGroupManagerItem* item = 0;
-    CGroupManagerItem* parentItem = 0;
-    MOVE_ITEMS
-  }//module
-  else if (QTextDrag::decode(e,str,submime=REFERENCE)){
-    //a reference was dragged
-		QString ref;
-    QString mod;
-    CReferenceManager::decodeReference(str,mod,ref);
-
-    CSwordModuleInfo* info = backend()->findModuleByName(mod);
-    if ( info /*&& (info->name() == mod)*/ ){
-			if (!target){ //Reference was dragged on no item
-				createNewBookmark(0, info, ref); //CREATE A NEW BOOKMARK
-			}
-			else{
-				switch (target->type()){
-					case (CGroupManagerItem::Group):
-						if (info)  //Create a bookmark
-							createNewBookmark(target,info, ref);
-						break;
-					case (CGroupManagerItem::Bookmark):
-						if (target->parent())
-							createNewBookmark(target->parent(),info, ref);
-						else
-							createNewBookmark(0,info, ref);						
-						break;
-					case (CGroupManagerItem::Module):
-						if (target->moduleInfo()){
-							/**
-							* In bibles or commentaries, the reference is opened
-							* in lexicons, the reference is searched
-							*/
-							if (target->moduleInfo()->type() == CSwordModuleInfo::Bible || target->moduleInfo()->type() == CSwordModuleInfo::Commentary )
-								emit createSwordPresenter( target->moduleInfo(), ref );							
-							else
-								searchBookmarkedModule(ref,target);
-						}
-						break;
-				}//switch;
-			}//(target)
-    }//(info)
-  }//reference
-  else if (QTextDrag::decode(e,str,submime=TEXT)){
-		//plain text was dragged -> open searchdialog
-		if ( target && target->type()==CGroupManagerItem::Module && target->moduleInfo() )
-			searchBookmarkedModule(str,target);
-  }
-	m_dragType = "";
-	cleanDropVisualizer();
-}
-#undef MOVE_ITEMS
-
-/**  */
-void CGroupManager::contentsMousePressEvent( QMouseEvent* e ) {
-	m_pressedPos = e->pos();
-  m_pressedItem = dynamic_cast<CGroupManagerItem*>(itemAt(contentsToViewport(m_pressedPos)));
-  const bool open = m_pressedItem ? m_pressedItem->isOpen() : false;
-	KListView::contentsMousePressEvent(e);	
-	
-	if ((e->state() & ControlButton) || (e->state() & ShiftButton))
-			return;
-			
-	if (e->button() == LeftButton) {
-		if (m_pressedItem && m_pressedItem->type() == CGroupManagerItem::Group
-				&& m_singleClick && (m_pressedItem->isOpen() == open) ) {
-			//open group with first click if it's a global setting of KDE
-			m_pressedItem->setOpen( !m_pressedItem->isOpen() );
-		}
-	}
-	else if (e->button() == RightButton & m_useRMBMenu) {	
-		m_menu = true;
-		m_popupMenu->exec( viewport()->mapToGlobal( contentsToViewport(m_pressedPos) ));
-		m_menu = false;			
-	}
-}
-
-/** Reimplementation. */
-void CGroupManager::contentsMouseDoubleClickEvent ( QMouseEvent * e){
-//	qDebug("CGroupManager::contentsMouseDoubleClickEvent ( QMouseEvent * e)");
-  bool open = false;	
-  if (m_pressedItem)
-  	open = m_pressedItem->isOpen();
-		
-	KListView::contentsMouseDoubleClickEvent(e);
-
-	if ((e->state() & ControlButton) || (e->state() & ShiftButton))
-			return;
-	if (e->button() == LeftButton) {
-		if (m_pressedItem && m_pressedItem->type() == CGroupManagerItem::Group
-				&& !m_singleClick && (m_pressedItem->isOpen() == open) ) {
-			//open group with first click if it's a global setting of KDE
-			m_pressedItem->setOpen( !m_pressedItem->isOpen() );
-		}
-	}	
-}
-
-void CGroupManager::contentsMouseReleaseEvent ( QMouseEvent* e ) {
-	KListView::contentsMouseReleaseEvent(e); 	
-  if ( !(m_pressedItem = dynamic_cast<CGroupManagerItem*>(itemAt(contentsToViewport(e->pos())))) )
-    return;	
-	if ((e->state() & ControlButton) || (e->state() & ShiftButton))
-		return;
-
-	if (m_pressedItem && (e->button() == LeftButton)) {
-		if (m_pressedItem->type() == CGroupManagerItem::Module && m_pressedItem->moduleInfo()) {
-	  	//check if module is encrypted and show dialog if it wasn't opened before	  	
-			QList<QListViewItem> items = selectedItems();			
-			if (items.count() > 1) {
-				ListCSwordModuleInfo modules;
-				for (items.first(); items.current(); items.next()) {
-					CGroupManagerItem* i = dynamic_cast<CGroupManagerItem*>(items.current());
-					if (i && i->type() == CGroupManagerItem::Module && i->moduleInfo())
-						modules.append(i->moduleInfo());
-				}
-				emit createSwordPresenter( modules, QString::null );				
-			}
-			else
-				emit createSwordPresenter( m_pressedItem->moduleInfo(), QString::null );
-					  	
-	  	if (m_pressedItem->moduleInfo()->isEncrypted()) {
-  			KConfigGroupSaver groupSaver(m_config, "Groupmanager");
-	  		if (m_showHelpDialogs && !m_config->readBoolEntry(QString::fromLatin1("shown %1 encrypted").arg(m_pressedItem->moduleInfo()->name()), false)) {
-					CHTMLDialog dlg(HELPDIALOG_MODULE_LOCKED);
-					dlg.exec();				
-				}
-	  		if (m_showHelpDialogs)
-	  			m_config->writeEntry(QString::fromLatin1("shown %1 encrypted").arg(m_pressedItem->moduleInfo()->name()), true);
-	  	}
-		}
-		else if  (m_pressedItem && m_pressedItem->type() == CGroupManagerItem::Bookmark) {
-			if (m_pressedItem->moduleInfo() && m_pressedItem->getBookmarkKey() )
-				emit createSwordPresenter( m_pressedItem->moduleInfo(), m_pressedItem->getKeyText() );
-		}
-	}
-}
-
-/** Reimplementation */
-void CGroupManager::contentsMouseMoveEvent ( QMouseEvent * e) {
-	KListView::contentsMouseMoveEvent( e );	
-	if (!m_useDragDrop)
-		return;
-	
-	CGroupManagerItem* dragItem=(CGroupManagerItem *)itemAt( contentsToViewport(e->pos()) );
-
-	//mouse is pressed, an item is selected and the popup menu isn't opened
-	if ( (e->state()&LeftButton) && (e->stateAfter()&LeftButton) && dragItem && !m_menu) {
-		//Is it time to start a drag?
-   	if (abs(e->pos().x() - m_pressedPos.x()) > KGlobalSettings::dndEventDelay() ||
-				abs(e->pos().y() - m_pressedPos.y()) > KGlobalSettings::dndEventDelay() )	{
-		// Collect all selected items
-     	ASSERT(m_itemList);
-     	m_itemList = new QList<CGroupManagerItem>;
-     	QListViewItemIterator it( this );
-     	for( ; it.current(); it++ )
-       	if ( it.current()->isSelected() )
-					m_itemList->append( (CGroupManagerItem*)it.current() );  				  			
-     	QTextDrag *d = 0;
-    	if (!dragItem)
-     		return;
-			switch (dragItem->type()){
-				case (CGroupManagerItem::Bookmark):
-	         if (dragItem->moduleInfo()) {
-	           	QString ref = dragItem->getKeyText();
-	           	QString mod = dragItem->moduleInfo()->name();
-	            	
-	          	d = new QTextDrag(CReferenceManager::encodeReference(mod,ref), viewport());
-	          	d->setSubtype(BOOKMARK);
-	        		m_dragType = BOOKMARK;
-					}
-					break;					
-				case (CGroupManagerItem::Module):
-					d = new QTextDrag( "" , viewport());
-					d->setSubtype(MODULE);
-					m_dragType = MODULE;
-					break;					
-				case (CGroupManagerItem::Group):
-					d = new QTextDrag( "" , viewport());
-					d->setSubtype(GROUP);
-					m_dragType = GROUP;
-					break;
-			}
-			
-			if (d) {
-				d->setPixmap( *(dragItem->pixmap(0)) );
-				m_menu = false;
-				d->drag();
-			}			
-		}
-	}
-}
-
-/** Creates a new group */
-void CGroupManager::slotCreateNewGroup(){
-	bool isOk;
-	QString groupname = QInputDialog::getText(i18n("Enter name of folder - BibleTime"),i18n("Please enter the name of the folder!"),"", &isOk, 0);
-	
-	if (isOk) {
-		if (m_pressedItem && m_pressedItem->type() == CGroupManagerItem::Group) {
-			(void)new CGroupManagerItem(m_pressedItem, groupname, QString::null, 0,0, CGroupManagerItem::Group);
-			m_pressedItem->setOpen(true);
-		}
-		else if (m_pressedItem && m_pressedItem->parent() && m_pressedItem->parent()->type() == CGroupManagerItem::Group){
-			(void)new CGroupManagerItem(m_pressedItem->parent(), groupname, QString::null, 0,0, CGroupManagerItem::Group);
-			m_pressedItem->parent()->setOpen(true);
-		}
-		else {
-			(void)new CGroupManagerItem(this, groupname, QString::null, 0, 0,CGroupManagerItem::Group);
-		}
-	}
-}
-
-const int CGroupManager::parentId(CGroupManagerItem *item, CGroupManagerItem* parentItem)
-{
-	// search parent of item and return the id of the parent
-	int ret = -1; 	// the view and the parent item have id -1
-	int index = 0;
-	CGroupManagerItem* myItem = 0;
-	
-	if (item) {
-		if (item->parent() && item != parentItem) {
-		  QListViewItemIterator it;
-		  if (parentItem) {
-		  	it = QListViewItemIterator( parentItem );		
-		  }
-		  else
-		  	it = QListViewItemIterator( this );
-		  	
-			if (item->parent() == parentItem)
-				return -1;
-			while (it.current() && (it.current() != item->parent()) ) {
-				myItem = (CGroupManagerItem*)it.current();
-				if (parentItem && !isChild(parentItem, myItem) ) {
-					it++;
-					continue;
-				}
-				if (myItem && myItem->type() == CGroupManagerItem::Group) {
-					index++;
-				}
-				it++;
-			}
-			if (it.current())
-				ret = index;
-		}
-	}
-	return ret;
-}
-
-/** returns the parent of the item with the id ID */
-CGroupManagerItem* CGroupManager::findParent( const int ID, CGroupManagerItem* parentItem){
-	CGroupManagerItem* myItem = 0;
-	int index = 0;
-	
-	QListViewItemIterator it;
-  if (parentItem)
-  	it = QListViewItemIterator(parentItem);
-  else
-	  it = QListViewItemIterator(this);
-
-  //traverse the tree and try to find the group with the id ID index using comparision
-  for( ; it.current(); it++ ) {
- 		myItem = dynamic_cast<CGroupManagerItem*>( it.current() );
- 		if ( parentItem && !isChild(parentItem, myItem) ) {
- 			continue;
- 		}		
-		if (myItem && myItem->type() == CGroupManagerItem::Group) {
-			if (index == ID) {				
-				return myItem;
-			}
-			else
-				index++;
-		}
-	}		
-	return 0;	// return 0 if parent wasn't found
-}
-
-/** Opens a dialog to enter the key to unlock an encrypted module. */
-void CGroupManager::slotUnlockModule(){	
-	bool ok;
-	QString unlockKey = QInputDialog::getText(i18n("BibleTime - Unlock module"),i18n("Enter the key to unlock the module!"), m_pressedItem->moduleInfo()->config(CSwordModuleInfo::CipherKey), &ok, 0 );
-	if (ok) {
-		CSwordModuleInfo::UnlockErrorCode ret = m_pressedItem->moduleInfo()->unlock( unlockKey );
-		if ( ret != CSwordModuleInfo::noError) {
-			//an error occured
-			switch (ret) {
-				case CSwordModuleInfo::noPermission:				
-					break;
-				case CSwordModuleInfo::wrongUnlockKey:				
-					break;
-				case CSwordModuleInfo::notLocked:
-					break;
-					
-				default:
-					break;
-			}
-		}
-	}
-}
-
-/** Reads in bookmarks from m_config and creates them as subitems of group. If group is 0 we create them a toplevel items. */
-const bool CGroupManager::readSwordBookmarks(KConfig* configFile, CGroupManagerItem* group, const Action){
-	//read and create group entries
-	CGroupManagerItem* parentItem = 0;	
-	
-	QStringList	groupList = configFile->readListEntry("Groups");
-
-	//read in all bookmarks
-	QStringList	bookmarkList 							= configFile->readListEntry("Bookmarks");
-	QStringList	bookmarkModulesList 			= configFile->readListEntry("Bookmark modules");
-	QStringList	bookmarkDescriptionsList 	= configFile->readListEntry("Bookmark descriptions");
-	QValueList<int>	parentList						= configFile->readIntListEntry("Bookmark parents");
-
-	QStringList::Iterator it_bookmarks 	= bookmarkList.begin();
-	QStringList::Iterator it_modules 		= bookmarkModulesList.begin();
-	QStringList::Iterator it_descriptions	= bookmarkDescriptionsList.begin();
-	QValueList<int>::Iterator it_parents = parentList.begin();
-
-	CSwordModuleInfo* moduleInfo = 0;
-	CGroupManagerItem *myItem = 0;	
-	CGroupManagerItem *oldItem = 0;
-
-	while ( it_bookmarks != bookmarkList.end() && it_parents != parentList.end()
-			 		&& it_modules != bookmarkModulesList.end() ) {
-		moduleInfo = backend()->findModuleByName((*it_modules));
-		if ( (*it_parents) == -1) {
-			if (group)
-				myItem = new CGroupManagerItem(group, (*it_bookmarks), (*it_modules), moduleInfo, 0, CGroupManagerItem::Bookmark);
-			else
-				myItem = new CGroupManagerItem(this, (*it_bookmarks), (*it_modules), moduleInfo, 0, CGroupManagerItem::Bookmark);
-		}
-		else {
-			parentItem = findParent( (*it_parents), group ? group : 0 );
-			if (parentItem)
-				myItem = new CGroupManagerItem(parentItem, (*it_bookmarks), (*it_modules), moduleInfo,0, CGroupManagerItem::Bookmark);
-			else if (group)
-				myItem = new CGroupManagerItem(group, (*it_bookmarks), (*it_modules), moduleInfo,0, CGroupManagerItem::Bookmark);
-			else
-				myItem = new CGroupManagerItem(this, (*it_bookmarks), (*it_modules), moduleInfo,0, CGroupManagerItem::Bookmark);
-		}
-		if (myItem && it_descriptions != bookmarkDescriptionsList.end())
-			myItem->setDescription( *it_descriptions );
-		if (myItem && oldItem) {
-			myItem->moveAfter(oldItem);
-		}
-		oldItem = myItem;
-
-		++it_parents;
-		++it_modules;
-		++it_descriptions;
-		++it_bookmarks;
-	}
-	return true;
-}
-
-/** Save items of group to m_config. If grou is 0 we save all items. The  path to the group-item itself is saved, too. */
-const bool CGroupManager::saveSwordBookmarks(KConfig* configFile, CGroupManagerItem* group, const Action){
-	int parentID = 0;
-	CGroupManagerItem* myItem = 0;
-	QStringList groupList;
-	QValueList<int> parentList;
-	QStringList bookmarkList;	
-	QStringList bookmarkModuleList;	
-	QStringList bookmarkDescriptionList;		
-	QListViewItemIterator it;
-	
-	//save bookmarks
-	parentList.clear();
-	bookmarkList.clear();
-	bookmarkModuleList.clear();
-	bookmarkDescriptionList.clear();
-
-	if (group)
-		it = QListViewItemIterator ( group );
-	else if (group && group->childCount() == 0) {
-		return false;
-	}
-	else
- 		it = QListViewItemIterator (this);
-
-  for( ; it.current(); it++ ) {
-		myItem = (CGroupManagerItem*)it.current();
-  	if (group)
-  		if (!isChild(m_pressedItem, myItem)) {
-				continue;					
-			}
-		if (myItem && myItem->type() == CGroupManagerItem::Bookmark)  {
-			if (group) {
-				parentID = parentId( dynamic_cast<CGroupManagerItem*>(it.current()),m_pressedItem );	
-			}
-			else {
-				parentID = parentId( dynamic_cast<CGroupManagerItem*>(it.current()) );	
-			}
-			parentList.append( parentID );
-
-			CSwordKey* key = myItem->getBookmarkKey();									
-			if (key)	{
-				VerseKey* vk = dynamic_cast<VerseKey*>(key);
-				QString oldLocale;
-				if (vk) {
-					oldLocale = QString::fromLatin1(vk->getLocale());
-					vk->setLocale("en"); //save the english key names
-				}
-				bookmarkList.append( key->key() );
-				if (vk) {
-					vk->setLocale(oldLocale.latin1());
-				}
-			}
-			else
-				bookmarkList.append("");	//invalid key
-				
-			if (myItem && !myItem->description().isEmpty())	//save description
-				bookmarkDescriptionList.append( myItem->description() );
-			else
-				bookmarkDescriptionList.append( QString::null );
-				
-			if (myItem->moduleInfo()) {	//save the module
-				bookmarkModuleList.append( myItem->moduleInfo()->name() );
-			}
-			else {
-				bookmarkModuleList.append( myItem->m_moduleName );
-			}
-		}
-	}	
-	
-	configFile->writeEntry("Bookmarks", bookmarkList);
-	configFile->writeEntry("Bookmark descriptions", bookmarkDescriptionList);
-	configFile->writeEntry("Bookmark modules", bookmarkModuleList);
-	configFile->writeEntry("Bookmark parents", parentList);
-	
-	return true;
-}
-
-/** Impoorts bookmarks */
-void CGroupManager::slotImportBookmarks(){
-	if (!m_pressedItem || ( m_pressedItem && m_pressedItem->type() == CGroupManagerItem::Group) ) {
-		QString file = KFileDialog::getOpenFileName(QString::null, "*.btb | *.btb", 0, i18n("Import bookmarks ..."));	
-		if (!file.isNull()) {
-			KSimpleConfig simpleConfig(file, false);
-			simpleConfig.setGroup("Bookmarks");
-			short int formatVersion = simpleConfig.readNumEntry("Bookmark format version", -1);
-			
-			//bookmark format of imported file is newer than our version			
-			if (formatVersion > BOOKMARK_FORMAT_VERSION) {
-				const int retValue = KMessageBox::warningContinueCancel(this, i18n("<qt>A problem occurred while importing bookmarks!<BR>\
-The bookmarks format of the imported file is newer<BR>\
-than the bookmarks format version of this version of BibleTime!<BR>\
-<B>Importing the bookmarks may not work correctly!</B><BR>Do you want to continue?</qt>"), i18n("Import of bookmarks"), i18n("Continue") );
-				if ( retValue != KMessageBox::Continue )
-					return;
-			}
-			
-			readGroups(&simpleConfig, m_pressedItem, Import);			
-			readSwordBookmarks(&simpleConfig, m_pressedItem, Import);
-		}
-	}
-}
-
-/** Exports bookmarks of selected group */
-void CGroupManager::slotExportBookmarks(){
-	if (!m_pressedItem || ( m_pressedItem && m_pressedItem->type() == CGroupManagerItem::Group) ) {
-		QString file = KFileDialog::getSaveFileName (QString::null, "*.btb | *.btb", 0, i18n("Export bookmarks ..."));	
-		if (!file.isNull()) {
-			KSimpleConfig simpleConfig(file, false);
-			simpleConfig.setGroup("Bookmarks");			
-			simpleConfig.writeEntry("Bookmark format version", BOOKMARK_FORMAT_VERSION);
-			
-			saveGroups(&simpleConfig, m_pressedItem, Export);
-			saveSwordBookmarks(&simpleConfig, m_pressedItem, Export);
-			simpleConfig.sync();
-		}
-	}
-}
-
-
-const bool CGroupManager::readSwordModules(KConfig* configFile, CGroupManagerItem* group) {
-	if (!m_swordList) {
-		qWarning("CGroupManager::readSwordModules: no sword modules, return and do nothing.");
-		return false;
-	}
-	CGroupManagerItem* parentItem = 0;	
-
-	QStringList	moduleList = configFile->readListEntry("Modules");
-	QValueList<int> parentList = configFile->readIntListEntry("Module parents");		
-	QStringList::Iterator it_modules = moduleList.begin();
-	QValueList<int>::Iterator it_parents = parentList.begin();
-	
-	CSwordModuleInfo* myModuleInfo = 0;
-	CGroupManagerItem* myItem = 0;
-	CGroupManagerItem* oldItem = 0;
-	
-	while ( it_modules != moduleList.end() && it_parents != parentList.end() ) {		
-		if ((*it_modules).isEmpty() || !( myModuleInfo = backend()->findModuleByName(*it_modules) )) {	//the module was removed so we don't show it
-			++it_parents;
-			++it_modules;
-			continue;
-		}
-			
-		if ( (*it_parents) == -1) { //module on top
-			parentItem = group; //instead of group ? group : 0;
-		}
-		else {
-			parentItem = findParent( (*it_parents), group );
-			if (!parentItem)
- 				parentItem = group;
-		}
-
-		if (parentItem) {
-			myItem = new CGroupManagerItem(parentItem, QString::null, QString::null, myModuleInfo,0, CGroupManagerItem::Module);
-		}
-		else
-			myItem = new CGroupManagerItem(this, QString::null, QString::null, myModuleInfo,0, CGroupManagerItem::Module);		
-		
-		if (myItem && oldItem)
-			myItem->moveAfter(oldItem);
-		
-		oldItem = myItem;
-			
-		++it_parents;
-		++it_modules;
-	}	
-	return true;
-};
-
-const bool CGroupManager::saveSwordModules(KConfig* configFile, CGroupManagerItem* group) {
-	int parentID = 0;
-	CGroupManagerItem* myItem = 0;
-	QValueList<int> parentList;
-	QStringList moduleList;	
-	
-	QListViewItemIterator it;
-	
-	parentList.clear();
-	moduleList.clear();
-
-	if (group)
-		it = QListViewItemIterator( group );
-	else
- 		it = QListViewItemIterator(this);
-
-  for( ; it.current(); it++ ) {
-			myItem = (CGroupManagerItem*) it.current();
-	  	if (group)
-	  		if (!isChild(m_pressedItem, myItem))
-					continue;					
-			
-			if (myItem && myItem->type() == CGroupManagerItem::Module)  {
-				if (group)
-					parentID = parentId( (CGroupManagerItem*)it.current(),m_pressedItem );	
-				else
-					parentID = parentId( (CGroupManagerItem*)it.current() );	
-				parentList.append( parentID );
-				
-				if (myItem->moduleInfo())
-					moduleList.append( myItem->moduleInfo()->name() );				
-				else {
-					moduleList.append( myItem->text(0) );	//first column is the modulename
-				}
-			}
-	}	
-	configFile->writeEntry("Modules", moduleList);
-	configFile->writeEntry("Module parents", parentList);
-
-	return true;
-}
-
-const bool CGroupManager::readGroups(KConfig* configFile, CGroupManagerItem* group, const Action action) {
-	//read and create group entries
-	CGroupManagerItem* parentItem = 0;
-	bool groupExists = false;	
-	CGroupManagerItem* oldItem = 0;
-	CGroupManagerItem* newItem = 0;
-	
-	QStringList	groupList = configFile->readListEntry("Groups");
-	QValueList<int>	parentList = configFile->readIntListEntry("Group parents");
-	
-	QStringList::Iterator it_groups = groupList.begin();
-	QValueList<int>::Iterator it_parents = parentList.begin();
-	
-	while ( (it_groups != groupList.end()) && (it_parents != parentList.end()) ) {
-		groupExists = false;
-		if ( (*it_parents) == -1) { //no parent item saved
-			if (action == Import) { //try to find existing group
-				if (CGroupManagerItem* existingGroup = findGroup(*it_groups, group, *it_parents))
-					groupExists = true;
-			}
-			else
-				parentItem = group;
-		}
-		else {
-			parentItem = findParent( (*it_parents),group );
-		 	if (!parentItem)
-				parentItem = group;
-		}
-		
-		if (!groupExists) {			
-			if (parentItem) {
-				newItem = new CGroupManagerItem(parentItem, (*it_groups), QString::null, 0,0, CGroupManagerItem::Group);
-			}
-			else {
-				newItem = new CGroupManagerItem(this, (*it_groups), QString::null, 0,0, CGroupManagerItem::Group);
-			}
-		
-			if (newItem && oldItem ) {			
-				newItem->moveAfter( oldItem );
-			}
-			if (newItem) {
-				/* we can't move a topgroup behind a subgroup, so we use multiple
-				 parent calls
-				*/
-				while (parentId(newItem) > *it_parents) {
-					if ( (group && isChild(group, newItem)) || (newItem && newItem->parent()) )
-						newItem = newItem->parent();
-					else
-						break;
-				}
-				oldItem = newItem;
-			}					
-		}
-		
-		++it_parents;
-		++it_groups;
-	}	
-	return true;	
-};
-
-const bool CGroupManager::saveGroups(KConfig* configFile, CGroupManagerItem* group, Action normal) {
-	int parentID = 0;
-	CGroupManagerItem* myItem = 0;
-	QStringList groupList;
-	QValueList<int> parentList;
-	
-	QListViewItemIterator it;
-	
-	//save groups	
-	if (group && group->childCount() > 0)
-	 	it = QListViewItemIterator ( group->firstChild() );
-	else if (group && group->childCount() == 0) {
-		return false;
-	}
-	else
-	  it = QListViewItemIterator ( this );
-
-  for( ; it.current(); it++ ) {
-		myItem = (CGroupManagerItem*) it.current();
-  	if (group && !isChild(m_pressedItem, myItem))
-			continue;		
-		if (myItem && myItem->type() == CGroupManagerItem::Group)  {
-		 	if (group)
-				parentID = parentId( (CGroupManagerItem*)it.current(), m_pressedItem );
-			else
-				parentID = parentId( (CGroupManagerItem*)it.current() );
-			groupList.append( myItem->text(0) );
-			parentList.append( parentID );
-		}
-	}
-	configFile->writeEntry("Groups", groupList);
-	configFile->writeEntry("Group parents", parentList);
-	return true;
-}
-
-/** Returns true if the item "item" is a child of item "parent". */
-const bool CGroupManager::isChild(QListViewItem* parent, QListViewItem* child){
-	QListViewItem *myParent = child;
-	while (myParent && myParent != parent )
-		myParent = myParent->parent();		
-	return (myParent == parent) && (parent != child);
-}
-
-/** Reimplementatuiion. */
-void CGroupManager::viewportPaintEvent(QPaintEvent* e) {
-  KListView::viewportPaintEvent(e);
-
-  if (m_oldDragRect.isValid())
-  {
-    static bool invalidated=false;
-    if (!invalidated)
-    {
-      invalidated=true;
-      viewport()->repaint(m_oldDragRect);
-    }
-    QPainter painter(viewport());
-    drawDropVisualizer(&painter, m_parentItemDrop, m_afterItemDrop, "");
-    invalidated=false;
-  }
-}
-
-/** Reimplementation with different parameters */
-const QRect CGroupManager::drawDropVisualizer (QPainter *p, CGroupManagerItem */*parent*/, CGroupManagerItem *after, const QString& /*type*/){
-  QRect insertmarker;
-  bool useParent = false;
-		
-	if ( m_dragType == BOOKMARK ) { 	//we are moving a module
-		if ( after && after->type() == CGroupManagerItem::Group)
-			insertmarker = itemRect(after);
-		else if ( after && after && after->type() == CGroupManagerItem::Module )			
-			insertmarker = QRect(itemRect(after));
-		else if ( after && after && after->type() == CGroupManagerItem::Bookmark ) {
-			if (after->parent()) {
-				useParent = true;
-				insertmarker = itemRect(after->parent());	//paint nothing
-			}
-			else
-				insertmarker = QRect();
-		}
-		else if ( after && after->parent() && after->parent()->type() == CGroupManagerItem::Group ) {
-			useParent = true;
-			insertmarker = itemRect(after->parent());				
-		}
-		else //if (!after)
-			insertmarker = QRect(); //this->visibleRect();		
-//		else
-//			insertmarker = QRect();
-	}
-	else if ( m_dragType == REFERENCE ) { 	//we are moving a reference
-		if ( after && after->type() == CGroupManagerItem::Group)
-			insertmarker = itemRect(after);
-		else if ( after && after->type() == CGroupManagerItem::Module )			
-			insertmarker = QRect(itemRect(after));
-		else if ( after && after->type() == CGroupManagerItem::Bookmark ) {
-			if (after->parent()) {
-				useParent = true;
-				insertmarker = itemRect(after->parent());
-			}
-			else
-				insertmarker = QRect(); 	//paint nothing			
-		}
-		else if ( after && after->parent() && after->parent()->type() == CGroupManagerItem::Group ) {
-			useParent = true;
-			insertmarker = itemRect(after->parent());				
-		}
-		else if (!after)
-			insertmarker = QRect(); //this->visibleRect();
-		else
-			insertmarker = QRect();
-	}
-	else if ( m_dragType == MODULE ) { 	//we are moving a reference
-		if ( after && after->type() == CGroupManagerItem::Group)
-			insertmarker = itemRect(after);
-		else if ( after && (after->type() == CGroupManagerItem::Module || after->type() == CGroupManagerItem::Bookmark) ) {
-			if (after->parent()) {
-				useParent = true;
-				insertmarker = itemRect(after->parent());
-			}
-			else
-				insertmarker = QRect(); 	//paint nothing			
-		}		
-		else if ( after && after->parent() && after->parent()->type() == CGroupManagerItem::Group ) {
-			useParent = true;
-			insertmarker = itemRect(after->parent());
-		}
-		else if (!after)
-			insertmarker = QRect();//this->visibleRect();
-		else
-			insertmarker = QRect();
-	}	
-	else if (m_dragType == TEXT) {
-		if ( after && after && after->type() == CGroupManagerItem::Module )			
-			insertmarker = QRect(itemRect(after));
-		else
-			insertmarker = QRect();
-	}
-	else if (m_pressedItem) {
-  	if ( m_pressedItem->type() == CGroupManagerItem::Group  ) {	//we are moving a group
-			if (after && after->type() == CGroupManagerItem::Group)
-				insertmarker = itemRect(after);
-			else if (after && after->parent() && after->parent()->type() == CGroupManagerItem::Group) {
-				useParent = true;
-				insertmarker = itemRect(after->parent());
-			}
-			else if (!after)
-				insertmarker = QRect();//this->visibleRect();
-		else
-			insertmarker = QRect();
-  	}
-  }
-
-  if ( p && insertmarker.isValid() )  {
-  	if (useParent)
-  		insertmarker.setLeft( treeStepSize()*(after->parent()->depth()+(rootIsDecorated() ? 1 :0 ))+itemMargin()- contentsX());
-  	else
-  		insertmarker.setLeft( treeStepSize()*(after->depth()+(rootIsDecorated() ? 1 :0 ))+itemMargin() - contentsX());
-  	style().drawFocusRect( p, insertmarker, colorGroup(), after->isSelected() ? &colorGroup().highlight() : &colorGroup().base(), after->isSelected() && !useParent );
-  }
-  else if (!insertmarker.isValid()) {
-  	cleanDropVisualizer();
-  }
-  return insertmarker;
-}
-
-/** Reimplementation. */
-void CGroupManager::cleanDropVisualizer(){
-  if ( m_oldDragRect.isValid() ) {
-    QRect rect = m_oldDragRect;
-    m_oldDragRect = QRect();
-    viewport()->repaint(rect,true);
-  }
-}
-
-/** Resets the groupmanager. Recreates the original Bibles, Lexicons and Commentary groups. */
-void CGroupManager::slotReset(){
-	int result = 0;
-	if (m_showHelpDialogs)
-		result = KMessageBox:: warningContinueCancel( this, i18n("<qt>This function will reset the main index!<BR>This will recreate the original groups and delete all other items!<BR>Be sure no important bookmarks will be deleted!<BR>Do you want to continue?</qt>"), i18n("BibleTime - Reset main index"), i18n("Continue"));
-	else
-		result = KMessageBox::Continue;
-		
-	if (result == KMessageBox::Continue) {
-		clear();
-		setupStandardSwordTree();
-	}
-}
-
-/** Prints the selected bookmark. */
-void CGroupManager::slotPrintBookmark(){	
-	if (!m_pressedItem || ( m_pressedItem && m_pressedItem->type() != CGroupManagerItem::Bookmark) )
-		return;
-	CExportManager::printKey( m_pressedItem->moduleInfo(), m_pressedItem->getBookmarkKey()->key(), QString::null, m_pressedItem->description() );
-}
-
-/** Deletes the searchdialog. */
-void CGroupManager::slotDeleteSearchdialog(){
-	if (m_searchDialog)
-		m_searchDialog->delayedDestruct();	//delete the search dialog
-	m_searchDialog = 0;
-}
-
-/** Reimplementation. */
-void CGroupManager::resizeEvent( QResizeEvent* e )  {
-	KListView::resizeEvent(e);		
-	setColumnWidth(0, visibleWidth() );
-	triggerUpdate();
-	
-}
-
-/** Is called when the return key was pressed on a listview item. */
-void CGroupManager::slotReturnPressed( QListViewItem* i){
-	CGroupManagerItem* item = dynamic_cast<CGroupManagerItem*>(i);
-	if (!item)
-		return;	
-	switch (item->type())	 {
-		case CGroupManagerItem::Bookmark:
-			if (item->moduleInfo())				
-				emit createSwordPresenter(item->moduleInfo(),item->getKeyText() );			
-			break;
-		case CGroupManagerItem::Module:
-			if (item->moduleInfo())
-				emit createSwordPresenter(item->moduleInfo(), QString::null);			
-			break;
-		case CGroupManagerItem::Group:
-			item->setOpen( !item->isOpen() );
-			break;
-		default:
-			break;
-	}
-}
-
-/** Updates the content size of this list view. */
-void CGroupManager::resizeContents( int w, int h ){
-	if (m_useDragDrop)
-		KListView::resizeContents(w,h+25);
-	else
-		KListView::resizeContents(w,h);
-}
-
-/** Returns the standard group with the given name if it alredy exists. Otherwise the group will be created. */
-CGroupManagerItem* CGroupManager::findGroup(const QString& name, CGroupManagerItem* group, const int id){
- 	CGroupManagerItem* item = 0; 	
-	QListViewItemIterator it 	;
- 	if (group)
- 		it = QListViewItemIterator(group);
- 	else
- 		it = QListViewItemIterator(this);
- 	
- 	for ( ; it.current(); ++it ) {
-		item = dynamic_cast<CGroupManagerItem*>(it.current());
-		if (item && item->type() == CGroupManagerItem::Group && item->text(0) == name && parentId(item, group) == id) { //found the right group
-			if (group && !isChild(group, item))
-				item = 0;
-			else
-				break;
-		}
- 		else {
- 			item = 0;
- 		}
- 	}
- 	if (!item) { 		
- 		if (group)
-	 		item = new CGroupManagerItem(group, name, QString::null, 0, 0, CGroupManagerItem::Group);
-	 	else
-	 		item = new CGroupManagerItem(this, name, QString::null, 0, 0, CGroupManagerItem::Group);	 	
- 	}
-  return item;
-}
-
-/** Debugs the tree items */
-void CGroupManager::printTree() {
-	QListViewItemIterator it(this);
-	while (it.current()) {
-		QListViewItem* item = it.current();
-		for (int i = 0; i < item->depth(); ++i) {
-			cout << "\t";
-		}
-		cout << item->text(0).latin1() << endl;
-		++it;
-	};
-}
diff --git a/bibletime/frontend/groupmanager/cgroupmanager.h b/bibletime/frontend/groupmanager/cgroupmanager.h
deleted file mode 100644
index 2447e3b..0000000
--- a/bibletime/frontend/groupmanager/cgroupmanager.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/***************************************************************************
-                          cgroupmanager.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 CGROUPMANAGER_H
-#define CGROUPMANAGER_H
-
-//BibleTime includes
-#include "cgroupmanageritem.h"
-#include "backend/cswordmoduleinfo.h"
-#include "frontend/cpointers.h"
-
-//QT includes
-#include <qwidget.h>
-#include <qlist.h>
-#include <qlistview.h>
-#include <qtooltip.h>
-
-//KDE includes
-#include <klistview.h>
-
-class KPopupMenu;
-class KConfig;
-
-class CSearchDialog;
-
-/**
-	* The groupmanager which handles all the modules and bookmarks
-  * @author The BibleTime Team
-  */
-class CGroupManager : public KListView, public CPointers  {
-   Q_OBJECT
-
-public:
-	enum Action {Import, Export, Normal};
-
-	CGroupManager(QWidget *parent=0, const char *name=0, ListCSwordModuleInfo *moduleInfo_list = 0, const bool useBookmarks = true, const bool saveSettings = true, const bool useDnD=true, const bool useExtendedMode=true, const bool useRMBMenu = true, const bool showHelpDialogs = true);
-	~CGroupManager();
-  /**
- 	* Initializes the tree of this CGroupmanager
- 	*/
-  void setupSwordTree();
-	/**
-	*
-	*/
-  void setupStandardSwordTree();
-  /**
-  * Read settings from config
-  */
-  void readSettings();
-  /**
-  * Saves settings to config file
-  */
-  void saveSettings();
-	/**
-	*
-	*/
-  void initView();
-	/**
-	*
-	*/
-  void searchBookmarkedModule(const QString&, CGroupManagerItem *);
-  /**
-  * Returns true if the item "item" is a child of item "parent".
-  */
-  const bool isChild(QListViewItem* parent, QListViewItem* child);
-
-public slots: // Public slots
-  /**
-  * Opens a dialog to enter the key to
-  *	unlock an encrypted module.
- 	*/
-  void slotUnlockModule();
-  /**
-  * Resets the groupmanager. Recreates the original Bibles, Lexicons and Commentary groups.
-  */
-  void slotReset();
-  /**
-  * Resizes the content size of this list view.
-  */
-  virtual void resizeContents(int w, int h);
-
-
-signals: // Signals
-  /**
-  * Is emitted when a module in the tree was selected.
-  */
-  void createSwordPresenter(CSwordModuleInfo*, const QString&);
-  /**
-  * Is emitted when more than one module are selected
-  */
-  void createSwordPresenter(ListCSwordModuleInfo, const QString&);
-
-protected slots: // Protected slots
-  /**
-  * Deletes the item given as parameter
-  */
-  void slotDeleteSelectedItems();
-  /**
-  * Changes the current item
-  */
-  void slotChangeBookmark();
-	/**
-	* Is called before the menu is shown
-	*/
-  void slotPopupAboutToShow();
-	/**
-	* search the modules that were selected
-	*/
-  void slotSearchSelectedModules();
-  /**
-  * Shows an about dialog containing information about a module
-  */
-  void slotShowAbout();
-	/**
-	*
-	*/
-  void slotCreateNewPresenter();
-  /**
-  * Creates a new group
-  */
-  void slotCreateNewGroup();
-  /**
-  * Exports bookmarks of selected group
-  */
-  void slotExportBookmarks();
-  /**
-  * Impoorts bookmarks
-  */
-  void slotImportBookmarks();
-  /**
-  * Reimplementatuiion.
-  */
-  void viewportPaintEvent(QPaintEvent*)   ;
-  /**
-  * Reimplementation with different parameters
-  */
-  const QRect drawDropVisualizer(QPainter *p, CGroupManagerItem *parent, CGroupManagerItem *after, const QString& type);
-  /**
-  * Reimplementation.
-  */
-  void cleanDropVisualizer();
-  /**
-  * Reimplementation.
-  */
-  void contentsMouseDoubleClickEvent ( QMouseEvent * e);
-  /**
-  * Changes a group.
-  */
-  void slotChangeGroup();
-  /**
-  * Prints the selected bookmark.
-  */
-  void slotPrintBookmark();
-  /**
-  * Reimplementation.
-  */
-  void resizeEvent( QResizeEvent * )  ;
-  /**
-  * Deletes the searchdialog.
-  */
-  void slotDeleteSearchdialog();
-
-private:
-	/**
-	* Our tooltip class. It displays a tooltip depending on the current item under the mouse cursor.
-	*/
-	class ToolTip : public QToolTip {
-	public:
-		ToolTip(QWidget* parent);
-		/**
-		* Displays a tooltip for position p using the getToolTip() function of CGroupManagerItem
-		*/		
-		void maybeTip( const QPoint &pos);
-	};
-	/**
-	*
-	*/
-	ListCSwordModuleInfo *m_swordList;
-  void initConnections();
-  void contentsDragEnterEvent( QDragEnterEvent* e);
-  void contentsDragMoveEvent( QDragMoveEvent* e);
-  void contentsDragLeaveEvent( QDragLeaveEvent* e);
-  void contentsDropEvent( QDropEvent* e);
-  void contentsMousePressEvent(QMouseEvent*);
-  void contentsMouseReleaseEvent(QMouseEvent*);
-  void contentsMouseMoveEvent ( QMouseEvent * ) ;
-	/**
-	* Find ID of parent item.
-	*/
-	const int parentId(CGroupManagerItem *item, CGroupManagerItem* parentItem = 0);
-  /**
-  * returns the parent of the item with the ID index
-  */
-  CGroupManagerItem* findParent( const int ID, CGroupManagerItem* parentItem = 0 );
-  void createNewBookmark(CGroupManagerItem* parent, CSwordModuleInfo* module, const QString& ref);
-  /**
-  * Save items of group to config. If grou is 0 we save all items.
-  * The  path to the group-item itself is saved, too.
-  */
-  const bool saveSwordBookmarks(KConfig* configFile, CGroupManagerItem* group, const Action = Normal);
-  /**
-  * Reads in bookmarks from config and creates them as subitems of group.
-	*	If group is 0 we create them a toplevel items.
-	*/
-  const bool readSwordBookmarks(KConfig* configFile, CGroupManagerItem* group, const Action = Normal);
-  /**
-  * Save items of group to config. If grou is 0 we save all items.
-  * The  path to the group-item itself is saved, too.
-  */
-  const bool saveSwordModules(KConfig* configFile, CGroupManagerItem* group);
-  /**
-  * Reads in bookmarks from config and creates them as subitems of group.
-	*	If group is 0 we create them a toplevel items.
-	*/
-  const bool readSwordModules(KConfig* configFile, CGroupManagerItem* group);
-  /**
-  * Save items of group to config. If grou is 0 we save all items.
-  * The  path to the group-item itself is saved, too.
-  */
-  const bool saveGroups(KConfig* configFile, CGroupManagerItem* group, const Action = Normal);
-  /**
-  * Reads in bookmarks from config and creates them as subitems of group.
-	*	If group is 0 we create them a toplevel items.
-	*/	
-  const bool readGroups(KConfig* configFile, CGroupManagerItem* group, const Action = Normal);
-  /**
-  * Returns the standard group with the given name if it alredy exists.
-  * Otherwise the group will be created.
-  */
-  CGroupManagerItem* findGroup(const QString& name, CGroupManagerItem* group = 0, const int id = -1);
-
-  void printTree();
-
- 	KConfig* m_config;
-  KPopupMenu* m_popupMenu;
-	bool m_menu;
-  QPoint m_pressedPos;
-  QRect	m_oldDragRect;
-  CGroupManagerItem* m_parentItemDrop;
-  CGroupManagerItem* m_afterItemDrop;
-  QString m_dragType;	
-	CSearchDialog* m_searchDialog;
-	ToolTip* m_toolTip;	
-	CGroupManagerItem*	m_pressedItem;
-  QList<CGroupManagerItem>*	m_itemList;	
-	bool m_singleClick;	
-	bool m_useBookmarks;
-	bool m_saveSettings;
-	bool m_useDragDrop;
-	bool m_useExtendedMode;
-	bool m_useRMBMenu;		
-	bool m_showHelpDialogs;
-	
-private slots: // Private slots
-  /**
-  * Is called when the return key was pressed on a listview item.
-  */
-  void slotReturnPressed( QListViewItem* );	
-};
-
-#endif
-
diff --git a/bibletime/frontend/groupmanager/cgroupmanageritem.cpp b/bibletime/frontend/groupmanager/cgroupmanageritem.cpp
deleted file mode 100644
index 7562cbe..0000000
--- a/bibletime/frontend/groupmanager/cgroupmanageritem.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/***************************************************************************
-                          cgroupmanageritem.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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cgroupmanageritem.h"
-#include "cgroupmanager.h"
-
-#include "backend/cswordversekey.h"
-#include "backend/cswordldkey.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-
-#include "frontend/ctoolclass.h"
-#include "frontend/cbtconfig.h"
-
-#include "resource.h"
-
-//Qt includes
-#include <qpixmap.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-
-//Sword includes
-#include <swmodule.h>
-
-
-CGroupManagerItem::CGroupManagerItem(CGroupManager *parent, const QString& caption,
-	const QString& modulename, CSwordModuleInfo *module_info, CSwordKey* bookmarkKey, CGroupManagerItem::ItemType Type)
-	: KListViewItem(static_cast<QListView*>(parent) ) {
-	
-	init(caption, modulename, module_info, bookmarkKey, Type);
-}
-
-CGroupManagerItem::CGroupManagerItem(CGroupManagerItem *parent, const QString& caption,
-	const QString& modulename, CSwordModuleInfo *module_info, CSwordKey* bookmarkKey, CGroupManagerItem::ItemType Type)
-	: KListViewItem(static_cast<QListViewItem*>(parent)) {
-	
-	init(caption, modulename, module_info,bookmarkKey, Type);
-}
-
-CGroupManagerItem::~CGroupManagerItem(){
-	if (m_bookmarkKey && m_createdOwnKey) {
-		delete m_bookmarkKey;
-		m_bookmarkKey = 0;
-	}	
-}
-
-/** Returns the CModuleInfo object for this tree-item. */
-CSwordModuleInfo* CGroupManagerItem::moduleInfo() const {
-	return m_moduleInfo;
-}
-
-/** Returns the type of this item */
-const CGroupManagerItem::ItemType CGroupManagerItem::type() const {
-	return m_type;
-}
-
-/** Shows child or not */
-void CGroupManagerItem::setOpen( bool open ){
-	QListViewItem::setOpen(open);
-	if (m_type == Group) {
-  	if (open && this->childCount() > 0)
-			setPixmap(0,m_openFolderIcon);
-		else
-			setPixmap(0,m_folderIcon);
-	}
-}
-
-/** Initializes the item Used by both constructors to share the double used source code */
-void CGroupManagerItem::init( const QString& caption, const QString& modulename, CSwordModuleInfo *module_info, CSwordKey* bookmarkKey, CGroupManagerItem::ItemType Type ){
-	m_bookmarkKey = 0;
-	m_createdOwnKey = false;
-	m_moduleInfo = 0;
-	m_caption = QString::null;
-	m_description = QString::null;
-	
-	setType(Type);	
-	if (bookmarkKey)
-		setBookmarkKey( bookmarkKey );
-	setModuleInfo( module_info );
-	m_caption = caption;
-	m_moduleName = modulename;
-	
-	update();	//refresh the pixmap, texts etc.
-}
-
-/** Sets / changes the description */
-void CGroupManagerItem::setDescription(const QString& new_description) {
-	m_description = new_description;
-	update();
-}
-
-/** Returns the description of the item */
-const QString CGroupManagerItem::description() const {
-	return m_description;
-}
-
-/** Returns the parent of this item. Reimplementation. */
-CGroupManagerItem* CGroupManagerItem::parent(){
-	CGroupManagerItem* myParent = dynamic_cast<CGroupManagerItem*>(QListViewItem::parent());	
-	if (myParent)
-		return myParent;
-	else
-		return 0;
-}
-
-/** Returns the listview of this item */
-CGroupManager* CGroupManagerItem::listView(){
-	CGroupManager* myListView = dynamic_cast<CGroupManager*>(QListViewItem::listView());
-	if (myListView)
-		return myListView;
-	else
-		return 0;	
-}
-
-/** Returns the key if it's a Bookmark, othwerwise return 0 */
-CSwordKey* CGroupManagerItem::getBookmarkKey() const{
-	return m_bookmarkKey;
-}
-
-/** Sets the key, which is only used if this item is a Bookmark */
-void CGroupManagerItem::setBookmarkKey( CSwordKey* key ){
-	if (m_bookmarkKey && m_createdOwnKey)
-		delete m_bookmarkKey;		
-	m_bookmarkKey = key;
-	m_createdOwnKey = false;
-	update();
-}
-
-/** Updates this item (icons, captions, etc.) */
-void CGroupManagerItem::update(){
-	if (m_type == Group) {
-		m_folderIcon = GROUP_ICON_SMALL;
-		m_openFolderIcon = GROUP_OPEN_ICON_SMALL;		
-		setPixmap(0, m_folderIcon);
-		setText(0, m_caption);
-	}
-  else if (m_type == Bookmark) {
-		QString title = QString::null;
-		setPixmap(0, BOOKMARK_ICON_SMALL);
-		CSwordKey* bookmarkKey = getBookmarkKey();
-		if ( bookmarkKey ) {	//if we have a valid key
-			title = bookmarkKey->key();
-		}
-		else if (!m_caption.isEmpty()){	//bookmark key is 0, we use now the m_caption member to create a valid key
-			CSwordKey* key = CSwordKey::createInstance(m_moduleInfo);
-			ASSERT(key);
-			if (key) {
-				m_createdOwnKey = true;
-				key->key(m_caption);
-				setBookmarkKey(key);
-				update();// this won't lead to a infinite loop because we have now a valid key
-			}
-			else { //no key and now module but a valid caption
-				title = m_caption;
-			}
-		}		
-		if (!title.isEmpty()) {
-				title = QString::fromLatin1("%1 (%2)")
-					.arg(title)
-					.arg(m_moduleInfo ? m_moduleInfo->name() : i18n("unknown"));
-			setText(0,title);
-		}
-	}
-	else if ( m_type == CGroupManagerItem::Module ) {
-		setPixmap(0, CToolClass::getIconForModule(m_moduleInfo));
-		if (m_moduleInfo)
-			setText(0, m_moduleInfo->name());
-		else if (!m_moduleName.isEmpty())
-			setText(0, m_moduleName);			
-		else
-			setText(0, i18n("unknown"));
-	}
-}
-
-/** Sets the type of the item. */
-void CGroupManagerItem::setType( const CGroupManagerItem::ItemType type) {
-	m_type = type;
-}
-
-/** Sets the module of ths item. */
-void CGroupManagerItem::setModuleInfo( CSwordModuleInfo* moduleInfo ){
-	m_moduleInfo = dynamic_cast<CSwordModuleInfo*>(moduleInfo);
-}
-
-/** Returns a QString version of the key. */
-const QString CGroupManagerItem::getKeyText(){
-	return m_bookmarkKey ? m_bookmarkKey->key() : QString::null;
-}
-
-/** Returns the tooltip for this ite, QString::null is returned if this item has no tooltip. */
-const QString CGroupManagerItem::getToolTip(){
-	QString text = QString::null;
-	switch ( type() ) {
-		case Bookmark:
-		{
-			text = i18n("Bookmark to" ) + QString::fromLatin1(" ");
-			text.append(QString::fromLatin1("<B>") + getKeyText() + QString::fromLatin1("</B><BR>"));
-			if (!description().stripWhiteSpace().isEmpty())
-				text.append(QString::fromLatin1("<FONT color=\"#800000\">(") + description().stripWhiteSpace() + QString::fromLatin1(")</FONT><BR>"));
-			text.append(QString::fromLatin1("<HR>"));			
-				
-			CSwordKey* key = dynamic_cast<CSwordKey*>(getBookmarkKey());
-			if (!key)
-				return QString::null;				
-			QString bookmarkText = 	key ? key->renderedText() : QString();
-			if (bookmarkText.length() > 150 && (moduleInfo()->type() != CSwordModuleInfo::Bible))
-				bookmarkText = bookmarkText.left(150) + "<BR>[...]";
-
-			//Module is Unicode-based
-			if (moduleInfo() && moduleInfo()->isUnicode() ) {
-  			QFont f = CBTConfig::get(CBTConfig::unicode);
-				text.append( QString::fromLatin1("<FONT FACE=\"%1\">%3</FONT>").arg(f.family())/*.arg(CToolClass::makeLogicFontSize(f.pointSize()))*/.arg(bookmarkText) );
-			}
-			else
-				text.append(bookmarkText);
-
-      return text;				
-		}
-		case Module:
-		{
-			text = i18n("Module") + QString::fromLatin1(": <B>%1</B><HR>").arg( moduleInfo()->name() );
-			text += moduleInfo()->config(CSwordModuleInfo::Description) + QString::fromLatin1("<HR>");
-			text += i18n("Language")+ QString::fromLatin1(": %1<BR>").arg(moduleInfo()->module()->Lang());
-			if (moduleInfo()->isEncrypted())
-				text += i18n("Unlock key") + QString::fromLatin1(": %1<BR>")
-					.arg(!moduleInfo()->config(CSwordModuleInfo::CipherKey).isEmpty() ? moduleInfo()->config(CSwordModuleInfo::CipherKey) : QString("<FONT COLOR=\"red\">%1</FONT>").arg(i18n("not set")));
-			if (moduleInfo()->hasVersion())
-				text += i18n("Version") + QString::fromLatin1(": %1<BR>").arg(moduleInfo()->config(CSwordModuleInfo::ModuleVersion));
-     	     	
-     	QString options;
-     	unsigned int opts;
-     	for (opts = CSwordBackend::filterOptionsMIN; opts <= CSwordBackend::filterOptionsMAX; ++opts){
-     		if (moduleInfo()->has( (CSwordBackend::FilterOptions) opts )) {
-       		if (!options.isEmpty())
-       			options += QString::fromLatin1(", ");
-       		options += CSwordBackend::translatedOptionName( (CSwordBackend::FilterOptions) 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;
-		}
-		case Group:
-		default:
-			return QString::null;
-	}
-}
-
-/** Moves this item after the item "item". */
-void CGroupManagerItem::moveAfter( CGroupManagerItem* item, const MoveType type ){
-	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
-	}
-}
diff --git a/bibletime/frontend/groupmanager/cgroupmanageritem.h b/bibletime/frontend/groupmanager/cgroupmanageritem.h
deleted file mode 100644
index 708aa24..0000000
--- a/bibletime/frontend/groupmanager/cgroupmanageritem.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/***************************************************************************
-                          cgroupmanageritem.h  -  The items in a CGroupManager
-                             -------------------
-    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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CGROUPMANAGERITEM_H
-#define CGROUPMANAGERITEM_H
-
-//BibleTime includes
-#include "../cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-
-//KDE includes
-#include <qpixmap.h>
-#include <klistview.h>
-
-class CSwordKey;
-class CSwordModuleInfo;
-
-class CGroupManager;
-class CSwordModuleInfo;
-class QListViewItem;
-
-/**
-	* An item which implements functions to get the module of this item.
-  *
-  * An item which implements functions to get the module of this item. The constructor gets the required arguments to operate
-  * @author Joachim Ansorg <jansorg@gmx.de>
-  */
-class CGroupManagerItem : public KListViewItem, public CPointers  {
-	
-	friend class CGroupManager;
-
-public:
-	enum ItemType	{ Bookmark, Module, Group };
-	enum MoveType { OnlySameParents, AllowDifferentParents };
-	
-	/**
- 	* The constructor. This constructor takes a CGroupManager as parent, the created item will be on the top of the tree.
- 	* @param parent The CGRoupManager which will contain the new item
- 	* @param caption	The caption of the item. This parameter will eb passes to @see #init()
- 	* @param modulename The name of our module. This is used in addition to the CModuleInfo object because sometimes the moduleinfo is missing and we don't want to loose bookmarks.
- 	* @param module_info The CModuleInfo object we use for the item. May be zero because a group doesn't have a CModuleInfo.
- 	* @param Type The type of the created item. May ba Module, Bookmark or Group. If you leave out the parameter it will be Module by default.
- 	*/
-	CGroupManagerItem( CGroupManager *parent, const QString& caption,const QString& modulename, CSwordModuleInfo *module_info, CSwordKey* bookmarkKey = 0, CGroupManagerItem::ItemType Type = CGroupManagerItem::Module );
-	/**
- 	* The constructor. This constructor takes a CGroupManagerItem as parent. The created item will be on a child of the parent item
- 	* @param parent The CGroupManagerItem which will be parent item of the new item
- 	* @param caption	The caption of the item. This parameter will eb passes to @see #init()
- 	* @param modulename The name of our module. This is used in addition to the CModuleInfo object because sometimes the moduleinfo is missing and we don't want to loose bookmarks.
- 	* @param module_info The CModuleInfo object we use for the item. May be zero because a group doesn't have a CModuleInfo.
- 	* @param Type The type of the created item. May ba Module, Bookmark or Group. If you leave out the parameter it will be Module by default.
- 	*/	
-	CGroupManagerItem( CGroupManagerItem *parent, const QString& caption, const QString& modulename, CSwordModuleInfo *module_info, CSwordKey* bookmarkKey = 0, CGroupManagerItem::ItemType Type = CGroupManagerItem::Module);
-	/**
- 	* The destructor. Cleans up memory.
- 	*/
-	~CGroupManagerItem();
-  /**
- 	* Returns the description of the item
- 	* @return The description of the item. Useful for bookmarks.
- 	*/
-  const QString description() const;
-  /**
- 	* Use this to get the parent item of the item-
- 	* @return The parent item. Maybe NULL if the item has no parent.
- 	* Reimplementation.
- 	*/
-  virtual CGroupManagerItem* parent();
-  /**
- 	* Sets the module of ths item.
- 	*/
-  void setModuleInfo( CSwordModuleInfo* moduleInfo );
-  /**
- 	* Sets the type of the item.
- 	*/
-  void setType( const CGroupManagerItem::ItemType type);
-  /**
- 	* Updates this item (icons, captions, etc.)
- 	*/
-  virtual void update();
-  virtual CGroupManager* listView();
-  /**
- 	* Sets the key, which is only used if this item is a Bookmark
- 	*/
-  void setBookmarkKey( CSwordKey* key );
-  /**
- 	* Returns the key if it's a Bookmark, othwerwise return 0
- 	*/
-  CSwordKey* getBookmarkKey() const;
-  /**
- 	* Returns a QString version of the key.
- 	*/
-  const QString getKeyText();
-  /**
-  * Returns the CModuleInfo obkject for this tree-item.
-  * @return Gives back a pointer to the moduleinfo. May ba NULL because groups do not have moduleinfos.
-  */
-  CSwordModuleInfo* moduleInfo() const;
-  /**
- 	* Use this function to get the type of this item.
- 	* @return Returns the type of the item. May be Group, Bookmark or Module.
- 	*/
-  const CGroupManagerItem::ItemType type() const;
-	/**
- 	* Show sub item if true, otherwise do not show them.
- 	* Reimplementation from QListViewItem
- 	*/
-  virtual void setOpen( bool );
-  /**
-   * Sets / changes the description
-   */
-  void setDescription(const QString&);
-  /**
-  * Returns the tooltip for this ite, QString::null is returned if this item has no tooltip.
-  */
-  const QString getToolTip();
-  /**
-  * Moves this item after the item "item".
-  * This function acts like the provate function "moveToJustAfter"
-  * moveItem isn't usable for items which are child of item.
-  */
-  void moveAfter( CGroupManagerItem* item, const MoveType type = OnlySameParents );
-
-private:
-  /**
- 	* Initializes the item Used by both constructors to share the double used source code
- 	* @param caption The caption of the item
- 	* @param modulename The modulename as a QSTring
- 	* @param module_info	The CModuleInfo object for this item. May be NULL because groups have no moduleinfo.
- 	* @param Type The type of the item (Group, Bookmark or Module)
- 	*/
-  virtual void init( const QString& caption, const QString& modulename, CSwordModuleInfo *module_info,CSwordKey* bookmarkKey, CGroupManagerItem::ItemType Type);
-  /**
- 	* The type of this entry
- 	*/
-  ItemType m_type;
-  /**
- 	* The pointer to the internal module_info
-	* At the moment we assume that the module of a CGroupmanagerItem is a CSwordModuleInfo object.
- 	*/
-	CSwordModuleInfo* m_moduleInfo;
-	/**
- 	* The key which is only valid for bookmarks
- 	*/
-	CSwordKey* m_bookmarkKey;
-	/**
-	* This is true if this item uses a key which was created by this item.
-	*/
-	bool m_createdOwnKey;
-  /**
- 	* The description of the item.
- 	* At the moment only useable for bookmarks.
- 	*/
-  QString m_description;	
-  /**
- 	* The caption of the item.
-	* Used for bookmarks and groups.
- 	*/
-  QString m_caption;	
-  /**
-	* The namec of the module.
- 	*/
-  QString m_moduleName;	
-	/**
- 	* The pixmap which belongs to folders
- 	*/
-	QPixmap m_folderIcon;
-	/**
- 	* The pixmap which belongs to opened folders
- 	*/
-	QPixmap m_openFolderIcon;
-};
-
-#endif
-
diff --git a/bibletime/frontend/keychooser/Makefile.in b/bibletime/frontend/keychooser/Makefile.in
index e423020..201c969 100644
--- a/bibletime/frontend/keychooser/Makefile.in
+++ b/bibletime/frontend/keychooser/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,152 +229,210 @@ 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@
-micodir = @micodir@
+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
+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
+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 = ../../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libkeychooser_a_LIBADD = 
-#>- libkeychooser_a_OBJECTS =  cbiblekeychooser.$(OBJEXT) \
-#>- clexiconkeychooser.$(OBJEXT) ckeychooser.$(OBJEXT) cfx_btn.$(OBJEXT) \
-#>- ckeychooserwidget.$(OBJEXT) cbookkeychooser.$(OBJEXT) \
-#>- cbooktreechooser.$(OBJEXT)
-#>+ 9
+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)\
-cfx_btn.moc.o ckeychooser.moc.o cbooktreechooser.moc.o ckeychooserwidget.moc.o cbiblekeychooser.moc.o clexiconkeychooser.moc.o cbookkeychooser.moc.o  \
-libkeychooser_a_meta_unload.o 
+	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)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=ckeychooserwidget.h cbiblekeychooser.h cbookkeychooser.h ckeychooser.h clexiconkeychooser.h cbooktreechooser.h cfx_btn.h 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/cbiblekeychooser.P .deps/cbookkeychooser.P \
-#>- .deps/cbooktreechooser.P .deps/cfx_btn.P .deps/ckeychooser.P \
-#>- .deps/ckeychooserwidget.P .deps/clexiconkeychooser.P
-#>+ 8
-@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cfx_btn.moc.P $(DEPDIR)/ckeychooser.moc.P $(DEPDIR)/cbooktreechooser.moc.P $(DEPDIR)/ckeychooserwidget.moc.P $(DEPDIR)/cbiblekeychooser.moc.P $(DEPDIR)/clexiconkeychooser.moc.P $(DEPDIR)/cbookkeychooser.moc.P $(DEPDIR)/libkeychooser_a_meta_unload.P  $(DEPDIR)/libkeychooser_a.all_cpp.P \
-	  .deps/cbiblekeychooser.P .deps/cbookkeychooser.P \
-.deps/cbooktreechooser.P .deps/cfx_btn.P .deps/ckeychooser.P \
-.deps/ckeychooserwidget.P .deps/clexiconkeychooser.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cfx_btn.moc.P $(DEPDIR)/ckeychooser.moc.P $(DEPDIR)/cbooktreechooser.moc.P $(DEPDIR)/ckeychooserwidget.moc.P $(DEPDIR)/cbiblekeychooser.moc.P $(DEPDIR)/clexiconkeychooser.moc.P $(DEPDIR)/cbookkeychooser.moc.P $(DEPDIR)/libkeychooser_a_meta_unload.P   .deps/cbiblekeychooser.P .deps/cbookkeychooser.P \
-.deps/cbooktreechooser.P .deps/cfx_btn.P .deps/ckeychooser.P \
-.deps/ckeychooserwidget.P .deps/clexiconkeychooser.P
 
+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)
-OBJECTS = $(libkeychooser_a_OBJECTS)
 
-#>- all: all-redirect
+#>- all: all-am
 #>+ 1
-all: docs-am  all-redirect
+all: docs-am  all-am
+
 .SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile
+.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: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
+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)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+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 *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
+@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@
 
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+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)/'`$<
 
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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
@@ -356,288 +441,328 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 
-maintainer-clean-libtool:
+ETAGS = etags
+ETAGSFLAGS =
 
-libkeychooser.a: $(libkeychooser_a_OBJECTS) $(libkeychooser_a_DEPENDENCIES)
-	-rm -f libkeychooser.a
-	$(AR) cru libkeychooser.a $(libkeychooser_a_OBJECTS) $(libkeychooser_a_LIBADD)
-	$(RANLIB) libkeychooser.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
+CTAGS = ctags
+CTAGSFLAGS =
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+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
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/frontend/keychooser
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/frontend/keychooser/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(LIBRARIES)
 
-install-data-am:
+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
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-#>- clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-moc-classes clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
+	@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
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
+#>- 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
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+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
 
-#>+ 3
-ckeychooser.moc.cpp: $(srcdir)/ckeychooser.h
-	$(MOC) $(srcdir)/ckeychooser.h -o ckeychooser.moc.cpp
+#>+ 2
+mocs: cfx_btn.moc.cpp
 
 #>+ 3
 cbooktreechooser.moc.cpp: $(srcdir)/cbooktreechooser.h
 	$(MOC) $(srcdir)/cbooktreechooser.h -o cbooktreechooser.moc.cpp
 
-#>+ 3
-ckeychooserwidget.moc.cpp: $(srcdir)/ckeychooserwidget.h
-	$(MOC) $(srcdir)/ckeychooserwidget.h -o ckeychooserwidget.moc.cpp
+#>+ 2
+mocs: cbooktreechooser.moc.cpp
 
 #>+ 3
-cbiblekeychooser.moc.cpp: $(srcdir)/cbiblekeychooser.h
-	$(MOC) $(srcdir)/cbiblekeychooser.h -o cbiblekeychooser.moc.cpp
+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
-cbookkeychooser.moc.cpp: $(srcdir)/cbookkeychooser.h
-	$(MOC) $(srcdir)/cbookkeychooser.h -o cbookkeychooser.moc.cpp
+cbiblekeychooser.moc.cpp: $(srcdir)/cbiblekeychooser.h
+	$(MOC) $(srcdir)/cbiblekeychooser.h -o cbiblekeychooser.moc.cpp
+
+#>+ 2
+mocs: cbiblekeychooser.moc.cpp
 
 #>+ 3
 clean-metasources:
-	-rm -f  cfx_btn.moc.cpp ckeychooser.moc.cpp cbooktreechooser.moc.cpp ckeychooserwidget.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp cbookkeychooser.moc.cpp
+	-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:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  bibletime/frontend/keychooser/Makefile
 	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/keychooser/Makefile.in
 
 
-#>+ 10
-libkeychooser_a_meta_unload.cpp:  cfx_btn.moc.cpp ckeychooser.moc.cpp ckeychooserwidget.moc.cpp cbooktreechooser.moc.cpp clexiconkeychooser.moc.cpp cbiblekeychooser.moc.cpp cbookkeychooser.moc.cpp
-	@echo 'creating libkeychooser_a_meta_unload.cpp'
-	@-rm -f libkeychooser_a_meta_unload.cpp
-	@echo 'static const char * _metalist_libkeychooser_a[] = {' > libkeychooser_a_meta_unload.cpp
-	@cat  cfx_btn.moc.cpp ckeychooser.moc.cpp ckeychooserwidget.moc.cpp cbooktreechooser.moc.cpp clexiconkeychooser.moc.cpp cbiblekeychooser.moc.cpp cbookkeychooser.moc.cpp | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkeychooser_a_meta_unload.cpp
-	@echo '0};' >> libkeychooser_a_meta_unload.cpp
-	@echo '#include <kunload.h>' >> libkeychooser_a_meta_unload.cpp
-	@echo '_UNLOAD(libkeychooser_a)' >> libkeychooser_a_meta_unload.cpp
-
+#>+ 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
 
-#>+ 3
-clean-moc-classes:
-	-rm -f  libkeychooser_a_meta_unload.cpp
 
 #>+ 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 libkeychooser_a_meta_unload.cpp  cfx_btn.moc.cpp ckeychooser.moc.cpp cbooktreechooser.moc.cpp ckeychooserwidget.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp cbookkeychooser.moc.cpp
+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 libkeychooser_a_meta_unload.cpp  cfx_btn.moc.cpp ckeychooser.moc.cpp cbooktreechooser.moc.cpp ckeychooserwidget.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp cbookkeychooser.moc.cpp; do \
+	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; \
+	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
 
-#>+ 2
+#>+ 3
 final:
 	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_final_OBJECTS)" all-am
-#>+ 2
+
+#>+ 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) -f $(top_srcdir)/admin/Makefile.common 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
index ca64115..563e187 100644
--- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
@@ -19,77 +19,110 @@
 #include "cbiblekeychooser.h"
 #include "ckeychooserwidget.h"
 #include "cfx_btn.h"
-#include "../../whatsthisdef.h"
-#include "../../tooltipdef.h"
-#include "../../backend/cswordversekey.h"
-#include "../../backend/cswordbiblemoduleinfo.h"
-#include "../../backend/cswordmoduleinfo.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(CSwordModuleInfo *module, CSwordKey *key, QWidget *parent, const char *name )
-	: CKeyChooser(module, key, parent, name), m_info(0), m_key(0), w_book(0), w_chapter(0), w_verse(0)
+CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name )
+	: CKeyChooser(modules, key, parent, name), m_key(dynamic_cast<CSwordVerseKey*>(key))
 {
-	if (module && (module->type() == CSwordModuleInfo::Bible || module->type() == CSwordModuleInfo::Commentary) ) {
-		m_info = dynamic_cast<CSwordBibleModuleInfo*>(module);
-		m_key  = dynamic_cast<CSwordVerseKey*>(key);
-	}
-	else {
+	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->setResizeMode(QLayout::Fixed);
+  layout->setDirection( QBoxLayout::LeftToRight );
 		
-	w_book = new CKeyChooserWidget(m_info->books(),false,this);	
-	w_book->setToolTips(TT_PRESENTER_BOOK_COMBO, TT_PRESENTER_NEXT_BOOK, TT_PRESENTER_SCROLL_BUTTON, TT_PRESENTER_PREVIOUS_BOOK);
-	w_book->setWhatsThis(WT_PRESENTER_BOOK_COMBO, WT_PRESENTER_NEXT_BOOK, WT_PRESENTER_SCROLL_BUTTON, WT_PRESENTER_PREVIOUS_BOOK);
+	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_info->chapterCount(1),true,this);		
-	w_chapter->setToolTips(TT_PRESENTER_CHAPTER_COMBO, TT_PRESENTER_NEXT_CHAPTER, TT_PRESENTER_SCROLL_BUTTON, TT_PRESENTER_PREVIOUS_CHAPTER);	
-	w_chapter->setWhatsThis(WT_PRESENTER_CHAPTER_COMBO, WT_PRESENTER_NEXT_CHAPTER, WT_PRESENTER_SCROLL_BUTTON, WT_PRESENTER_PREVIOUS_CHAPTER);		
+  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_info->verseCount(1,1),true,this);
-	w_verse->setToolTips(TT_PRESENTER_VERSE_COMBO, TT_PRESENTER_NEXT_VERSE, TT_PRESENTER_SCROLL_BUTTON, TT_PRESENTER_PREVIOUS_VERSE);
-	w_verse->setWhatsThis(WT_PRESENTER_VERSE_COMBO, WT_PRESENTER_NEXT_VERSE, WT_PRESENTER_SCROLL_BUTTON, WT_PRESENTER_PREVIOUS_VERSE);
-						
+  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);	
+	QWidget::setTabOrder(w_verse, 0);
 		
-	layout->addWidget(w_book);
-	layout->addWidget(w_chapter);
-	layout->addWidget(w_verse);	
+	layout->addWidget(w_book,0);
+	layout->addWidget(w_chapter,0);
+	layout->addWidget(w_verse,0);
 
-	/*Book connections*/
+	/* Book connections */
 	connect(w_book,SIGNAL(changed(int))       ,SLOT(bookChanged(int)));
 	connect(w_book,SIGNAL(focusOut(int))      ,SLOT(bookFocusOut(int)));	
 	
-	/*Chapter Connections*/
+	/* 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*/
+
+
+	/* 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)));	
+	connect(w_verse,SIGNAL(focusOut(int))     ,SLOT(verseFocusOut(int)));
 }
 
 CSwordKey* const CBibleKeyChooser::key(){
 	if (m_key) {
-		m_key->book(w_book->comboBox()->currentText());	
-		m_key->Chapter(w_chapter->comboBox()->currentText().toInt());			
-		m_key->Verse(w_verse->comboBox()->currentText().toInt());			
+    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;
 }
@@ -97,8 +130,9 @@ CSwordKey* const CBibleKeyChooser::key(){
 void CBibleKeyChooser::setKey(CSwordKey* key){
 	if ( !(m_key = dynamic_cast<CSwordVerseKey*>(key)) )
 		return;
-		
-	const unsigned int bookIndex = m_info->bookNumber( m_key->book() );
+
+	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();
 
@@ -112,48 +146,49 @@ void CBibleKeyChooser::setKey(CSwordKey* key){
 			break;
 		}
 	}
-	
+
 	if (bookIsValid) {	//we have a valid book
-		if (w_book->comboBox()->currentText() != m_key->book()) //necessary?
+		if (w_book->comboBox()->currentText() != m_key->book()) { //necessary?
 			w_book->setItem( m_key->book() );
-		
-		w_chapter->reset(m_info->chapterCount(bookIndex), chapter-1, false);
-		w_chapter->adjustSize();
-		
-		w_verse->reset(m_info->verseCount(bookIndex, chapter), verse-1, false);
-		w_verse->adjustSize();
-	
-		emit keyChanged(m_key);					
+		}
+
+		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 {
-		qWarning("CBibleKeyChooser::setKey: book %s is invalid!", m_key->book().latin1());
-		w_verse->comboBox()->setCurrentItem(0);				
-		m_key->Verse(w_verse->comboBox()->currentText().toInt());		
+  	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))	
+
+	setUpdatesEnabled(false);
+	if (m_key) {
+		emit beforeKeyChange(m_key->key());
+	}
+	if (m_key->next(CSwordVerseKey::UseChapter)) {
 		setKey(m_key);
-	setUpdatesEnabled(true);	
+	}
+	setUpdatesEnabled(true);
 }
 
 /**  */
 void CBibleKeyChooser::chapterPrevRequested(void){
 	if (!isUpdatesEnabled())
 		return;
-		
-	setUpdatesEnabled(false);		
+
+	setUpdatesEnabled(false);
 	if (m_key)
 		emit beforeKeyChange(m_key->key());
-	
+
 	if (m_key->previous(CSwordVerseKey::UseChapter))
 		setKey(m_key);
 	setUpdatesEnabled(true);
@@ -168,9 +203,9 @@ void CBibleKeyChooser::verseNextRequested(void){
 	if (m_key)
 		emit beforeKeyChange(m_key->key());
 
-	if (m_key->next(CSwordVerseKey::UseVerse))	
+	if (m_key->next(CSwordVerseKey::UseVerse))
 		setKey(m_key);
-	setUpdatesEnabled(true);		
+	setUpdatesEnabled(true);
 }
 
 /**  */
@@ -181,29 +216,32 @@ void CBibleKeyChooser::versePrevRequested(void){
 	setUpdatesEnabled(false);	
 	if (m_key)
 		emit beforeKeyChange(m_key->key());
-	
+
 	if (m_key->previous(CSwordVerseKey::UseVerse))
 		setKey(m_key);
-	setUpdatesEnabled(true);	
+	setUpdatesEnabled(true);
 }
 
 void CBibleKeyChooser::bookChanged(int /*i*/){
-//	qDebug("CBibleKeyChooser::bookChanged(int /*i*/)");
+//	qWarning("CBibleKeyChooser::bookChanged(int /*i*/)");
+ 	Q_ASSERT(m_key);
+
 	if (!isUpdatesEnabled())
 		return;
-	setUpdatesEnabled(false);	
+
+	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);		
+	}
+	setUpdatesEnabled(true);
 }
 
 void CBibleKeyChooser::chapterChanged(int /*i*/){
-//	qDebug("CBibleKeyChooser::chapterChanged(int /*i*/)");
+//	qWarning("CBibleKeyChooser::chapterChanged(int /*i*/)");
 	if (!isUpdatesEnabled())
 		return;
 	
@@ -212,13 +250,13 @@ void CBibleKeyChooser::chapterChanged(int /*i*/){
 		emit beforeKeyChange(m_key->key());
 //	if (m_key)
 //		emit beforeKeyChange(m_key->key());
-	
-	if (m_key->Chapter() != w_chapter->comboBox()->currentText().toInt()) {	
+
+	if (m_key->Chapter() != w_chapter->comboBox()->currentText().toInt()) {
 		m_key->Chapter( w_chapter->comboBox()->currentText().toInt() );
-		setKey( m_key );	
+		setKey( m_key );
 	}
-	
-	setUpdatesEnabled(true);		
+
+	setUpdatesEnabled(true);
 }
 
 void CBibleKeyChooser::verseChanged(int /*i*/){
@@ -243,30 +281,40 @@ QSize CBibleKeyChooser::sizeHint(){
 
 /** Reimplementation. */
 void CBibleKeyChooser::refreshContent() {
-	w_book->reset( m_info->books(), w_book->comboBox()->currentItem(), false);
+  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::setModule(CSwordModuleInfo* module){
-	if (module != m_info && module) {
-		m_info = dynamic_cast<CSwordBibleModuleInfo*>(module);
-		refreshContent();
-	}
+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){
+void CBibleKeyChooser::bookFocusOut(int /*index*/){
 	if (!isUpdatesEnabled())
 		return;
 		
 	setUpdatesEnabled(false);
 	
 	m_key->book( w_book->comboBox()->currentText() );
-	const int chapterCount = m_info->chapterCount( m_info->bookNumber(m_key->book()));
+	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_info->verseCount(m_info->bookNumber(m_key->book()),m_key->Chapter());
+	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);
@@ -276,7 +324,7 @@ void CBibleKeyChooser::bookFocusOut(int index){
 void CBibleKeyChooser::chapterFocusOut(int /*index*/){
 	const int chapter = w_chapter->comboBox()->currentText().toInt();
 	m_key->Chapter( chapter );
-	w_verse->reset(m_info->verseCount(m_info->bookNumber(m_key->book()),chapter), 0, false);
+	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 */
@@ -286,5 +334,10 @@ void CBibleKeyChooser::verseFocusOut(int /*index*/){
 }
 
 /** No descriptions */
-void CBibleKeyChooser::updateKey(CSwordKey* key){
+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
index 94215f5..205919c 100644
--- a/bibletime/frontend/keychooser/cbiblekeychooser.h
+++ b/bibletime/frontend/keychooser/cbiblekeychooser.h
@@ -18,15 +18,18 @@
 #ifndef CBIBLEKEYCHOOSER_H
 #define CBIBLEKEYCHOOSER_H
 
-//#include <qnamespace.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
 	*
@@ -45,13 +48,13 @@ public:
 	* the constructor
 	*	you should not need to use this, use @ref CKeyChooser::createInstance instead
 	*/
-	CBibleKeyChooser(CSwordModuleInfo *module=0, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
+	CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
 
 public slots:
 	/**
 	* see @ref CKeyChooser::getKey
 	*/
-	CSwordKey*const key();
+	CSwordKey* const key();
 	/**
 	* see @ref CKeyChooser::setKey
 	*/
@@ -63,7 +66,7 @@ public slots:
   /**
   * Sets te module and refreshes the combos
   */
-  virtual void setModule(CSwordModuleInfo* module);
+  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = true);
   /**
  	* Reimplementation.
  	*/
@@ -99,14 +102,17 @@ public slots:
  	* see @ref bookPrevRequested
  	*/
   void verseNextRequested(void);
-  /** No descriptions */
   void updateKey(CSwordKey* key);
 
+
+protected:
+  virtual void adjustFont();
+
 private:
 	CKeyChooserWidget* w_book;
 	CKeyChooserWidget* w_chapter;
 	CKeyChooserWidget* w_verse;
-	CSwordBibleModuleInfo	*m_info;
+	QPtrList<CSwordBibleModuleInfo> m_modules;
 	CSwordVerseKey *m_key;
 
 private slots: // Private slots
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp
index 70909c5..315cab0 100644
--- a/bibletime/frontend/keychooser/cbookkeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbookkeychooser.cpp
@@ -16,23 +16,26 @@
  ***************************************************************************/
 
 #include "cbookkeychooser.h"
-#include "../../backend/cswordtreekey.h"
-#include "../../backend/cswordbookmoduleinfo.h"
+#include "backend/cswordtreekey.h"
+#include "backend/cswordbookmoduleinfo.h"
+#include "frontend/cbtconfig.h"
 
 //Qt includes
 #include <qlayout.h>
+#include <qmap.h>
 
-CBookKeyChooser::CBookKeyChooser(CSwordModuleInfo *module, CSwordKey *key, QWidget *parent, const char *name)
-	: CKeyChooser(module, key, parent,name), m_layout(0) {
-	if ( module && (module->type() == CSwordModuleInfo::GenericBook) ) {
-		m_module = dynamic_cast<CSwordBookModuleInfo*>(module);		
-		m_key = dynamic_cast<CSwordTreeKey*>(key);
-	}
-	else {
-		m_module = 0;
+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;
 	}
-	setModule(m_module);
+  setModules(modules, true);
+	adjustFont();
 }
 
 CBookKeyChooser::~CBookKeyChooser(){
@@ -52,11 +55,11 @@ void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal){
 	if (m_key && !oldKey.isEmpty())
 		siblings = QStringList::split("/",oldKey,false);
 
-	unsigned int depth = 0;
+	int depth = 0;
 	int index = 0;
 	
 	m_key->root();
-	while(m_key->firstChild() && (depth <= siblings.count())) {
+	while( m_key->firstChild() && (depth <= int(siblings.count())) ) {
 		const QString key = m_key->key();
 		index = 0;
 		const QString sibling = siblings[depth];
@@ -73,7 +76,7 @@ void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal){
 	}
 	
 	//clear the combos which were not filled
-	for (; depth < (unsigned int)m_module->depth(); ++depth)  {
+	for (; depth < m_modules.first()->depth(); ++depth)  {
 		CKeyChooserWidget* chooser = m_chooserWidgets.at(depth);
 		if (chooser)
 			chooser->reset(0,0,false);
@@ -83,22 +86,29 @@ void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal){
 		m_key->root();
 	else
 		m_key->key(oldKey);
-	
+
 	if (emitSignal)
 		emit keyChanged(m_key);
 }
 
 /** Returns the key of this kechooser. */
 CSwordKey* const CBookKeyChooser::key(){
-//	ASSERT(m_key);
 	return m_key;
 }
 
 /** Sets another module to this keychooser */
-void CBookKeyChooser::setModule(CSwordModuleInfo* module){
-	m_module = dynamic_cast<CSwordBookModuleInfo*>(module);	
+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 (m_module && m_key) {
+	if (refresh && m_modules.count() && m_key) {
 		if (!m_layout)
 			m_layout = new QHBoxLayout(this);
 
@@ -107,14 +117,29 @@ void CBookKeyChooser::setModule(CSwordModuleInfo* module){
 		m_chooserWidgets.clear();
 		m_chooserWidgets.setAutoDelete(false);
 		
-		for (int i = 0; i < m_module->depth(); ++i) {			
+		for (int i = 0; i < m_modules.first()->depth(); ++i) {			
 			CKeyChooserWidget* w = new CKeyChooserWidget(0, false, this); //empty keychooser
 			m_chooserWidgets.append( w );
-			w->show();			
-			connect(w, SIGNAL(changed(int)), SLOT(keyChooserChanged(int)));			
+			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);		
+		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 );
 	}
 }
 
@@ -126,11 +151,9 @@ void CBookKeyChooser::refreshContent(){
 
 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
+	if ((depth == 0) && chooserWidget && chooserWidget->comboBox()->count()) { //has already items
 		//set now the right item		
-		CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth);
-		ASSERT(chooserWidget);
-		if (chooserWidget) {
+		if (CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth)) {
 			chooserWidget->setItem( chooserWidget->comboBox()->text(currentItem) );
 		}
 		return;
@@ -156,22 +179,26 @@ void CBookKeyChooser::setupCombo(const QString key, const int depth, const int c
 }
 
 /** A keychooser changed. Update and emit a signal if necessary. */
-void CBookKeyChooser::keyChooserChanged(int newIndex){
-	QStringList items;
+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())
+		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);	
+	m_key->key(newKey);
 	setKey(m_key);
 }
 
@@ -179,3 +206,4 @@ void CBookKeyChooser::keyChooserChanged(int newIndex){
 void CBookKeyChooser::updateKey(CSwordKey* key){
 	setKey(key, false);
 }
+
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.h b/bibletime/frontend/keychooser/cbookkeychooser.h
index dd2c69e..08cabf5 100644
--- a/bibletime/frontend/keychooser/cbookkeychooser.h
+++ b/bibletime/frontend/keychooser/cbookkeychooser.h
@@ -28,7 +28,7 @@
 #include <qwidget.h>
 #include <qsize.h>
 #include <qmap.h>
-#include <qlist.h>
+#include <qptrlist.h>
 #include <qstringlist.h>
 
 class CSwordKey;
@@ -45,7 +45,7 @@ class QHBoxLayout;
 class CBookKeyChooser : public CKeyChooser  {
    Q_OBJECT
 public: 
-	CBookKeyChooser(CSwordModuleInfo *module=0, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
+	CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
 	~CBookKeyChooser();
   /**
   * Refreshes the content.
@@ -54,7 +54,7 @@ public:
   /**
   * Sets another module to this keychooser
   */
-  virtual void setModule(CSwordModuleInfo*);
+  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = false);
   /**
   * Returns the key of this kechooser.
   */
@@ -81,6 +81,8 @@ protected: // Protected methods
 	* 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:
   /**
@@ -92,8 +94,8 @@ protected slots:
 //  void previousEntry();
 
 private:
-	QList<CKeyChooserWidget> m_chooserWidgets;	
-	CSwordBookModuleInfo	*m_module;
+	QPtrList<CKeyChooserWidget> m_chooserWidgets;	
+	QPtrList<CSwordBookModuleInfo> m_modules;
 	CSwordTreeKey *m_key;
 	QHBoxLayout* m_layout;
 };
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp
index 97f8dc6..071e808 100644
--- a/bibletime/frontend/keychooser/cbooktreechooser.cpp
+++ b/bibletime/frontend/keychooser/cbooktreechooser.cpp
@@ -16,74 +16,122 @@
  ***************************************************************************/
 
 #include "cbooktreechooser.h"
-#include "../../backend/cswordtreekey.h"
-#include "../../backend/cswordbookmoduleinfo.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, const QString caption, const QString key)
-	: KListViewItem(parent, after, caption) {	
-	m_key = key;
+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,const QString caption, const QString key)
-	: KListViewItem(parent, caption) {	
-	m_key = key;
+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, const QString caption, const QString key)
-	: KListViewItem(view,after, caption) {	
-	m_key = key;
+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_key;
+	return m_keyName;
 };	
 
-////////////
+/** Initializes this item with the correct caption. */
+void CBookTreeChooser::TreeItem::setup() {
+  m_key->key(m_keyName);
+  setExpandable(m_key->hasChildren());
 
-CBookTreeChooser::CBookTreeChooser(CSwordModuleInfo *module, CSwordKey *key, QWidget *parent, const char *name)
-	: CKeyChooser(module, key, parent,name) {
-	if ( module && (module->type() == CSwordModuleInfo::GenericBook) ) {
-		m_module = dynamic_cast<CSwordBookModuleInfo*>(module);		
-		m_key = dynamic_cast<CSwordTreeKey*>(key);
-	}
-	else {
-		m_module = 0;
+  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*)));
+  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);
-	
-	setModule(module);
+  m_treeView->setFullWidth(true);
+
+  adjustFont();
 }
 
 CBookTreeChooser::~CBookTreeChooser(){
 }
 
 /** Sets a new key to this keychooser */
-void CBookTreeChooser::setKey(CSwordKey* newKey){
+void CBookTreeChooser::setKey(CSwordKey* /*newKey*/){
 }
 
 /** Sets a new key to this keychooser */
 void CBookTreeChooser::setKey(CSwordKey* newKey, const bool emitSignal){
-	if (m_key != newKey )
+ 	if (m_key != newKey )
 		m_key = dynamic_cast<CSwordTreeKey*>(newKey);
 	
 	const QString key = m_key->key();
@@ -99,16 +147,14 @@ void CBookTreeChooser::setKey(CSwordKey* newKey, const bool emitSignal){
 	
   QListViewItem* child = m_treeView->firstChild();
   while( child && index < count ) {
-//  	qWarning("trying to find %s", currentSibling.latin1() );
-
-  	if (child->text(0) == currentSibling) { //found parent of our item
+  	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) {
-//  			qWarning("found!");
   			break;
   		}
-  		child = child->firstChild();
+  		i->setOpen(true); //automatically creates childs
+      child = i->firstChild();
   		currentSibling = siblings[++index];
   	}
   	else
@@ -127,20 +173,44 @@ CSwordKey* const CBookTreeChooser::key(){
 }
 
 /** Sets another module to this keychooser */
-void CBookTreeChooser::setModule(CSwordModuleInfo* module){
-	m_module = dynamic_cast<CSwordBookModuleInfo*>(module);
-	
-	if (m_module && m_key) {
-		m_treeView->clear();
+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);
+    }
+  }
 	
-		m_key->root();
-		m_key->firstChild();
-		setupTree(0,0,m_key);
-		
-		updateKey(m_key);
+	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)
@@ -149,35 +219,54 @@ void CBookTreeChooser::refreshContent(){
 
 /** Set up the tree with the current level of key. */
 void CBookTreeChooser::setupTree( QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key ){
-//	ASSERT(key);
 	QListViewItem* item = 0;
 	if (parent)
-		item = new TreeItem(parent, after, key->getLocalName(), key->key());
+		item = new TreeItem(parent, after, key, key->key());
 	else
-		item = new TreeItem(m_treeView, after, key->getLocalName(), key->key());
+		item = new TreeItem(m_treeView, after, key, key->key());
 	
-	if (key->firstChild()) {
-		setupTree(item, 0, key);
-		key->parent();
-	}
 	if (key->nextSibling())
 		setupTree(parent, item, key);
 }
 
 /** No descriptions */
-void CBookTreeChooser::itemClicked( QListViewItem* item ){
+void CBookTreeChooser::itemActivated( QListViewItem* item ){
 	TreeItem* i = dynamic_cast<TreeItem*>(item);
-	ASSERT(i);
 	if (!i)
-		return;
+    return;
+	m_key->key(i->key());
+  if (i->childCount() > 0 || i->isExpandable())
+    i->setOpen(true);
 
-	const QString key = i->key();
-	m_key->key(key);
-	
-	emit keyChanged(m_key);
+  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
index 743253d..bcbf46c 100644
--- a/bibletime/frontend/keychooser/cbooktreechooser.h
+++ b/bibletime/frontend/keychooser/cbooktreechooser.h
@@ -32,7 +32,7 @@
 #include <qwidget.h>
 #include <qsize.h>
 #include <qmap.h>
-#include <qlist.h>
+#include <qptrlist.h>
 #include <qstringlist.h>
 
 //KDE includes
@@ -50,7 +50,7 @@ class TreeKeyIdx;
 class CBookTreeChooser : public CKeyChooser  {
    Q_OBJECT
 public:
-	CBookTreeChooser(CSwordModuleInfo *module=0, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
+	CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
 	~CBookTreeChooser();
   /**
   * Refreshes the content.
@@ -59,7 +59,7 @@ public:
   /**
   * Sets another module to this keychooser
   */
-  virtual void setModule(CSwordModuleInfo*);
+  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = true);
   /**
   * Returns the key of this kechooser.
   */
@@ -70,32 +70,51 @@ public:
   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, const QString caption, const QString key);
-			TreeItem(QListViewItem* parent, const QString caption, const QString key);			
-			TreeItem(QListView* view,QListViewItem* after, const QString caption, const QString key);						
+			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:
-			QString m_key;
+			CSwordTreeKey* m_key;
+      QString m_keyName;
 	};
 
-	CSwordBookModuleInfo	*m_module;
-	CSwordTreeKey *m_key;
+	QPtrList<CSwordBookModuleInfo>	m_modules;
+	CSwordTreeKey* m_key;
 	KListView* m_treeView;
-
-protected: // Protected methods
-  /** Set up the tree with the current level of key. */
-  void setupTree( QListViewItem* parent,QListViewItem* after, CSwordTreeKey* key );
-
-protected slots: // Protected slots
-  /** No descriptions */
-  void itemClicked( QListViewItem* item );
-
-public slots: // Public slots
-  /** No descriptions */
-  virtual void updateKey( CSwordKey* );
 };
 
 #endif
diff --git a/bibletime/frontend/keychooser/ckeychooser.cpp b/bibletime/frontend/keychooser/ckeychooser.cpp
index b0af52f..4a4ff49 100644
--- a/bibletime/frontend/keychooser/ckeychooser.cpp
+++ b/bibletime/frontend/keychooser/ckeychooser.cpp
@@ -25,24 +25,28 @@
 #include "cbiblekeychooser.h"
 #include "cbookkeychooser.h"
 
-CKeyChooser::CKeyChooser(CSwordModuleInfo *, CSwordKey *, QWidget *parent, const char *name )
+CKeyChooser::CKeyChooser(ListCSwordModuleInfo, CSwordKey *, QWidget *parent, const char *name )
 	: QWidget(parent, name){
 }
 
-CKeyChooser* CKeyChooser::createInstance(CSwordModuleInfo *module, CSwordKey *key, QWidget *parent){	
-//	ASSERT(module);
-//	ASSERT(key);
-	if (!module)
+CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent){	
+	if (!modules.count())
 		return 0;
- 	switch ( module->type() ){
+
+  CKeyChooser* ck = 0;
+ 	switch ( modules.first()->type() ){
  	  case CSwordModuleInfo::Commentary:	 //Bibles and commentaries uise the same key chooser
  	  case CSwordModuleInfo::Bible:
- 	  	return new CBibleKeyChooser(module,key,parent);
+ 	  	ck = new CBibleKeyChooser(modules,key,parent);
+      break;
  	  case CSwordModuleInfo::Lexicon:
-			return new CLexiconKeyChooser(module,key,parent);	
+			ck = new CLexiconKeyChooser(modules,key,parent);	
+      break;
  	  case CSwordModuleInfo::GenericBook:
- 	  	return new CBookKeyChooser(module,key,parent);
+ 	  	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
index 90bb145..b0979d6 100644
--- a/bibletime/frontend/keychooser/ckeychooser.h
+++ b/bibletime/frontend/keychooser/ckeychooser.h
@@ -20,6 +20,8 @@
 
 #include <qwidget.h>
 
+#include "backend/cswordmoduleinfo.h"
+
 class CSwordModuleInfo;
 class CSwordKey;
 
@@ -45,7 +47,7 @@ public:
 	* @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(CSwordModuleInfo *info, CSwordKey *key, QWidget *parent);
+  static CKeyChooser* createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent);
 
 signals:
 	/**
@@ -73,11 +75,11 @@ public slots:
 	*
 	* @return the current @ref CKey
 	*/
-  virtual CSwordKey*const key() = 0;	
+  virtual CSwordKey* const key() = 0;	
   /**
   * Sets the module of this keychooser and refreshes the comboboxes
   */
-  virtual void setModule( CSwordModuleInfo* ) = 0;
+  virtual void setModules( ListCSwordModuleInfo modules, const bool refresh = true ) = 0;
   /**
   * Freshes the content of the different key chooser parts.
   */
@@ -87,7 +89,12 @@ protected:
 	/**
 	* the constructor - DO NOT USE! -- use @ref #createInstance instead!
 	*/
-	CKeyChooser(CSwordModuleInfo *info=0, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
+	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
index 9a97e16..e4723eb 100644
--- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp
+++ b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
@@ -33,6 +33,11 @@
 #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){
@@ -47,13 +52,6 @@ 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);
-//		qWarning("FocusOut: %d", f->reason());
-//		qWarning("Mouse: %d",(f->reason()==QFocusEvent::Mouse)?1:0);
-//    qWarning("lineedit: %d",(o == lineEdit())?1:0);
-//    qWarning("listbox: %d",(o == listBox())?1:0);
-//    qWarning("this: %d",(o == this)?1:0);
-
-		
 		if (o == lineEdit() && f->reason() == QFocusEvent::Tab) {
 	    int index = listBox()->index( listBox()->findItem(currentText()) );
 	    if (index == -1)
@@ -99,22 +97,6 @@ void CKCComboBox::wheelEvent( QWheelEvent* e ) {
 	}
 }
 
-///** Returns the size this widget would like to have. */
-QSize CKCComboBox::sizeHint() const {
-	// IMHO Qt has a bug: The sizehint is not updated if the list is refreshed with other items
-	const QSize oldSize = QComboBox::sizeHint();
-	QRect contentsRect = style().comboButtonRect(0,0, oldSize.width(), oldSize.height());
-	const int buttonWidth = (oldSize.width() - contentsRect.width());
-
-	if (listBox())	{
-		return QSize( listBox()->sizeHint().width()+buttonWidth, QComboBox::sizeHint().height());
-	}
-	else {
-		return QSize( QComboBox::sizeHint().width()+buttonWidth, QComboBox::sizeHint().height());	
-	}
-}
-
-
 //**********************************************************************************/
 
 CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals,  QWidget *parent, const char *name) : QWidget(parent,name) {
@@ -164,7 +146,6 @@ void CKeyChooserWidget::changeCombo(int i){
 }
 
 void CKeyChooserWidget::reset(const int count, int index, bool do_emit){
-//	qWarning("CKeyChooserWidget::reset(const int count, int index, bool do_emit)");
 	if (!isUpdatesEnabled())
 		return;
 
@@ -189,25 +170,21 @@ void CKeyChooserWidget::reset(QStringList *list, int index, bool do_emit){
 	if (isResetting || !isUpdatesEnabled())
 		return;
 	isResetting = true;	
-	setUpdatesEnabled(false);
-	m_comboBox->setUpdatesEnabled(false);
-
-	m_mainLayout->setResizeMode(QLayout::FreeResize);
 	
 	oldKey = QString::null;
-	m_comboBox->clear();
-	if (list)
+
+//  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);
-	m_comboBox->resize( m_comboBox->sizeHint() );
-	m_comboBox->setUpdatesEnabled(true);			
-	
-	m_mainLayout->setResizeMode(QLayout::Minimum);
-	
-	m_comboBox->setCurrentItem(index);	
-	if (!list || (list && !list->count())) { //nothing in the combobox
+  }
+
+  if (!list || (list && !list->count())) { //nothing in the combobox
 		btn_up->setEnabled( true );
 		btn_fx->setEnabled( true );
-		btn_down->setEnabled( true );		
+		btn_down->setEnabled( true );	
 		setEnabled(false);
 	}
 	else if (!isEnabled()) { //was disabled
@@ -217,11 +194,21 @@ void CKeyChooserWidget::reset(QStringList *list, int index, bool do_emit){
 		btn_fx->setEnabled( enableButtons );
 		btn_down->setEnabled( list && (list->count()>1) );
 	}
-	setUpdatesEnabled(true);
-	
+
+  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;	
 }
 
@@ -238,45 +225,38 @@ void CKeyChooserWidget::unlock(void){
 }
 
 /** Initializes this widget. We need this function because we have more than one constructor. */
-void CKeyChooserWidget::init( ){
+void CKeyChooserWidget::init(){
 	oldKey = QString::null;
 	btn_up = btn_down = btn_fx = 0;
 
-	setFocusPolicy(QWidget::StrongFocus);			
-	m_mainLayout = new QHBoxLayout( this );	
+	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->setResizeMode(QLayout::Minimum);			
-	m_mainLayout->addWidget( m_comboBox );
-
-	QVBoxLayout *m_buttonLayout = new QVBoxLayout();	
+	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( this, "btn_up" );	
-	QIconSet iconSet = getUpIconSet();
-	btn_up->setIconSet( iconSet );
-	btn_up->setFixedSize(iconSet.pixmap().width(), iconSet.pixmap().height());
+
+	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" );
-	iconSet = getMoverIconSet();
-	btn_fx->setIconSet( iconSet );	
-	btn_fx->setFixedSize(iconSet.pixmap().width(), iconSet.pixmap().height());	
+	btn_fx->setFixedSize(WIDTH, MOVER_HEIGHT);
 	btn_fx->setFocusPolicy(QWidget::NoFocus);	
 	
-	btn_down = new QToolButton( this, "btn_down" );	
-	iconSet = getDownIconSet();
-	btn_down->setIconSet( iconSet );
-	btn_down->setFixedSize(iconSet.pixmap().width(), iconSet.pixmap().height());	
+	btn_down = new QToolButton( DownArrow, this, "btn_down" );	
+	btn_down->setFixedSize(WIDTH, ARROW_HEIGHT);
 	btn_down->setFocusPolicy(QWidget::NoFocus);	
 	
-	m_buttonLayout->addWidget( btn_up );	
-	m_buttonLayout->addWidget( btn_fx );	
-	m_buttonLayout->addWidget( btn_down );
+	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);
@@ -342,56 +322,11 @@ void CKeyChooserWidget::slotComboChanged(int index){
 	setUpdatesEnabled(true);		
 }
 
-#define WIDTH 17
-#define ARROW_HEIGHT 10
-#define MOVER_HEIGHT 6
-
-/** Returns the icons set which contains the down button. */
-QIconSet CKeyChooserWidget::getUpIconSet(){
-  QPixmap pix(WIDTH,ARROW_HEIGHT);
-	QPainter p(&pix);
-	p.fillRect(0,0, WIDTH-1, ARROW_HEIGHT-1, colorGroup().background());
-	style().drawArrow(&p, Qt::UpArrow, false, 1,1, WIDTH-2, ARROW_HEIGHT-2, btn_up ? btn_up->colorGroup() : colorGroup(), btn_up ? btn_up->isEnabled() : true);
-	
-	return QIconSet(pix);
-}
-
-/** Returns the icons set which contains the down button. */
-QIconSet CKeyChooserWidget::getDownIconSet(){
-  QPixmap pix(WIDTH,ARROW_HEIGHT);
-	QPainter p(&pix);
-	p.fillRect(0,0, WIDTH-1, ARROW_HEIGHT-1, colorGroup().background());
-	style().drawArrow(&p, Qt::DownArrow, false, 1,1, WIDTH-2, ARROW_HEIGHT-2, btn_down ? btn_down->colorGroup() : colorGroup(), btn_down ? btn_down->isEnabled() : true);
-	
-	return QIconSet(pix);
-}
-
-/** Returns the icons set for the button used to change the current item. */
-QIconSet CKeyChooserWidget::getMoverIconSet(){
-  QPixmap pix(WIDTH,MOVER_HEIGHT);
-	QPainter p(&pix);
-	p.fillRect(0,0, WIDTH-1, MOVER_HEIGHT-1, colorGroup().background());
-	p.fillRect(2,2, WIDTH-3, MOVER_HEIGHT-3, colorGroup().foreground());		
-	return QIconSet(pix);
-}
-#undef WIDTH
-#undef ARROW_HEIGHT
-#undef MOVER_HEIGHT
-
-/**  */
-void CKeyChooserWidget::adjustSize( ){
-	setUpdatesEnabled(false);
-	QSize s = sizeHint();
-	if (s.width() > maximumWidth())
-		s.setWidth( maximumWidth() );
-	
-	resize(s);
-	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){
-	QToolTip::add(comboBox(),comboTip);
+//  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) ){
@@ -406,7 +341,8 @@ void CKeyChooserWidget::setToolTips( const QString comboTip, const QString nextE
 
 /** No descriptions */
 void CKeyChooserWidget::setWhatsThis(const QString comboTip, const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip){
-	QWhatsThis::add(comboBox(),comboTip);
+//  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) ) {
@@ -421,7 +357,6 @@ void CKeyChooserWidget::setWhatsThis(const QString comboTip, const QString nextE
 
 /** Sets the current item to the one with the given text */
 bool CKeyChooserWidget::setItem( const QString item ){
-	qDebug("CKeyChooserWidget::setItem( const QString item )");
 	bool ret = false;
 	const int count = comboBox()->count();
 	for (int i = 0; i < count; ++i) {
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.h b/bibletime/frontend/keychooser/ckeychooserwidget.h
index 6df9dab..2707ced 100644
--- a/bibletime/frontend/keychooser/ckeychooserwidget.h
+++ b/bibletime/frontend/keychooser/ckeychooserwidget.h
@@ -22,6 +22,7 @@
 #include <qmap.h>
 
 #include <qcombobox.h>
+#include <qstringlist.h>
 
 class cfx_btn;
 class CLexiconKeyChooser;
@@ -48,7 +49,7 @@ public:
   /**
   * Returns the size this widget would like to have.
   */
-  virtual QSize sizeHint() const;
+//  virtual QSize sizeHint() const;
 
 protected:
   /**
@@ -105,7 +106,7 @@ public:
   /**
   *
   */
-  virtual void adjustSize();
+//  virtual void adjustSize();
   /**
   * Sets the QWhatsThis help for the different parts.
   */
@@ -169,15 +170,15 @@ protected:
 	/**
  	* Returns the icons set which contains the UP button.
  	*/
-	QIconSet getUpIconSet();
+//	QIconSet getUpIconSet();
   /**
   * Returns the icons set which contains the button used to change the current item.
   */
-  QIconSet getMoverIconSet();
+//  QIconSet getMoverIconSet();
   /**
   *  Returns the icons set which contains the down button.
   */
-  QIconSet getDownIconSet();
+//  QIconSet getDownIconSet();
 	/**
 	*
 	*/
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
index 61d3d64..1baea99 100644
--- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp
+++ b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
@@ -18,10 +18,16 @@
 #include "clexiconkeychooser.h"
 #include "ckeychooserwidget.h"
 #include "cfx_btn.h"
-#include "../../tooltipdef.h"
-#include "../../whatsthisdef.h"
-#include "../../backend/cswordlexiconmoduleinfo.h"
-#include "../cbtconfig.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>
@@ -31,31 +37,37 @@
 //KDE includes
 #include <klocale.h>
 
-CLexiconKeyChooser::CLexiconKeyChooser(CSwordModuleInfo *info, CSwordKey *key, QWidget *parent, const char *name )
-	: CKeyChooser(info, key, parent, name), m_key(0){
+CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name )
+	: CKeyChooser(modules, key, parent, name), m_key(dynamic_cast<CSwordLDKey*>(key)){
 
-	m_module = dynamic_cast<CSwordLexiconModuleInfo*>(info);
+  setModules(modules, false);
 	
-	//we use a layout because the key chooser should be resized to full size
+ //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(m_module->entries(), false, this);
-	m_widget->comboBox()->setMaximumWidth(300);
-	
-//  if (info && info->isUnicode()){
-#warning implement reaction to font change in the optionsdialog here
-//    /*m_widget->comboBox()->*/setFont( CBTConfig::get(CBTConfig::unicode) );
-//  }
+	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_widget->setToolTips(TT_PRESENTER_ENTRY_COMBO,TT_PRESENTER_NEXT_ENTRY, TT_PRESENTER_SCROLL_BUTTON, TT_PRESENTER_PREVIOUS_ENTRY);
-	m_widget->setWhatsThis(WT_PRESENTER_ENTRY_COMBO,WT_PRESENTER_NEXT_ENTRY, WT_PRESENTER_SCROLL_BUTTON, WT_PRESENTER_PREVIOUS_ENTRY);
-	
 	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)));
 
-//	setKey(key);
+  setModules(modules, true);
+	adjustFont();
 }
 
 CSwordKey* const CLexiconKeyChooser::key(){
@@ -63,39 +75,91 @@ CSwordKey* const CLexiconKeyChooser::key(){
 }
 
 void CLexiconKeyChooser::setKey(CSwordKey* key){	
-	if (!(m_key = dynamic_cast<CSwordLDKey*>(key)))
+ 	if (!(m_key = dynamic_cast<CSwordLDKey*>(key)))
 		return;		
-	m_widget->comboBox()->setCurrentItem(
-		m_widget->comboBox()->listBox()->index(
-			m_widget->comboBox()->listBox()->findItem( m_key->key() )));
-//	m_widget->adjustSize();
-	emit keyChanged( m_key );
+
+  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->key() != text) {
+
+  // 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(){
-//	m_layout->invalidate();	
-	m_widget->reset(m_module->entries(), 0, true);	
-//	updateGeometry();	
+  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::setModule( CSwordModuleInfo* module) {
-	if (module && module != m_module && module->type() == CSwordLexiconModuleInfo::Lexicon) {
-		m_module = dynamic_cast<CSwordLexiconModuleInfo*>(module);
-		refreshContent();
+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* key){
+void CLexiconKeyChooser::updateKey(CSwordKey*){
 }
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.h b/bibletime/frontend/keychooser/clexiconkeychooser.h
index 38ac22d..fc6aaa9 100644
--- a/bibletime/frontend/keychooser/clexiconkeychooser.h
+++ b/bibletime/frontend/keychooser/clexiconkeychooser.h
@@ -20,9 +20,9 @@
 
 #include <qwidget.h>
 #include "ckeychooser.h"
-#include "../../backend/cswordldkey.h"
-#include "../../backend/cswordmoduleinfo.h"
-#include "../../backend/cswordlexiconmoduleinfo.h"
+#include "backend/cswordldkey.h"
+#include "backend/cswordmoduleinfo.h"
+#include "backend/cswordlexiconmoduleinfo.h"
 
 class CKeyChooserWidget;
 class QHBoxLayout;
@@ -43,14 +43,14 @@ public:
 	*
 	*	you should not need to use this, use @ref CKeyChooser::createInstance instead
 	*/
-	CLexiconKeyChooser(CSwordModuleInfo *module=0, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
+	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();
+	virtual CSwordKey* const key();
 	/**
 	* see @ref CKeyChooser::setKey
 	*/
@@ -68,20 +68,19 @@ public slots:
   /**
   * Sets the module and refreshes the combo boxes of this keychooser.
   */
-  virtual void setModule( CSwordModuleInfo* module );
+  virtual void setModules( ListCSwordModuleInfo modules, const bool refresh = true );
 
 protected:	
 	class CLexiconPresenter;	
 	friend class CLexiconPresenter;	
-	/**
-	* to represent the lexicon key
-	*/
 	CKeyChooserWidget *m_widget;
 	CSwordLDKey* m_key;
-	CSwordLexiconModuleInfo	*m_module;	
+	QPtrList<CSwordLexiconModuleInfo> m_modules;
 	QHBoxLayout *m_layout;
+
+  virtual void adjustFont();
+
 public slots: // Public slots
-  /** No descriptions */
   virtual void updateKey(CSwordKey* key);
 };
 
diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp
new file mode 100644
index 0000000..62e3eb7
--- /dev/null
+++ b/bibletime/frontend/keychooser/crefselectdialog.cpp
@@ -0,0 +1,106 @@
+/*************************************************************************** 
+    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
new file mode 100644
index 0000000..cd93ea6
--- /dev/null
+++ b/bibletime/frontend/keychooser/crefselectdialog.h
@@ -0,0 +1,62 @@
+/*************************************************************************** 
+    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
index 36bd867..df3c076 100644
--- a/bibletime/frontend/kstartuplogo.cpp
+++ b/bibletime/frontend/kstartuplogo.cpp
@@ -19,14 +19,15 @@
 #include "kstartuplogo.h"
 
 //Qt includes
-#include <qapp.h>
+#include <qapplication.h>
 #include <qlabel.h>
 #include <qlayout.h>
+#include <qpixmap.h>
 
 //KDE includes
-#include <kapp.h>
-#include <kstddirs.h>
-#include <kimageio.h>
+#include <kapplication.h>
+#include <kstandarddirs.h>
+//#include <kimageio.h>
 
 //static objects
 static KStartupLogo* startupLogo = 0;
@@ -37,13 +38,15 @@ void KStartupLogo::createSplash() {
 }
 
 void KStartupLogo::showSplash() {
-	if (startupLogo)
+	if (startupLogo) {
 		startupLogo->show();
+  }
 }
 
 void KStartupLogo::hideSplash() {
-	if (startupLogo)	
+	if (startupLogo) {
 		startupLogo->hide();
+  }
 }
 
 void KStartupLogo::deleteSplash() {
@@ -53,25 +56,32 @@ void KStartupLogo::deleteSplash() {
 
 	
 void KStartupLogo::setStatusMessage(const QString& message) {
-	if (startupLogo)
+	if (startupLogo) {
 		startupLogo->setText(message);
+  }
 }
 
-
-
 KStartupLogo::KStartupLogo()
-	: QWidget(0, "startuplogo", WStyle_Customize | WStyle_NoBorder) {
+	: QWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) {
 
   QPixmap pm;	
-	if ( !pm.load(locate("BT_pic","startuplogo.png")) )
+	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());
-  textLabel->setBackgroundColor( Qt::black );
+  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 );
@@ -84,7 +94,8 @@ KStartupLogo::KStartupLogo()
     (KApplication::desktop()->width()-pm.width())/2,
 		(KApplication::desktop()->height()-pm.height()-textLabel->height())/2,
     pm.width(),
-    pm.height()+textLabel->height());
+    pm.height()+textLabel->height()
+  );
 }
 
 void KStartupLogo::setText(const QString text){
@@ -93,3 +104,18 @@ void KStartupLogo::setText(const QString 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
index e456b11..5123bf3 100644
--- a/bibletime/frontend/kstartuplogo.h
+++ b/bibletime/frontend/kstartuplogo.h
@@ -26,7 +26,7 @@ class QLabel;
 
 /**
 	* This class provides a startuplogo.
-  * @author The team of KDevelop
+  * @author The team of BibleTime
   */
 class KStartupLogo : public QWidget {
 public:
@@ -35,7 +35,11 @@ public:
 	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);
diff --git a/bibletime/frontend/mainindex/Makefile.am b/bibletime/frontend/mainindex/Makefile.am
new file mode 100644
index 0000000..e79b5b8
--- /dev/null
+++ b/bibletime/frontend/mainindex/Makefile.am
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000..1ae5e2d
--- /dev/null
+++ b/bibletime/frontend/mainindex/Makefile.in
@@ -0,0 +1,685 @@
+# 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
new file mode 100644
index 0000000..4977400
--- /dev/null
+++ b/bibletime/frontend/mainindex/cindexitem.cpp
@@ -0,0 +1,1253 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..c0fc642
--- /dev/null
+++ b/bibletime/frontend/mainindex/cindexitem.h
@@ -0,0 +1,379 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..fe7279a
--- /dev/null
+++ b/bibletime/frontend/mainindex/cmainindex.cpp
@@ -0,0 +1,634 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..7a337a7
--- /dev/null
+++ b/bibletime/frontend/mainindex/cmainindex.h
@@ -0,0 +1,212 @@
+/***************************************************************************
+                          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/presenters/Makefile.am b/bibletime/frontend/presenters/Makefile.am
deleted file mode 100644
index d8a1dec..0000000
--- a/bibletime/frontend/presenters/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-INCLUDES = $(all_includes)
-
-libpresenters_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libpresenters.a
-
-libpresenters_a_SOURCES = \
-cbiblepresenter.cpp \
-clexiconpresenter.cpp \
-ccommentarypresenter.cpp \
-cbookpresenter.cpp \
-cswordpresenter.cpp \
-cmodulechooserbar.cpp \
-cmodulechooserbutton.cpp \
-cdisplaysettingsbutton.cpp
-
-all_headers=ccommentarypresenter.h \
-clexiconpresenter.h \
-cbiblepresenter.h \
-cmodulechooserbar.h \
-cmodulechooserbutton.h \
-cbookpresenter.h \
-cswordpresenter.h \
-cdisplaysettingsbutton.h
-
-
-EXTRA_DIST = $(libpresenters_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/presenters/Makefile.in b/bibletime/frontend/presenters/Makefile.in
deleted file mode 100644
index 6547d5a..0000000
--- a/bibletime/frontend/presenters/Makefile.in
+++ /dev/null
@@ -1,652 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-INCLUDES = $(all_includes)
-
-#>- libpresenters_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libpresenters.a
-
-libpresenters_a_SOURCES =  cbiblepresenter.cpp clexiconpresenter.cpp ccommentarypresenter.cpp cbookpresenter.cpp cswordpresenter.cpp cmodulechooserbar.cpp cmodulechooserbutton.cpp cdisplaysettingsbutton.cpp
-
-
-all_headers = ccommentarypresenter.h clexiconpresenter.h cbiblepresenter.h cmodulechooserbar.h cmodulechooserbutton.h cbookpresenter.h cswordpresenter.h cdisplaysettingsbutton.h
-
-
-EXTRA_DIST = $(libpresenters_a_SOURCES) $(all_headers)
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libpresenters_a_LIBADD = 
-#>- libpresenters_a_OBJECTS =  cbiblepresenter.$(OBJEXT) \
-#>- clexiconpresenter.$(OBJEXT) ccommentarypresenter.$(OBJEXT) \
-#>- cbookpresenter.$(OBJEXT) cswordpresenter.$(OBJEXT) \
-#>- cmodulechooserbar.$(OBJEXT) cmodulechooserbutton.$(OBJEXT) \
-#>- cdisplaysettingsbutton.$(OBJEXT)
-#>+ 10
-libpresenters_a_final_OBJECTS = libpresenters_a.all_cpp.o 
-libpresenters_a_nofinal_OBJECTS = cbiblepresenter.$(OBJEXT) \
-clexiconpresenter.$(OBJEXT) ccommentarypresenter.$(OBJEXT) \
-cbookpresenter.$(OBJEXT) cswordpresenter.$(OBJEXT) \
-cmodulechooserbar.$(OBJEXT) cmodulechooserbutton.$(OBJEXT) \
-cdisplaysettingsbutton.$(OBJEXT)\
-cbookpresenter.moc.o cmodulechooserbar.moc.o ccommentarypresenter.moc.o cdisplaysettingsbutton.moc.o cmodulechooserbutton.moc.o cbiblepresenter.moc.o cswordpresenter.moc.o clexiconpresenter.moc.o  \
-libpresenters_a_meta_unload.o 
-@KDE_USE_FINAL_FALSE@libpresenters_a_OBJECTS = $(libpresenters_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libpresenters_a_OBJECTS = $(libpresenters_a_final_OBJECTS)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=cmodulechooserbutton.h cmodulechooserbar.h cbookpresenter.h ccommentarypresenter.h cswordpresenter.h cbiblepresenter.h cdisplaysettingsbutton.h clexiconpresenter.h 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/cbiblepresenter.P .deps/cbookpresenter.P \
-#>- .deps/ccommentarypresenter.P .deps/cdisplaysettingsbutton.P \
-#>- .deps/clexiconpresenter.P .deps/cmodulechooserbar.P \
-#>- .deps/cmodulechooserbutton.P .deps/cswordpresenter.P
-#>+ 10
-@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cbookpresenter.moc.P $(DEPDIR)/cmodulechooserbar.moc.P $(DEPDIR)/ccommentarypresenter.moc.P $(DEPDIR)/cdisplaysettingsbutton.moc.P $(DEPDIR)/cmodulechooserbutton.moc.P $(DEPDIR)/cbiblepresenter.moc.P $(DEPDIR)/cswordpresenter.moc.P $(DEPDIR)/clexiconpresenter.moc.P $(DEPDIR)/libpresenters_a_meta_unload.P  $(DEPDIR)/libpresenters_a.all_cpp.P \
-	  .deps/cbiblepresenter.P .deps/cbookpresenter.P \
-.deps/ccommentarypresenter.P .deps/cdisplaysettingsbutton.P \
-.deps/clexiconpresenter.P .deps/cmodulechooserbar.P \
-.deps/cmodulechooserbutton.P .deps/cswordpresenter.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cbookpresenter.moc.P $(DEPDIR)/cmodulechooserbar.moc.P $(DEPDIR)/ccommentarypresenter.moc.P $(DEPDIR)/cdisplaysettingsbutton.moc.P $(DEPDIR)/cmodulechooserbutton.moc.P $(DEPDIR)/cbiblepresenter.moc.P $(DEPDIR)/cswordpresenter.moc.P $(DEPDIR)/clexiconpresenter.moc.P $(DEPDIR)/libpresenters_a_meta_unload.P   .deps/cbiblepresenter.P .deps/cbookpresenter.P \
-.deps/ccommentarypresenter.P .deps/cdisplaysettingsbutton.P \
-.deps/clexiconpresenter.P .deps/cmodulechooserbar.P \
-.deps/cmodulechooserbutton.P .deps/cswordpresenter.P
-
-SOURCES = $(libpresenters_a_SOURCES)
-OBJECTS = $(libpresenters_a_OBJECTS)
-
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/presenters/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/presenters/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/presenters/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libpresenters.a: $(libpresenters_a_OBJECTS) $(libpresenters_a_DEPENDENCIES)
-	-rm -f libpresenters.a
-	$(AR) cru libpresenters.a $(libpresenters_a_OBJECTS) $(libpresenters_a_LIBADD)
-	$(RANLIB) libpresenters.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/frontend/presenters
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/frontend/presenters/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-#>- clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-moc-classes clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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
-cbookpresenter.moc.cpp: $(srcdir)/cbookpresenter.h
-	$(MOC) $(srcdir)/cbookpresenter.h -o cbookpresenter.moc.cpp
-
-#>+ 3
-cmodulechooserbar.moc.cpp: $(srcdir)/cmodulechooserbar.h
-	$(MOC) $(srcdir)/cmodulechooserbar.h -o cmodulechooserbar.moc.cpp
-
-#>+ 3
-ccommentarypresenter.moc.cpp: $(srcdir)/ccommentarypresenter.h
-	$(MOC) $(srcdir)/ccommentarypresenter.h -o ccommentarypresenter.moc.cpp
-
-#>+ 3
-cdisplaysettingsbutton.moc.cpp: $(srcdir)/cdisplaysettingsbutton.h
-	$(MOC) $(srcdir)/cdisplaysettingsbutton.h -o cdisplaysettingsbutton.moc.cpp
-
-#>+ 3
-cmodulechooserbutton.moc.cpp: $(srcdir)/cmodulechooserbutton.h
-	$(MOC) $(srcdir)/cmodulechooserbutton.h -o cmodulechooserbutton.moc.cpp
-
-#>+ 3
-cbiblepresenter.moc.cpp: $(srcdir)/cbiblepresenter.h
-	$(MOC) $(srcdir)/cbiblepresenter.h -o cbiblepresenter.moc.cpp
-
-#>+ 3
-cswordpresenter.moc.cpp: $(srcdir)/cswordpresenter.h
-	$(MOC) $(srcdir)/cswordpresenter.h -o cswordpresenter.moc.cpp
-
-#>+ 3
-clexiconpresenter.moc.cpp: $(srcdir)/clexiconpresenter.h
-	$(MOC) $(srcdir)/clexiconpresenter.h -o clexiconpresenter.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  cbookpresenter.moc.cpp cmodulechooserbar.moc.cpp ccommentarypresenter.moc.cpp cdisplaysettingsbutton.moc.cpp cmodulechooserbutton.moc.cpp cbiblepresenter.moc.cpp cswordpresenter.moc.cpp clexiconpresenter.moc.cpp
-
-#>+ 2
-docs-am:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/presenters/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/presenters/Makefile.in
-
-
-#>+ 10
-libpresenters_a_meta_unload.cpp:  ccommentarypresenter.moc.cpp cmodulechooserbar.moc.cpp cmodulechooserbutton.moc.cpp cswordpresenter.moc.cpp cbookpresenter.moc.cpp cdisplaysettingsbutton.moc.cpp cbiblepresenter.moc.cpp clexiconpresenter.moc.cpp
-	@echo 'creating libpresenters_a_meta_unload.cpp'
-	@-rm -f libpresenters_a_meta_unload.cpp
-	@echo 'static const char * _metalist_libpresenters_a[] = {' > libpresenters_a_meta_unload.cpp
-	@cat  ccommentarypresenter.moc.cpp cmodulechooserbar.moc.cpp cmodulechooserbutton.moc.cpp cswordpresenter.moc.cpp cbookpresenter.moc.cpp cdisplaysettingsbutton.moc.cpp cbiblepresenter.moc.cpp clexiconpresenter.moc.cpp | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libpresenters_a_meta_unload.cpp
-	@echo '0};' >> libpresenters_a_meta_unload.cpp
-	@echo '#include <kunload.h>' >> libpresenters_a_meta_unload.cpp
-	@echo '_UNLOAD(libpresenters_a)' >> libpresenters_a_meta_unload.cpp
-
-
-#>+ 3
-clean-moc-classes:
-	-rm -f  libpresenters_a_meta_unload.cpp
-
-#>+ 11
-libpresenters_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cbiblepresenter.cpp $(srcdir)/clexiconpresenter.cpp $(srcdir)/ccommentarypresenter.cpp $(srcdir)/cbookpresenter.cpp $(srcdir)/cswordpresenter.cpp $(srcdir)/cmodulechooserbar.cpp $(srcdir)/cmodulechooserbutton.cpp $(srcdir)/cdisplaysettingsbutton.cpp libpresenters_a_meta_unload.cpp  cbookpresenter.moc.cpp cmodulechooserbar.moc.cpp ccommentarypresenter.moc.cpp cdisplaysettingsbutton.moc.cpp cmodulechooserbutton.moc.cpp cbiblepresenter.moc.cpp cswordpresenter.moc.cpp clexiconpresenter.moc.cpp
-	@echo 'creating libpresenters_a.all_cpp.cpp ...'; \
-	rm -f libpresenters_a.all_cpp.files libpresenters_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libpresenters_a.all_cpp.final; \
-	for file in cbiblepresenter.cpp clexiconpresenter.cpp ccommentarypresenter.cpp cbookpresenter.cpp cswordpresenter.cpp cmodulechooserbar.cpp cmodulechooserbutton.cpp cdisplaysettingsbutton.cpp libpresenters_a_meta_unload.cpp  cbookpresenter.moc.cpp cmodulechooserbar.moc.cpp ccommentarypresenter.moc.cpp cdisplaysettingsbutton.moc.cpp cmodulechooserbutton.moc.cpp cbiblepresenter.moc.cpp cswordpresenter.moc.cpp clexiconpresenter.moc.cpp; do \
-	  echo "#include \"$$file\"" >> libpresenters_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libpresenters_a.all_cpp.final; \
-	done; \
-	cat libpresenters_a.all_cpp.final libpresenters_a.all_cpp.files  > libpresenters_a.all_cpp.cpp; \
-	rm -f libpresenters_a.all_cpp.final libpresenters_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libpresenters_a.all_cpp.cpp
-
-#>+ 2
-final:
-	$(MAKE) libpresenters_a_OBJECTS="$(libpresenters_a_final_OBJECTS)" all-am
-#>+ 2
-no-final:
-	$(MAKE) libpresenters_a_OBJECTS="$(libpresenters_a_nofinal_OBJECTS)" all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/frontend/presenters/cbiblepresenter.cpp b/bibletime/frontend/presenters/cbiblepresenter.cpp
deleted file mode 100644
index 07c36f8..0000000
--- a/bibletime/frontend/presenters/cbiblepresenter.cpp
+++ /dev/null
@@ -1,431 +0,0 @@
-/***************************************************************************
-                          cbiblepresenter.cpp  -  description
-                             -------------------
-    begin                : Sun Mar 18 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 "cbiblepresenter.h"
-#include "cmodulechooserbar.h"
-#include "cdisplaysettingsbutton.h"
-
-#include "../ctoolclass.h"
-#include "../cexportmanager.h"
-#include "../chtmlwidget.h"
-#include "../keychooser/ckeychooser.h"
-#include "../../resource.h"
-#include "../../backend/cswordbiblemoduleinfo.h"
-#include "../../backend/cswordversekey.h"
-#include "../../backend/chtmlchapterdisplay.h"
-#include "../../backend/cswordbackend.h"
-#include "../../backend/creferencemanager.h"
-#include "../cprofile.h"
-#include "../cprofilewindow.h"
-
-#include <math.h>
-
-//Qt includes
-#include <qclipboard.h>
-#include <qlist.h>
-
-//KDE includes
-#include <kapp.h>
-#include <ktoolbar.h>
-#include <klocale.h>
-#include <kfiledialog.h>
-#include <kaccel.h>
-
-CBiblePresenter::CBiblePresenter(ListCSwordModuleInfo useModules, QWidget *parent, const char *name )
-	: CSwordPresenter(useModules,parent,name)
-{		
-	m_key = new CSwordVerseKey(m_moduleList.first());
-	CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(m_moduleList.first());
-	if (bible) {
-		if (bible->hasTestament(CSwordBibleModuleInfo::OldTestament))
-			m_key->key("Genesis 1:1");
-		else
-			m_key->key("Matthew 1:1");
-	}
-	
-	initView();
-	show();	
-	initConnections();
-	
-	setInitialized();
-}
-
-CBiblePresenter::~CBiblePresenter(){
-	delete m_key;
-}
-
-/** Initializes the view (central widget, toolbars etc) of this presenter */
-void CBiblePresenter::initView(){
-//	qWarning("CBiblePresenter::initView");	
-	m_mainToolBar = new KToolBar(this);
-	m_keyChooser = CKeyChooser::createInstance(m_moduleList.first(), m_key, m_mainToolBar);
-	m_mainToolBar->insertWidget(0,m_keyChooser->sizeHint().width(),m_keyChooser);	
-	m_mainToolBar->setItemAutoSized(0);
-
-	m_displaySettingsButton = new CDisplaySettingsButton( &m_displayOptions, &m_moduleOptions, m_moduleList, m_mainToolBar);
-	m_mainToolBar->insertWidget(1,m_displaySettingsButton->sizeHint().width(),m_displaySettingsButton);
-
-	addToolBar(m_mainToolBar);			
-		
-	m_moduleChooserBar = new CModuleChooserBar(m_moduleList, CSwordModuleInfo::Bible, this );
-	addToolBar(m_moduleChooserBar);
-	
-	m_htmlWidget = new CHTMLWidget(true, this);
-		
-	//setup popup menu
-	m_popup = new KPopupMenu(this);
-	m_popup->insertTitle(i18n("Bible window"));
-	
-	m_copyPopup = new KPopupMenu(m_popup);
-	m_copyPopup->insertItem(i18n("Verse"), this, SLOT(copyVerse()),0,ID_PRESENTER_COPY_ONLY_KEY);
-	m_copyPopup->insertItem(i18n("Text of verse"), this, SLOT(copyVerseText()),0,ID_PRESENTER_COPY_KEY_TEXT);	
-	m_copyPopup->insertItem(i18n("Verse with text"), this, SLOT(copyVerseAndText()),0,ID_PRESENTER_COPY_KEY);
-	m_copyPopup->insertItem(i18n("Chapter"), m_htmlWidget, SLOT(copyDocument()),0,ID_PRESENTER_COPY_CHAPTER);
-	m_copyPopup->insertSeparator();
-	m_copyPopup->insertItem(i18n("Selected text"), m_htmlWidget, SLOT(copy()),0,ID_PRESENTER_COPY_SELECTED);
-
-	m_printPopup = new KPopupMenu(m_popup);
-	m_printPopup->insertItem(i18n("Verse with text"), this, SLOT(printVerseAndText()),0,ID_PRESENTER_PRINT_KEY);
-	m_printPopup->insertItem(i18n("Chapter"), this, SLOT(printChapter()),0,ID_PRESENTER_PRINT_CHAPTER);
-
-	m_savePopup = new KPopupMenu(m_popup);	
-	m_savePopup->insertItem(i18n("Verse with text"), this, SLOT(saveVerseAndText()),0,ID_PRESENTER_SAVE_KEY);
-	m_savePopup->insertItem(i18n("Chapter as plain text"), m_htmlWidget, SLOT(slotSaveAsText()),0,ID_PRESENTER_SAVE_CHAPTER);
-	m_savePopup->insertItem(i18n("Chapter as HTML"), m_htmlWidget, SLOT(slotSaveAsHTML()),0,ID_PRESENTER_SAVE_CHAPTER_HTML);	
-
-	m_popup->insertItem(i18n("Select all"), m_htmlWidget, SLOT(slotSelectAll()),0, ID_PRESENTER_SELECT_ALL);
-  m_popup->insertItem(i18n("Lookup selected text in lexicon"), m_lexiconPopup, ID_PRESENTER_LOOKUP);	
-	m_popup->insertSeparator();	
-	m_popup->insertItem(SmallIcon(ICON_EDIT_COPY),i18n("Copy..."), 	m_copyPopup, ID_PRESENTER_COPY_POPUP);	
-	m_popup->insertItem(SmallIcon(ICON_FILE_PRINT), i18n("Add to printing queue..."), m_printPopup, ID_PRESENTER_PRINT_POPUP);	
-	m_popup->insertItem(SmallIcon(ICON_FILE_SAVE), i18n("Save..."), 	m_savePopup,ID_PRESENTER_SAVE_POPUP);		
-
-	m_htmlWidget->installPopup(m_popup);			
-	m_htmlWidget->installAnchorMenu( m_popup );
-	m_htmlWidget->setModules(m_moduleList);
-		
-	setCentralWidget(m_htmlWidget);	
-	setIcon( BIBLE_ICON_SMALL );	
-}
-
-/** Displays the chapter using the aparameter. */
-void CBiblePresenter::lookup(CSwordKey* key){
-//	qWarning("CBiblePresenter::lookup(CSwordKey* key)");
-	setUpdatesEnabled(false);	
-	
-	CSwordVerseKey* vKey = dynamic_cast<CSwordVerseKey*>(key);	
-	if (!vKey)
-		return;
-
-	backend()->setFilterOptions( m_moduleOptions );
-	backend()->setDisplayOptions( m_displayOptions );
-		
-	if (m_moduleList.first()->getDisplay()) {	//do we have a display object?
-	  m_moduleList.first()->module()->SetKey(*vKey);
-		if (m_moduleList.count()>1)
-			m_moduleList.first()->getDisplay()->Display( &m_moduleList );
-		else
-			m_moduleList.first()->getDisplay()->Display( m_moduleList.first() );
- 		m_htmlWidget->setText( m_moduleList.first()->getDisplay()->getHTML() );
-	}
-	if (m_key != vKey)
-		m_key->key(vKey->key());
-		
-	m_htmlWidget->scrollToAnchor( QString::number(vKey->Verse()) );
-	setUpdatesEnabled(true);		
-	setCaption(windowCaption());	
-}
-
-/** This slot is called when the modules selected in the module chooserbar have changed. */
-void CBiblePresenter::modulesChanged(){
-  m_moduleList = m_moduleChooserBar->getModuleList();
-  if (!m_moduleList.count()) {
-  	close();
-  }
-  else {
-		m_displaySettingsButton->reset(m_moduleList);
-//    refreshFeatures()
-	  m_key->module(m_moduleList.first());
-	  m_keyChooser->setModule(m_moduleList.first());	
-		m_htmlWidget->setModules(m_moduleList);
-	  	
-	  lookup(m_key);
-	}
-}
-/**  */
-void CBiblePresenter::optionsChanged(){
-	lookup(m_key);
-}
-
-
-/** Initializes the Signal / Slot connections */
-void CBiblePresenter::initConnections(){
-	connect(m_htmlWidget, SIGNAL(referenceClicked(const QString&, const QString&)),
-		this, SLOT(lookup(const QString&, const QString&))); 	
-	connect(m_htmlWidget, SIGNAL(referenceDropped(const QString&)),
-		this, SLOT(referenceDropped(const QString&)));
-
- 	connect(m_keyChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		this, SLOT(lookup(CSwordKey*)));
-	connect(m_popup, SIGNAL(aboutToShow()),
-		SLOT(popupAboutToShow()));
-	connect(m_moduleChooserBar, SIGNAL( sigChanged() ),
-		SLOT(modulesChanged() ));
-	connect(m_displaySettingsButton, SIGNAL( sigChanged() ),	
-		SLOT(optionsChanged() ));
-}
-
-/** No descriptions */
-void CBiblePresenter::popupAboutToShow() {
-	m_popup->setItemEnabled(ID_PRESENTER_LOOKUP, !m_htmlWidget->selectedText().isEmpty());
-
-	m_copyPopup->setItemEnabled(ID_PRESENTER_COPY_ONLY_KEY,!m_htmlWidget->getCurrentAnchor().isEmpty());	
-	m_copyPopup->setItemEnabled(ID_PRESENTER_COPY_KEY_TEXT,!m_htmlWidget->getCurrentAnchor().isEmpty());	
-	m_copyPopup->setItemEnabled(ID_PRESENTER_COPY_KEY,!m_htmlWidget->getCurrentAnchor().isEmpty());			
-	m_copyPopup->setItemEnabled(ID_PRESENTER_COPY_SELECTED, !m_htmlWidget->selectedText().isEmpty());
-	
-	m_printPopup->setItemEnabled(ID_PRESENTER_PRINT_KEY,!m_htmlWidget->getCurrentAnchor().isEmpty());			
-
-	m_savePopup->setItemEnabled(ID_PRESENTER_SAVE_KEY,!m_htmlWidget->getCurrentAnchor().isEmpty());
-}
-
-/** Reimplementation from CSwordPresenter. */
-void CBiblePresenter::lookup(const QString& module, const QString& key){
-	CSwordModuleInfo* m = backend()->findModuleByName(module);
-	if (m && m_moduleList.containsRef(m)) {
-		if (!key.isEmpty())
-			m_key->key(key);
-		m_keyChooser->setKey(m_key); //the key chooser does send an update signal	
-	}
-	else {
-		emit lookupInModule(module, key);
-	}
-}
-
-/** Reimplementation. Refreshes the things which are described by the event integer. */
-void CBiblePresenter::refresh( ){
-
-	CSwordPresenter::refresh();	//refreshes the display settings button
-
-	m_key->setLocale((const char*)backend()->booknameLanguage().local8Bit());
-	m_keyChooser->refreshContent();
-	lookup(m_key);
-	m_htmlWidget->refresh();		
-}
-
-
-/** Copies the highlighted text into clipboard. */
-void CBiblePresenter::copyVerse(){
-	QString key = QString::null;
-	QString module = QString::null;
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	CReferenceManager::Type type;	
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);	
-	CSwordModuleInfo* m = backend()->findModuleByName(module);		
-	
-	CSwordVerseKey vKey(m);
-	vKey.key(key);
-		
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(vKey.key());
-}
-
-/** Copies the highlighted text into clipboard. */
-void CBiblePresenter::copyVerseText(){
-	QString key = QString::null;
-	QString module = QString::null;
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	CReferenceManager::Type type;
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);	
-	CSwordModuleInfo* m = backend()->findModuleByName(module);		
-	
-	CSwordVerseKey vKey(m);
-	vKey.key(key);	
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(vKey.strippedText());
-}
-
-/** Copies the highlighted text into clipboard. */
-void CBiblePresenter::copyVerseAndText(){
-	QString key = QString::null;
-	QString module = QString::null;
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	CReferenceManager::Type type;	
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);	
-	CSwordModuleInfo* m = backend()->findModuleByName(module);		
-	CSwordVerseKey vKey(m);
-	vKey.key(key);
-	
-	const QString text = QString("%1\n%2").arg(vKey.key()).arg(vKey.strippedText());
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(text);
-}
-
-//print functions
-/** Copies the highlighted text into clipboard. */
-void CBiblePresenter::printVerseAndText(){
-	QString key = QString::null;
-	QString module = QString::null;
-	const QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	CReferenceManager::Type type;	
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);	
-	CSwordModuleInfo* m = backend()->findModuleByName(module);		
-	
-	CSwordVerseKey vKey(m);	
-	vKey.key(key);
-
-	CExportManager::printKey(m, vKey.key());
-}
-
-/** Copies the highlighted text into clipboard. */
-void CBiblePresenter::printChapter(){
-	CSwordVerseKey startKey(*m_key);
-	startKey.Verse(1);
-	
-	CSwordVerseKey stopKey(*m_key);	
-
-	CSwordBibleModuleInfo* b = dynamic_cast<CSwordBibleModuleInfo*>(m_moduleList.first());
-	if (b)
-		stopKey.Verse( b->verseCount( b->bookNumber(startKey.book()), startKey.Chapter() ) );
-	CExportManager::printKey(m_moduleList.first(), startKey.key(), stopKey.key());
-}
-
-//save functions
-
-/** Copies the highlighted text into clipboard. */
-void CBiblePresenter::saveVerseAndText(){
-	QString key = QString::null;
-	QString module = QString::null;
-	CReferenceManager::Type type;		
-	const QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);
-	CSwordVerseKey vKey( backend()->findModuleByName(module) );
-	vKey.key(key);
-	
-	CExportManager::saveKey(&vKey, true);
-}
-
-/** Inserts the actions used by this window class into the given KAccel object. */
-void CBiblePresenter::insertKeyboardActions(KAccel* a){
-	a->setConfigGroup("Bible window");
-	a->insertItem(i18n("Next book"), "Next book", 0);
-	a->insertItem(i18n("Previous book"), "Previous book", 0);	
-	
-	a->insertItem(i18n("Next chapter"), "Next chapter", 0);
-	a->insertItem(i18n("Previous chapter"), "Previous chapter", 0);	
-
-	a->insertItem(i18n("Next verse"), "Next verse", 0);
-	a->insertItem(i18n("Previous verse"), "Previous verse", 0);	
-}
-
-/** Initializes the accelerator object. */
-void CBiblePresenter::initAccels(){
-	ASSERT(m_accel);
-	m_accel->setConfigGroup("Bible window");
-	
-	m_accel->insertItem(i18n("Next book"), "Next book", 0);
-	m_accel->connectItem("Next book", this, SLOT(nextBook()));	
-	m_accel->insertItem(i18n("Previous book"), "Previous book", 0);	
-	m_accel->connectItem("Previous book", this, SLOT(previousBook()));
-		
-	m_accel->insertItem(i18n("Next chapter"), "Next chapter", 0);
-	m_accel->connectItem("Next chapter", this, SLOT(nextChapter()));		
-	m_accel->insertItem(i18n("Previous chapter"), "Previous chapter", 0);	
-	m_accel->connectItem("Previous chapter", this, SLOT(previousChapter()));	
-
-	m_accel->insertItem(i18n("Next verse"), "Next verse", 0);
-	m_accel->connectItem("Next verse", this, SLOT(nextVerse()));		
-	m_accel->insertItem(i18n("Previous verse"), "Previous verse", 0);	
-	m_accel->connectItem("Previous verse", this, SLOT(previousVerse()));	
-	
-	m_accel->readSettings();
-	CSwordPresenter::initAccels();	
-}
-
-/** Jumps to the next entry */
-void CBiblePresenter::nextBook(){
-	if (m_key->next(CSwordVerseKey::UseBook))
-		m_keyChooser->setKey(m_key);	
-}
-
-/** Jumps to the previous entry. */
-void CBiblePresenter::previousBook(){
-	if (m_key->previous(CSwordVerseKey::UseBook))
-		m_keyChooser->setKey(m_key);
-}
-
-
-/** Jumps to the next entry */
-void CBiblePresenter::nextChapter(){
-	if (m_key->next(CSwordVerseKey::UseChapter))
-		m_keyChooser->setKey(m_key);	
-}
-
-/** Jumps to the previous entry. */
-void CBiblePresenter::previousChapter(){
-	if (m_key->previous(CSwordVerseKey::UseChapter))
-		m_keyChooser->setKey(m_key);
-}
-
-/** Jumps to the next entry */
-void CBiblePresenter::nextVerse(){
-//	qWarning("CBiblePresenter::nextVerse()");
-	if (	m_key->next(CSwordVerseKey::UseVerse) )	
-		m_keyChooser->setKey(m_key);	
-}
-
-/** Jumps to the previous entry. */
-void CBiblePresenter::previousVerse(){
-	if (m_key->previous(CSwordVerseKey::UseVerse))
-		m_keyChooser->setKey(m_key);
-}
-
-/** Stores some Bible window dpecific setttings in the profile. */
-void CBiblePresenter::storeSettings( CProfileWindow* settings ){
-	CSwordPresenter::storeSettings(settings);
-	/**
-	* store the state of the displaysetttings button in the profile
-	* we use a binary digit to store the state. The most right digit is 1 if the
-	* first button is set, 0 if it isn't. The second digit is for the second entry in the menu.
-	* etc
-	*/
-	const int count = m_displaySettingsButton->menuItemCount();
-	int result = 0;
-	//now check	every item
-	for (int i = 1; i<count; i++) { //first item is a title
-		if (m_displaySettingsButton->itemStatus(i)) //item is checked
-			result += (int)pow(2,i-1);//add 2^i (the i. digit in binary)
-	}
-	settings->setWindowSettings(result);
-}
-
-/** Applies some Bible window specific setttings. */
-void CBiblePresenter::applySettings( CProfileWindow* settings ){
-	CSwordPresenter::applySettings(settings);
-  int result = settings->windowSettings();
-	const int count = m_displaySettingsButton->menuItemCount();
-	for (int i = count-1; i>=1; i--) {
-		if (result-(int)pow(2,i-1)>= 0) { //2^i was added before, so item with index i is set
-			result -= (int)pow(2,i-1);
-			m_displaySettingsButton->setItemStatus(i,true);
-		}
-		else
-			m_displaySettingsButton->setItemStatus(i,false);			
-	}		
-	m_displaySettingsButton->setChanged();
-}
diff --git a/bibletime/frontend/presenters/cbiblepresenter.h b/bibletime/frontend/presenters/cbiblepresenter.h
deleted file mode 100644
index 095ca75..0000000
--- a/bibletime/frontend/presenters/cbiblepresenter.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************
-                          cbiblepresenter.h  -  description
-                             -------------------
-    begin                : Sun Mar 18 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 CBIBLEPRESENTER_H
-#define CBIBLEPRESENTER_H
-
-#include <qwidget.h>
-#include "cswordpresenter.h"
-
-class CSwordVerseKey;
-
-/**
-	* The presenter used for Sword Bibles.
-  * @author The BibleTime team
-  */
-class CBiblePresenter : public CSwordPresenter  {
-   Q_OBJECT
-public: 	
-	CBiblePresenter(ListCSwordModuleInfo useModules, QWidget *parent=0, const char *name=0);
-	~CBiblePresenter();
-  /**
-  * Reimplementation from CSwordPresenter.
-  */
-  virtual void lookup(const QString&, const QString&);
-  /**
-  * Reimplementation.
-	*/
-  virtual void refresh( );
-  /**
-  * Inserts the actions used by this window class into the given KAccel object.
-  */
-  static void insertKeyboardActions(KAccel* a);
-  /**
-  * Applies some Bible window specific setttings.
-  */
-  virtual void applySettings( CProfileWindow* window );
-  /**
-  * Stores some Bible window dpecific setttings in the profile.
-  */
-  virtual void storeSettings( CProfileWindow* setttings );
-
-protected:
-  /**
-  * Initializes the view (central widget, toolbars etc) of this presenter
-  */
-  virtual void initView();
-  /**
-  * Initializes the Signal / Slot connections
-	*/
-  void initConnections();
-  /**
-  * Initializes the accelerator object.
-  */
-	virtual void initAccels();
-
-protected slots:
-  void modulesChanged();
-	void optionsChanged();
-  void lookup( CSwordKey* );
-	void nextBook();
-	void previousBook();
-	void nextChapter();		
-	void previousChapter();
-	void nextVerse();
-	void previousVerse();
-		
-private slots:
-  void popupAboutToShow();
-  void copyVerse();
-  void copyVerseText();
-  void copyVerseAndText();
-  void printVerseAndText();
-  void printChapter();
-  void saveVerseAndText();
-
-private:
-	CSwordVerseKey* m_key;
-};
-
-#endif
diff --git a/bibletime/frontend/presenters/cbookpresenter.cpp b/bibletime/frontend/presenters/cbookpresenter.cpp
deleted file mode 100644
index f811248..0000000
--- a/bibletime/frontend/presenters/cbookpresenter.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/***************************************************************************
-                          cbookpresenter.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 "cbookpresenter.h"
-#include "../keychooser/ckeychooser.h"
-#include "../keychooser/cbooktreechooser.h"
-#include "cmodulechooserbar.h"
-#include "../ctoolclass.h"
-#include "../chtmlwidget.h"
-#include "../cexportmanager.h"
-#include "../../backend/cswordtreekey.h"
-#include "../../backend/chtmlentrydisplay.h"
-#include "../../backend/cswordbackend.h"
-
-#include "cdisplaysettingsbutton.h"
-#include "../../resource.h"
-#include "../../tooltipdef.h"
-#include "../../whatsthisdef.h"
-
-//Qt includes
-#include <qsplitter.h>
-
-//KDE includes
-#include <kaccel.h>
-#include <klocale.h>
-#include <kaction.h>
-
-CBookPresenter::CBookPresenter(ListCSwordModuleInfo useModules, QWidget *parent, const char *name )
-	: CSwordPresenter(useModules,parent,name)
-{
-	m_key = dynamic_cast<CSwordTreeKey*>( CSwordKey::createInstance(useModules.first()) );
-	m_key->root();
-	
-	initView();
-	show();
-	initConnections();
-	
-	setInitialized();
-}
-
-CBookPresenter::~CBookPresenter(){
-	delete m_key;
-	m_key = 0;
-}
-
-/** Initializes the interface of this presenter. */
-void CBookPresenter::initView(){
-	m_mainToolBar = new KToolBar(this);
-	m_keyChooser = CKeyChooser::createInstance(m_moduleList.first(), m_key, m_mainToolBar);	
-	m_mainToolBar->insertWidget(0,m_keyChooser->sizeHint().width(),m_keyChooser);	
-	
-	m_treeAction =  new KToggleAction(i18n("Toggle tree..."), ICON_VIEW_BOOKTREE,
-															IDK_PRESENTER_TOGGLE_TREE, this,	SLOT(treeToggled()), actionCollection(), "treeToggle_action");
-//	m_treeAction->setWhatsThis( WT_PRESENTER_SYNC );
-	m_treeAction->plug(m_mainToolBar);
-
-	addToolBar(m_mainToolBar);			
-	
-	m_moduleChooserBar = new CModuleChooserBar(m_moduleList, CSwordModuleInfo::GenericBook, this );
-	m_moduleChooserBar->setButtonLimit(1);
-	addToolBar(m_moduleChooserBar);
-	
-
-	QSplitter* splitter = new QSplitter(this);	
-	m_treeChooser = new CBookTreeChooser(m_moduleList.first(), m_key, splitter);
-	m_treeAction->setChecked(false);
-	m_treeChooser->hide();
-	
-	splitter->setResizeMode(m_treeChooser, QSplitter::FollowSizeHint);
-	
-	m_htmlWidget = new CHTMLWidget(true, splitter);		
-		
-	m_popup = new KPopupMenu(this);
-	m_popup->insertTitle(i18n("Book window"));
-
-	m_copyPopup = new KPopupMenu(m_popup);
-//	m_copyPopup->insertItem(i18n("Verse"), this, SLOT(copyVerse()),0,ID_PRESENTER_COPY_ONLY_KEY);
-//	m_copyPopup->insertItem(i18n("Text of verse"), this, SLOT(copyVerseText()),0,ID_PRESENTER_COPY_KEY_TEXT);	
-//	m_copyPopup->insertItem(i18n("Verse with text"), this, SLOT(copyVerseAndText()),0,ID_PRESENTER_COPY_KEY);
-//	m_copyPopup->insertItem(i18n("Chapter"), m_htmlWidget, SLOT(copyDocument()),0,ID_PRESENTER_COPY_CHAPTER);
-//	m_copyPopup->insertSeparator();
-	m_copyPopup->insertItem(i18n("Selected text"), m_htmlWidget, SLOT(copy()),0,ID_PRESENTER_COPY_SELECTED);
-
-	m_printPopup = new KPopupMenu(m_popup);
-	m_printPopup->insertItem(i18n("Entry"), this, SLOT(printEntry()),0,ID_PRESENTER_PRINT_KEY);
-
-	m_savePopup = new KPopupMenu(m_popup);	
-//	m_savePopup->insertItem(i18n("Verse with text"), this, SLOT(saveVerseAndText()),0,ID_PRESENTER_SAVE_KEY);
-//	m_savePopup->insertItem(i18n("Chapter as plain text"), m_htmlWidget, SLOT(slotSaveAsText()),0,ID_PRESENTER_SAVE_CHAPTER);
-	m_savePopup->insertItem(i18n("Entry as HTML"), m_htmlWidget, SLOT(slotSaveAsHTML()),0,ID_PRESENTER_SAVE_CHAPTER_HTML);	
-
-	m_popup->insertItem(i18n("Select all"), m_htmlWidget, SLOT(slotSelectAll()),0, ID_PRESENTER_SELECT_ALL);
-  m_popup->insertItem(i18n("Lookup selected text in lexicon"), m_lexiconPopup, ID_PRESENTER_LOOKUP);	
-	m_popup->insertSeparator();	
-	m_popup->insertItem(SmallIcon(ICON_EDIT_COPY),i18n("Copy..."), 	m_copyPopup, ID_PRESENTER_COPY_POPUP);	
-	m_popup->insertItem(SmallIcon(ICON_FILE_PRINT), i18n("Add to printing queue..."), m_printPopup, ID_PRESENTER_PRINT_POPUP);	
-	m_popup->insertItem(SmallIcon(ICON_FILE_SAVE), i18n("Save..."), 	m_savePopup,ID_PRESENTER_SAVE_POPUP);		
-
-	m_htmlWidget->installPopup(m_popup);			
-	m_htmlWidget->installAnchorMenu(m_popup);
-	m_htmlWidget->setModules(m_moduleList);
-		
-
-	setCentralWidget(splitter);
-}
-
-/** Initializes the Signal / Slot connections */
-void CBookPresenter::initConnections(){
-	connect(m_htmlWidget, SIGNAL(referenceClicked(const QString&, const QString&)),
-		this, SLOT(lookup(const QString&, const QString&))); 	
-	connect(m_htmlWidget, SIGNAL(referenceDropped(const QString&)),
-		this, SLOT(referenceDropped(const QString&)));
-
- 	connect(m_keyChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		this, SLOT(lookup(CSwordKey*)));
- 	connect(m_keyChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		m_treeChooser, SLOT(updateKey(CSwordKey*)));
- 	
- 	connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		this, SLOT(lookup(CSwordKey*)));
- 	connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		m_keyChooser, SLOT(updateKey(CSwordKey*)));
-		
-//	connect(m_popup, SIGNAL(aboutToShow()),
-//		SLOT(popupAboutToShow()));
-	connect(m_moduleChooserBar, SIGNAL( sigChanged() ),
-		SLOT(modulesChanged() ));
-//	connect(m_displaySettingsButton, SIGNAL( sigChanged() ),	
-//		SLOT(optionsChanged() ));
-}
-
-void CBookPresenter::modulesChanged(){
-  m_moduleList = m_moduleChooserBar->getModuleList();
-  if (!m_moduleList.count())
-  	close();
-  else {
-	  m_key->module(m_moduleList.first());
-	  m_keyChooser->setModule(m_moduleList.first());	
-	  m_treeChooser->setModule(m_moduleList.first());		
-		m_htmlWidget->setModules(m_moduleList);
-	  	
-	  lookup(m_key);
-	}
-}
-
-void CBookPresenter::lookup(CSwordKey* key) {
-	setUpdatesEnabled(false);	
-	CSwordTreeKey* treeKey = dynamic_cast<CSwordTreeKey*>(key);	
-	CSwordModuleInfo* m = m_moduleList.first();
-	m->module()->SetKey(treeKey);
-	
-		
-	if (m->getDisplay()) {
-		m->getDisplay()->Display( m );
-		m_htmlWidget->setText(m->getDisplay()->getHTML());
-	}	
-	if (m_key != treeKey) {
-		m_key->key(treeKey->key());
-	}
-	setUpdatesEnabled(true);
-	setCaption( windowCaption() );
-	
-	m_htmlWidget->scrollToAnchor( QString::fromLocal8Bit(treeKey->getLocalName()) );	
-}
-
-/** No descriptions */
-void CBookPresenter::lookup( const QString& module, const QString& key){
-	CSwordModuleInfo* m = backend()->findModuleByName(module);
-	if (m && m_moduleList.containsRef(m)) {
-		if (!key.isEmpty())
-			m_key->key(key);
-		else
-			m_key->root();
-		m_keyChooser->setKey(m_key); //the key chooser does send an update signal	
-	}
-	else
-		emit lookupInModule(module, key);	
-}
-
-/** Initializes keyboard accelerators. */
-void CBookPresenter::initAccels(){
-	CSwordPresenter::initAccels();
-	m_accel->setConfigGroup("Book window");	
-	m_accel->insertItem(i18n("Toggle tree"), "Toggle tree", 0);
-	m_accel->connectItem("Toggle tree", this, SLOT(treeToggled()));
-		
-	m_accel->readSettings();
-}
-
-void CBookPresenter::insertKeyboardActions(KAccel* a){
-	a->setConfigGroup("Book window");	
-	a->insertItem(i18n("Toggle tree"), "Toggle tree", 0);
-}
-
-/** No descriptions */
-void CBookPresenter::printEntry(){
-	CExportManager::printKey( m_moduleList.first(), m_key->key() );
-}
-
-/** Is called when the tree should be toggled. */
-void CBookPresenter::treeToggled(){
-	if (m_treeAction->isChecked())
-		m_treeChooser->show();
-	else
-		m_treeChooser->hide();
-}
-
-void CBookPresenter::applySettings( CProfileWindow* settings ){
-	CSwordPresenter::applySettings(settings);
-	
-	if (settings->windowSettings()) {
-		m_treeAction->setChecked(true);		
-		m_treeChooser->show();		
-	}
-	else {
-		m_treeAction->setChecked(false);
-		m_treeChooser->hide();
-	}
-//	const int count = m_displaySettingsButton->menuItemCount();
-//	for (int i = count-1; i>=1; i--) {
-//		if (result-(int)pow(2,i-1)>= 0) { //2^i was added before, so item with index i is set
-//			result -= (int)pow(2,i-1);
-//			m_displaySettingsButton->setItemStatus(i,true);
-//		}
-//		else
-//			m_displaySettingsButton->setItemStatus(i,false);			
-//	}		
-//	m_displaySettingsButton->setChanged();
-}
-
-void CBookPresenter::storeSettings( CProfileWindow* settings ){
-	CSwordPresenter::storeSettings(settings);	
-	settings->setWindowSettings( m_treeAction->isChecked() );
-//	const int count = m_displaySettingsButton->menuItemCount();
-//	int result = 0;
-//	//now check	every item
-//	for (int i = 1; i<count; i++) { //first item is a title
-//		if (m_displaySettingsButton->itemStatus(i)) //item is checked
-//			result += (int)pow(2,i-1);//add 2^i (the i. digit in binary)
-//	}
-//	settings->setWindowSettings(result);
-}
diff --git a/bibletime/frontend/presenters/cbookpresenter.h b/bibletime/frontend/presenters/cbookpresenter.h
deleted file mode 100644
index 58b4800..0000000
--- a/bibletime/frontend/presenters/cbookpresenter.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/***************************************************************************
-                          cbookpresenter.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 CBOOKPRESENTER_H
-#define CBOOKPRESENTER_H
-
-#include <qwidget.h>
-#include "cswordpresenter.h"
-
-
-class CSwordTreeKey;
-class KToggleAction;
-
-/**Creates a presenter object for generic book support.
-  *@author The BibleTime team
-  */
-
-class KAccel;
-
-class CBookTreeChooser;
-
-class CBookPresenter : public CSwordPresenter  {
-   Q_OBJECT
-public: 
-	/**
-	* Constructor of the presenter for generic books.
-	*/
-	CBookPresenter(ListCSwordModuleInfo useModules, QWidget *parent=0, const char *name=0 );
-	virtual ~CBookPresenter();
-  static void insertKeyboardActions(KAccel* a);
-	virtual void applySettings( CProfileWindow* settings );
-  virtual void storeSettings( CProfileWindow* setttings );
-
-public slots: // Public slots
-  /**
-  * No descriptions
-  */
-  virtual void lookup( const QString&, const QString&);
-    	
-protected: // Protected methods
-  /**
-  * Initializes the interface of this presenter.
-  */
-  virtual void initView();
-  /**
-  * Init the Signal Slot connections between childs and this widget.
-  */
-  virtual void initConnections();
-	virtual void initAccels();
-	
-protected slots:
-	void modulesChanged();
-  void lookup(CSwordKey*);	
-  void treeToggled();
-  void printEntry();
-
-private:
-	CSwordTreeKey* m_key;
-	CBookTreeChooser* m_treeChooser;
-	KToggleAction* m_treeAction;
-};
-
-#endif
diff --git a/bibletime/frontend/presenters/ccommentarypresenter.cpp b/bibletime/frontend/presenters/ccommentarypresenter.cpp
deleted file mode 100644
index da37d9e..0000000
--- a/bibletime/frontend/presenters/ccommentarypresenter.cpp
+++ /dev/null
@@ -1,524 +0,0 @@
-/***************************************************************************
-                          ccommentarypresenter.cpp  -  description
-                             -------------------
-    begin                : Sun Mar 18 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 "ccommentarypresenter.h"
-#include "cmodulechooserbar.h"
-#include "cdisplaysettingsbutton.h"
-
-#include "../ctoolclass.h"
-#include "../cexportmanager.h"
-#include "../chtmlwidget.h"
-#include "../keychooser/ckeychooser.h"
-#include "../../resource.h"
-#include "../../whatsthisdef.h"
-#include "../../backend/cswordversekey.h"
-#include "../../backend/chtmlchapterdisplay.h"
-#include "../../backend/creferencemanager.h"
-#include "../../backend/cswordbackend.h"
-#include "../../backend/cswordcommentarymoduleinfo.h"
-
-
-//Qt includes
-#include <qclipboard.h>
-
-//KDE includes
-#include <kmessagebox.h>
-#include <ktoolbar.h>
-#include <kaction.h>
-#include <klocale.h>
-#include <kfiledialog.h>
-#include <kaccel.h>
-#include <kapp.h>
-
-CCommentaryPresenter::CCommentaryPresenter(ListCSwordModuleInfo useModules, QWidget *parent, const char *name )
-	: CSwordPresenter(useModules, parent,name),
-	m_key( new CSwordVerseKey(m_moduleList.first()) ), m_editToolBar(0)
-{
-	CSwordCommentaryModuleInfo* commentary = dynamic_cast<CSwordCommentaryModuleInfo*>(m_moduleList.first());
-	if (commentary) {
-		if (commentary->hasTestament(CSwordBibleModuleInfo::OldTestament))
-			m_key->key("Genesis 1:1");
-		else
-			m_key->key("Matthew 1:1");
-	}
-	
-	initView();	
-	show();		
-	initConnections();		
-	
-	setInitialized();
-}
-
-CCommentaryPresenter::~CCommentaryPresenter(){
-	delete m_key;
-}
-
-/** Initializes our view. */
-void CCommentaryPresenter::initView(){
-	m_mainToolBar = new KToolBar(this);
-	m_keyChooser = CKeyChooser::createInstance(m_moduleList.first(), m_key, m_mainToolBar);
-	m_mainToolBar->insertWidget(0,m_keyChooser->sizeHint().width(),m_keyChooser);	
-	addToolBar(m_mainToolBar);			
-
-	m_moduleChooserBar = new CModuleChooserBar(m_moduleList, CSwordModuleInfo::Commentary, this );
-	addToolBar(m_moduleChooserBar);
-	
-	presenterSync_action =  new KToggleAction(i18n("Synchronize..."), ICON_SYNC,
-															IDK_PRESENTER_EDIT, this,	SLOT(syncToggled()), actionCollection(), "syncComment_action");
-	presenterSync_action->setWhatsThis( WT_PRESENTER_SYNC );
-	presenterSync_action->plug(m_mainToolBar);
-	
-	presenterEdit_action =  new KToggleAction(i18n("Edit entry..."), ICON_EDIT,
-															IDK_PRESENTER_EDIT, this,	SLOT(editComment()), actionCollection(), "editComment_action");
-	presenterEdit_action->setEnabled( m_moduleList.first()->module()->isWritable() );
-	presenterEdit_action->setWhatsThis( WT_PRESENTER_EDIT );
-	presenterEdit_action->plug(m_mainToolBar);
-	
-	m_htmlWidget = new CHTMLWidget(true, this);
-	ASSERT(m_htmlWidget);
-	
-	//setup popup menu
-	m_popup = new KPopupMenu(this);
-	m_popup->insertTitle(i18n("Commentary window"));
-	
-	m_copyPopup = new KPopupMenu(m_popup);
-	m_copyPopup->insertItem(i18n("Entry"), this, SLOT(copyEntry()),0,ID_PRESENTER_COPY_ONLY_KEY);
-	m_copyPopup->insertItem(i18n("Text of entry"), this, SLOT(copyEntryText()),0,ID_PRESENTER_COPY_KEY_TEXT);	
-	m_copyPopup->insertItem(i18n("Entry with text"), this, SLOT(copyEntryAndText()),0,ID_PRESENTER_COPY_KEY);
-	m_copyPopup->insertSeparator();
-	m_copyPopup->insertItem(i18n("Selected text"), m_htmlWidget, SLOT(copy()),0,ID_PRESENTER_COPY_SELECTED);
-	
-	m_printPopup = new KPopupMenu(m_popup);
-	m_printPopup->insertItem(i18n("Entry with text"), this, SLOT(printHighlightedVerse()),0,ID_PRESENTER_PRINT_KEY);
-
-	m_savePopup = new KPopupMenu(m_popup);	
-	m_savePopup->insertItem(i18n("Entry as plain text"), m_htmlWidget, SLOT(slotSaveAsText()),0,ID_PRESENTER_SAVE_CHAPTER);
-	m_savePopup->insertItem(i18n("Entry as HTML"), m_htmlWidget, SLOT(slotSaveAsHTML()),0,ID_PRESENTER_SAVE_CHAPTER_HTML);	
-
-	m_popup->insertItem(i18n("Select all"), m_htmlWidget, SLOT(slotSelectAll()),0, ID_PRESENTER_SELECT_ALL);
-  m_popup->insertItem(i18n("Lookup selected text in lexicon"), m_lexiconPopup, ID_PRESENTER_LOOKUP);	
-	m_popup->insertSeparator();	
-	m_popup->insertItem(SmallIcon(ICON_EDIT_COPY),i18n("Copy..."), 	m_copyPopup, ID_PRESENTER_COPY_POPUP);	
-	m_popup->insertItem(SmallIcon(ICON_FILE_PRINT), i18n("Add to printing queue..."), m_printPopup, ID_PRESENTER_PRINT_POPUP);	
-	m_popup->insertItem(SmallIcon(ICON_FILE_SAVE), i18n("Save..."), 	m_savePopup,ID_PRESENTER_SAVE_POPUP);		
-
-	m_htmlWidget->installPopup(m_popup);		
-	m_htmlWidget->installAnchorMenu( m_popup );
-	m_htmlWidget->setModules(m_moduleList);	
-	setCentralWidget(m_htmlWidget);	
-	setIcon( COMMENTARY_ICON_SMALL );
-}
-
-/** Initializes the connections */
-void CCommentaryPresenter::initConnections(){
-	connect(m_htmlWidget, SIGNAL(referenceClicked(const QString&, const QString&)),
-		this, SLOT(lookup(const QString&, const QString&))); 	 	
-	connect(m_htmlWidget, SIGNAL(referenceDropped(const QString&)),
-		this, SLOT(referenceDropped(const QString&)));
-
-	connect(m_htmlWidget, SIGNAL(sigDeleteDocument()),
-		this, SLOT(deleteText())); 	 	
-	connect(m_htmlWidget, SIGNAL(sigSaveDocument(const QString)),
-		this, SLOT(saveText(const QString))); 	 	 	
-	connect(m_htmlWidget, SIGNAL(insertReference(const QString&)),
-		this, SLOT(insertReference(const QString&))); 	 	 			
- 	
- 	connect( m_keyChooser, SIGNAL(beforeKeyChange(const QString&)),
- 		this, SLOT(beforeKeyChange(const QString&)));
- 	connect( m_keyChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		this, SLOT(lookup(CSwordKey*)));		
-	
-	connect(m_popup,SIGNAL(aboutToShow()),
-		SLOT(popupAboutToShow()));
-	
-	connect(m_moduleChooserBar, SIGNAL( sigChanged() ),
-		SLOT( modulesChanged() ));	
-//	connect(m_displaySettingsButton, SIGNAL( sigChanged() ),	
-//		SLOT(optionsChanged() ));
-}
-
-/** Is called when the selected modules changed. */
-void CCommentaryPresenter::modulesChanged(){
-  m_moduleList = m_moduleChooserBar->getModuleList();
-
-  if (!m_moduleList.count())
-  	close();
-  else {
-		presenterEdit_action->setEnabled( m_moduleList.first()->module()->isWritable() );
-//		m_displaySettingsButton->reset(m_moduleList);
-//	  refreshFeatures();	
-	  m_key->module(m_moduleList.first());
-	  m_keyChooser->setModule(m_moduleList.first());	
-		m_htmlWidget->setModules(m_moduleList);	
-	  lookup(m_key);
-	}
-}
-/**  */
-void CCommentaryPresenter::optionsChanged(){
-	lookup(m_key);
-}
-
-/** renders text and set it to the HTML widget */
-void CCommentaryPresenter::lookup(CSwordKey* key){	
-	setUpdatesEnabled(false);
-	CSwordVerseKey* vKey = dynamic_cast<CSwordVerseKey*>(key);
-	if (!vKey)
-		return;
-
-	backend()->setFilterOptions( m_moduleOptions );
-	backend()->setDisplayOptions( m_displayOptions );
-
-  m_moduleList.first()->module()->SetKey(*vKey);
-
-	if (m_moduleList.first()->getDisplay()) {	//do we have a display object?
-		if (m_htmlWidget->isReadOnly())	 {
-			if (m_moduleList.count()>1)
-				m_moduleList.first()->getDisplay()->Display( &m_moduleList );
-			else
-				m_moduleList.first()->getDisplay()->Display( m_moduleList.first() );
-			m_htmlWidget->setText( m_moduleList.first()->getDisplay()->getHTML() );
-		}
-		else
-			m_htmlWidget->setText( QString::fromUtf8( m_moduleList.first()->module()->getRawEntry() ) );
-	}	
-	if (m_key != vKey)
-		m_key->key(vKey->key());
-		
-	m_htmlWidget->scrollToAnchor( QString::number(vKey->Verse()) );
-	m_htmlWidget->setModified(false);
-	setUpdatesEnabled(true);
-	
-	setCaption( windowCaption() );	
-}
-
-/** No descriptions */
-void CCommentaryPresenter::popupAboutToShow(){
-	m_popup->setItemEnabled(ID_PRESENTER_LOOKUP, !m_htmlWidget->selectedText().isEmpty());
-	m_copyPopup->setItemEnabled(ID_PRESENTER_COPY_SELECTED, !m_htmlWidget->selectedText().isEmpty());	
-}
-
-/** Saves the given text in the module. */
-void CCommentaryPresenter::saveText(const QString text){
-	m_moduleList.first()->module()->SetKey(m_key);
-	if (!text.isEmpty())
-		*(m_moduleList.first()->module()) << (const char*)text.utf8();
-	else
-		m_moduleList.first()->module()->deleteEntry();		
-	m_htmlWidget->setModified( false );		
-}
-
-/** Deletes the displayed and edited text. */
-void CCommentaryPresenter::deleteText(){
-	m_moduleList.first()->module()->deleteEntry();
-	m_htmlWidget->clear();
-}
-
-void CCommentaryPresenter::editComment(){
-	if (!m_htmlWidget->isReadOnly()) {
-		switch (KMessageBox::warningYesNo( this, i18n("The text was not saved to the module. Save the changes now?")) ) {
-			case KMessageBox::Yes:
-			{
-	   		saveText( m_htmlWidget->text() );
-	   		m_htmlWidget->setModified( false );
-				break;
-			}
-	   	default: //no
-	   		break;
-	  }
-	}
-	
-	m_htmlWidget->setReadOnly( !m_htmlWidget->isReadOnly() );	
-	if (!m_htmlWidget->isReadOnly() && !m_editToolBar) {
-		m_editToolBar = new KToolBar(this);
-		addToolBar(m_editToolBar);		
-		m_htmlWidget->createEditToolbar( m_editToolBar );
-	}	
-	if (!m_htmlWidget->isReadOnly() && !m_editToolBar)
-		return;
-		
-	if (!m_htmlWidget->isReadOnly())
-		m_editToolBar->show();
-	else
-		m_editToolBar->hide();
-			
-	lookup( m_key );	
-	m_htmlWidget->setFocus();
-}
-
-/** Reimplementation. */
-void CCommentaryPresenter::lookup(const QString& module, const QString& key){
-	CSwordModuleInfo* m = backend()->findModuleByName(module);
-	if (m && m_moduleList.containsRef(m)) {
-		if (!key.isEmpty())
-			m_key->key(key);
-		m_keyChooser->setKey(m_key); //the key chooser does send an update signal	
-	}
-	else {
-		emit lookupInModule(module, key);
-	}
-}
-
-/** No descriptions */
-void CCommentaryPresenter::refresh( ){
-
-//	CSwordPresenter::refresh();	//refreshes the display settings button
-
-	m_key->setLocale((const char*)backend()->booknameLanguage().local8Bit());
-	m_keyChooser->refreshContent();
-	lookup(m_key);
-	m_htmlWidget->refresh();		
-}
-
-/** Printes the verse the user has chosen. */
-void CCommentaryPresenter::printHighlightedVerse(){
-//	CSwordVerseKey key(m_moduleList.first());	//this key is deleted by the printem
-//	key->key(m_key->key());	
-//	CSwordVerseKey key(*m_key);
-	CExportManager::printKey(m_moduleList.first(), m_key->key());
-}
-
-/** The sync button was pressed for synchronization. */
-void CCommentaryPresenter::syncToggled(){
-}
-
-/** Synchronizes to the given key if sync is enabled. */
-void CCommentaryPresenter::synchronize( CSwordKey* syncKey ){
-	if (!presenterSync_action->isChecked() || !syncKey)
-		return;
-	checkChanges();
-	m_key->key(syncKey->key());
-	m_keyChooser->setKey(m_key);
-}
-
-/** No descriptions */
-void CCommentaryPresenter::insertReference(const QString& reference){
-	if (m_htmlWidget->isReadOnly())
-		return;
-	CSwordVerseKey vk(m_moduleList.first());
-	vk.key(reference);
-	m_htmlWidget->insert(vk.strippedText());
-}
-
-/** Copies the highlighted text into clipboard. */
-void CCommentaryPresenter::copyEntry(){
-	QString key = QString::null;
-	QString module = QString::null;
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	CReferenceManager::Type type;
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);	
-	CSwordModuleInfo* m = backend()->findModuleByName(module);		
-	
-	CSwordVerseKey vKey(m);
-	vKey.key(key);
-		
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(vKey.key());
-}
-
-/** Copies the highlighted text into clipboard. */
-void CCommentaryPresenter::copyEntryText(){
-	QString key = QString::null;
-	QString module = QString::null;	
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	CReferenceManager::Type type;	
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);	
-	CSwordModuleInfo* m = backend()->findModuleByName(module);		
-	
-	CSwordVerseKey vKey(m);
-	vKey.key(key);
-	
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(vKey.strippedText());
-}
-
-/** Copies the highlighted text into clipboard. */
-void CCommentaryPresenter::copyEntryAndText(){
-	QString key = QString::null;
-	QString module = QString::null;
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	CReferenceManager::Type type;	
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);	
-	CSwordModuleInfo* m = backend()->findModuleByName(module);		
-	
-	CSwordVerseKey vKey(m);
-	vKey.key(key);
-	
-	const QString text = QString::fromLatin1("%1\n%2").arg(vKey.key()).arg(vKey.strippedText());
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(text);
-}
-
-//print functions
-/** Copies the highlighted text into clipboard. */
-void CCommentaryPresenter::printEntry(){
-	QString key = QString::null;
-	QString module = QString::null;
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	CReferenceManager::Type type;	
-	CReferenceManager::decodeHyperlink(currentAnchor, module, key, type);	
-	
-	CSwordModuleInfo* m = backend()->findModuleByName(module);			
-	CSwordVerseKey vKey(m);
-	CExportManager::printKey(m, vKey.key(key));
-}
-
-/** Checks for changes and saves the text. */
-void CCommentaryPresenter::checkChanges(){
-//	qDebug("void CCommentaryPresenter::checkChanges()");
-	if (!m_htmlWidget->isReadOnly() && m_htmlWidget->isModified()) {//save
-		saveText( m_htmlWidget->text() );
-		m_htmlWidget->setModified( false );
-	}
-}
-
-/** No descriptions */
-void CCommentaryPresenter::beforeKeyChange(const QString& oldKey){
-	if (!m_htmlWidget->isReadOnly()) {
-		switch (KMessageBox::warningYesNo( this, i18n("The text was not saved to the module. Save the changes now?")) ) {
-			case KMessageBox::Yes:
-			{
-				const QString newKey = m_key->key();
-				m_key->key(oldKey);
-	   		saveText( m_htmlWidget->text() );
-				m_key->key(newKey);		   		
-				break;
-			}
-	   	default: //no
-	   		break;
-	  }
-	}
-	m_htmlWidget->setModified( false );	
-}
-
-/** Inserts the actions used by this window class into the given KAccel object. */
-void CCommentaryPresenter::insertKeyboardActions(KAccel* a){	
-	ASSERT(a);
-	a->setConfigGroup("Commentary window");
-		
-	a->insertItem(i18n("Next book"), "Next book", 0);
-	a->insertItem(i18n("Previous book"), "Previous book", 0);	
-	
-	a->insertItem(i18n("Next chapter"), "Next chapter", 0);
-	a->insertItem(i18n("Previous chapter"), "Previous chapter", 0);	
-
-	a->insertItem(i18n("Next verse"), "Next verse", 0);
-	a->insertItem(i18n("Previous verse"), "Previous verse", 0);	
-
-	a->insertItem(i18n("Toggle synchronize button"), "Synchronize", 0);
-}
-
-
-/** Initializes the accelerator object. */
-void CCommentaryPresenter::initAccels(){
-	CSwordPresenter::initAccels();
-	m_accel->setConfigGroup("Commentary window");
-	
-	m_accel->insertItem(i18n("Next book"), "Next book", 0);
-	m_accel->connectItem("Next book", this, SLOT(nextBook()));	
-	m_accel->insertItem(i18n("Previous book"), "Previous book", 0);	
-	m_accel->connectItem("Previous book", this, SLOT(previousBook()));
-		
-	m_accel->insertItem(i18n("Next chapter"), "Next chapter", 0);
-	m_accel->connectItem("Next chapter", this, SLOT(nextChapter()));		
-	m_accel->insertItem(i18n("Previous chapter"), "Previous chapter", 0);	
-	m_accel->connectItem("Previous chapter", this, SLOT(previousChapter()));	
-
-	m_accel->insertItem(i18n("Next verse"), "Next verse", 0);
-	m_accel->connectItem("Next verse", this, SLOT(nextVerse()));		
-	m_accel->insertItem(i18n("Previous verse"), "Previous verse", 0);	
-	m_accel->connectItem("Previous verse", this, SLOT(previousVerse()));	
-
-	m_accel->insertItem(i18n("Toggle synchronize button"), "Synchronize", 0);	
-	m_accel->connectItem("Synchronize", this, SLOT(toggleSynchronize()));	
-		
-	m_accel->readSettings();
-}
-
-/** Jumps to the next entry */
-void CCommentaryPresenter::nextBook(){
-	if (m_key->next(CSwordVerseKey::UseBook))
-		m_keyChooser->setKey(m_key);	
-}
-
-/** Jumps to the previous entry. */
-void CCommentaryPresenter::previousBook(){
-	if (m_key->previous(CSwordVerseKey::UseBook))
-		m_keyChooser->setKey(m_key);
-}
-
-
-/** Jumps to the next entry */
-void CCommentaryPresenter::nextChapter(){
-	if ( m_key->next(CSwordVerseKey::UseChapter) )
-		m_keyChooser->setKey(m_key);	
-}
-
-/** Jumps to the previous entry. */
-void CCommentaryPresenter::previousChapter(){
-	if (m_key->previous(CSwordVerseKey::UseChapter))
-		m_keyChooser->setKey(m_key);
-}
-
-/** Jumps to the next entry */
-void CCommentaryPresenter::nextVerse(){
-	if ( m_key->next(CSwordVerseKey::UseVerse) )
-		m_keyChooser->setKey(m_key);	
-}
-
-/** Jumps to the previous entry. */
-void CCommentaryPresenter::previousVerse(){
-	if (m_key->previous(CSwordVerseKey::UseVerse))
-		m_keyChooser->setKey(m_key);
-}
-
-/** Toggles the synchronize button. */
-void CCommentaryPresenter::toggleSynchronize(){
-	presenterSync_action->setChecked( !presenterSync_action->isChecked() );
-}
-
-/** Stores some Bible window dpecific setttings in the profile. */
-void CCommentaryPresenter::storeSettings( CProfileWindow* settings ){
-	CSwordPresenter::storeSettings(settings);
-	settings->setWindowSettings( presenterSync_action->isChecked() );	
-}
-
-/** Applies some Bible window specific setttings. */
-void CCommentaryPresenter::applySettings( CProfileWindow* settings ){
-	CSwordPresenter::applySettings(settings);
-	presenterSync_action->setChecked(settings->windowSettings() == 1);
-}
-
-/** Saves settings */
-bool CCommentaryPresenter::queryClose(){
-	//save the text
-	if (!m_htmlWidget->isReadOnly() && m_htmlWidget->isModified()) {	
-		switch (KMessageBox::warningYesNoCancel( this, i18n("Save changes to module?")) ) {
-			case KMessageBox::Yes:
-			{
-	    	//save
-	   		saveText( m_htmlWidget->text() );
-	   		m_htmlWidget->setModified( false );
-	     	return true;
-			}
-	   	case KMessageBox::No :
-	     	return true;
-	   	default: // cancel
-	     	return false;	
-		}
-	}
-	return true;
-}
diff --git a/bibletime/frontend/presenters/ccommentarypresenter.h b/bibletime/frontend/presenters/ccommentarypresenter.h
deleted file mode 100644
index ebfe34b..0000000
--- a/bibletime/frontend/presenters/ccommentarypresenter.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/***************************************************************************
-                          ccommentarypresenter.h  -  description
-                             -------------------
-    begin                : Sun Mar 18 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 CCOMMENTARYPRESENTER_H
-#define CCOMMENTARYPRESENTER_H
-
-#include <qwidget.h>
-#include "cswordpresenter.h"
-
-class CSwordVerseKey;
-
-class KToggleAction;
-class KToolBar;
-
-/** The presenter used for Sword commentaries.
-  * @author The BibleTime team
-  */
-class CCommentaryPresenter : public CSwordPresenter  {
-   Q_OBJECT
-
-public:
-	/**
-	* Default constructor
-	*/
-	CCommentaryPresenter(ListCSwordModuleInfo useModules, QWidget *parent=0, const char *name=0);
-	/**
-	* Default destructor
-	*/	
-	~CCommentaryPresenter();
-  /**
-  * Synchronizes to the given key if sync is enabled.
-  */
-  void synchronize( CSwordKey* syncKey );
-  /**
-  * Inserts the actions used by this display window type into the given KAccel object.
-  */
-  static void insertKeyboardActions(KAccel* a);
-	void storeSettings( CProfileWindow* settings );
-	void applySettings( CProfileWindow* settings );
-
-public slots: // Public slots
-  /**
-  * Saves the given text in the module.
-  */
-  void saveText(const QString);
-  /**
-  * Reimplementation.
-  */
-  virtual void lookup(const QString&, const QString&);
-  /**
-  * Reimplementation
-  */
-  virtual void refresh( );
-  /**
-  * Saves settings
-  */
-  virtual bool queryClose();
-
-protected: // Protected methods
-  /**
-  * Init keyboard accelartors.
-  */
-  virtual void initAccels();
-
-protected slots: // Protected slots
-  /**
-  * renders text and set it to the HTML widget
-  */
-  void lookup(CSwordKey*);
-  /**
-  * Is called when the selected modules changed.
-  */
-  void modulesChanged();
-	void optionsChanged();
-  /**
-  * Deletes the displayed and edited text.
-  */
-  void deleteText();
-	void editComment();
-	/**
-	* Print the current item displayed in the presenter.
-	*/
-	void printHighlightedVerse();
-	void nextBook();
-	void previousBook();
-	void nextChapter();
-	void previousChapter();
-	void nextVerse();
-	void previousVerse();	
-  /**
-  * Toggles the synchronize button.
-  */
-  void toggleSynchronize();
-
-private:
-  void initConnections();
-  void initView();
-  /**
-  * Checks for changes and saves the text.
-  */
-  void checkChanges();
-	KToggleAction *presenterEdit_action;
-	KToggleAction *presenterSync_action;
-  CSwordVerseKey* m_key;
-	KToolBar* m_editToolBar;
-		
-private slots:
-  void popupAboutToShow();
-  void syncToggled();
-  void insertReference(const QString&);
-  void copyEntry();
-  void copyEntryText();
-  void copyEntryAndText();
-  void printEntry();
-  void beforeKeyChange(const QString&);
-};
-
-#endif
diff --git a/bibletime/frontend/presenters/cdisplaysettingsbutton.cpp b/bibletime/frontend/presenters/cdisplaysettingsbutton.cpp
deleted file mode 100644
index 3979fc8..0000000
--- a/bibletime/frontend/presenters/cdisplaysettingsbutton.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/***************************************************************************
-                          cdisplaysettingsbutton.cpp  -  description
-                             -------------------
-    begin                : Thu Nov 8 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 "cdisplaysettingsbutton.h"
-#include "../../resource.h"
-
-#include <qstring.h>
-#include <qtooltip.h>
-
-#include <kpopupmenu.h>
-#include <klocale.h>
-
-CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptionsBool *displaySettings, CSwordBackend::FilterOptionsBool *moduleSettings, const ListCSwordModuleInfo& useModules,QWidget *parent, const char *name )
-	: KToolBarButton(DSB_ICON, 0, parent, name)
-{
-	m_displaySettings = displaySettings;
-	m_moduleSettings = moduleSettings;
-	m_modules = useModules;
-
-//	setPixmap( BIBLE_ICON_MC );
-
- 	m_popup = new KPopupMenu(this);	
-	setPopup(m_popup);
-	setPopupDelay(0);
-
-	connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionToggled(int)));
-
-	populateMenu();
-//	if (!populateMenu())
-//		setEnabled(false);
-}
-
-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(){
-
-	int ret = 0;
-
-	m_popup->clear();
-	m_popup->insertTitle(i18n("Display options"));
-	m_popup->setCheckable(true);
-
-  ret += addMenuEntry(i18n("Use linebreaks"), &m_displaySettings->lineBreaks, true);
-	ret += addMenuEntry(i18n("Show versenumbers"), &m_displaySettings->verseNumbers, true);
-
-	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("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::greekAccents ));
-
-	return ret;
-}
-
-/** No descriptions */
-int CDisplaySettingsButton::addMenuEntry( const QString name, const bool* 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::FilterOptions 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/presenters/cdisplaysettingsbutton.h b/bibletime/frontend/presenters/cdisplaysettingsbutton.h
deleted file mode 100644
index 9db2f9e..0000000
--- a/bibletime/frontend/presenters/cdisplaysettingsbutton.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/***************************************************************************
-                          cdisplaysettingsbutton.h  -  description
-                             -------------------
-    begin                : Thu Nov 8 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 CDISPLAYSETTINGSBUTTON_H
-#define CDISPLAYSETTINGSBUTTON_H
-
-#include "backend/cswordbackend.h"
-#include "backend/cswordmoduleinfo.h"
-
-//QT includes
-#include <qdict.h>
-
-//KDE includes
-#include <ktoolbarbutton.h>
-
-/**
-  * @author The BibleTime team
-  */
-class CSwordModuleInfo;
-class KPopupMenu;
-
-class CDisplaySettingsButton : public KToolBarButton  {
-   Q_OBJECT
-public: 
-	CDisplaySettingsButton(CSwordBackend::DisplayOptionsBool *displaySettings, CSwordBackend::FilterOptionsBool *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::FilterOptionsBool*  m_moduleSettings;
-	CSwordBackend::DisplayOptionsBool* m_displaySettings;
-	CSwordBackend::FilterOptionsBool m_available;
-	ListCSwordModuleInfo m_modules;
-
-	QDict<bool> m_dict;
-
-	KPopupMenu* m_popup;
-
-  int populateMenu();
-	bool isOptionAvailable( const CSwordBackend::FilterOptions option);
-  int addMenuEntry( const QString name, const bool* option, const bool available);
-};
-
-#endif
diff --git a/bibletime/frontend/presenters/clexiconpresenter.cpp b/bibletime/frontend/presenters/clexiconpresenter.cpp
deleted file mode 100644
index 0d561fd..0000000
--- a/bibletime/frontend/presenters/clexiconpresenter.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/***************************************************************************
-                          clexiconpresenter.cpp  -  description
-                             -------------------
-    begin                : Sun Mar 18 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 "clexiconpresenter.h"
-#include "cmodulechooserbar.h"
-#include "cdisplaysettingsbutton.h"
-
-#include "../chtmlwidget.h"
-#include "../cexportmanager.h"
-#include "../keychooser/ckeychooser.h"
-#include "../../resource.h"
-#include "../../backend/cswordldkey.h"
-#include "../../backend/chtmlentrydisplay.h"
-#include "../../backend/cswordbackend.h"
-
-
-//Qt includes
-#include <qclipboard.h>
-
-//KDE icnludes
-#include <klocale.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
-#include <kfiledialog.h>
-#include <kapp.h>
-#include <kaccel.h>
-
-CLexiconPresenter::CLexiconPresenter(ListCSwordModuleInfo useModules, QWidget *parent, const char *name )
-	: CSwordPresenter(useModules, parent,name),
-	m_key( new CSwordLDKey(m_moduleList.first()) )
-{
-	m_key->key("");
-//	m_key->SWKey::operator=( TOP );
-//	*m_key = TOP;
-
-	initView();
-
-	show();
-	initConnections();			
-	
-	setInitialized();
-}
-
-CLexiconPresenter::~CLexiconPresenter(){
-	delete m_key;
-}
-
-/** Initializes the view. */
-void CLexiconPresenter::initView(){
-	
-	m_mainToolBar = new KToolBar(this);
-
-	m_keyChooser = CKeyChooser::createInstance(m_moduleList.first(), m_key, m_mainToolBar);
-
-	m_mainToolBar->insertWidget(0,m_keyChooser->sizeHint().width(),m_keyChooser);	
-	m_mainToolBar->setItemAutoSized(0);
-	addToolBar(m_mainToolBar);
-	
-//	m_displaySettingsButton = new CDisplaySettingsButton( &m_displayOptions, &m_moduleOptions, m_moduleList, m_mainToolBar);
-//	m_mainToolBar->insertWidget(1,m_displaySettingsButton->sizeHint().width(),m_displaySettingsButton);
-
-	m_moduleChooserBar = new CModuleChooserBar(m_moduleList, CSwordModuleInfo::Lexicon, this );
-	addToolBar(m_moduleChooserBar);
-	
-	m_htmlWidget = new CHTMLWidget(true, this);
-
-		
-	//setup popup menu
-	m_popup = new KPopupMenu(this);
-	m_popup->insertTitle(i18n("Lexicon window"));
-	
-	m_copyPopup = new KPopupMenu(m_popup);	
-	m_copyPopup->insertItem(i18n("Entry"), this, SLOT(copyEntry()),0,ID_PRESENTER_COPY_ONLY_KEY);
-	m_copyPopup->insertItem(i18n("Text of entry"), this, SLOT(copyEntryText()),0,ID_PRESENTER_COPY_KEY_TEXT);	
-	m_copyPopup->insertItem(i18n("Entry with text"), this, SLOT(copyEntryAndText()),0,ID_PRESENTER_COPY_KEY);
-	m_copyPopup->insertSeparator();
-	m_copyPopup->insertItem(i18n("Selected text"), m_htmlWidget, SLOT(copy()),0,ID_PRESENTER_COPY_SELECTED);
-	
-	m_printPopup = new KPopupMenu(m_popup);
-	m_printPopup->insertItem(i18n("Entry with text"), this, SLOT(printEntry()),0,ID_PRESENTER_PRINT_KEY);
-
-	m_savePopup = new KPopupMenu(m_popup);	
-	m_savePopup->insertItem(i18n("Entry as plain text"), m_htmlWidget, SLOT(slotSaveAsText()),0,ID_PRESENTER_SAVE_CHAPTER);
-	m_savePopup->insertItem(i18n("Entry as HTML"), m_htmlWidget, SLOT(slotSaveAsHTML()),0,ID_PRESENTER_SAVE_CHAPTER_HTML);	
-
-	m_popup->insertItem(i18n("Select all"), m_htmlWidget, SLOT(slotSelectAll()),0, ID_PRESENTER_SELECT_ALL);
-  m_popup->insertItem(i18n("Lookup selected text in lexicon"), m_lexiconPopup, ID_PRESENTER_LOOKUP);	
-	m_popup->insertSeparator();	
-	m_popup->insertItem(SmallIcon(ICON_EDIT_COPY),i18n("Copy..."), 	m_copyPopup, ID_PRESENTER_COPY_POPUP);	
-	m_popup->insertItem(SmallIcon(ICON_FILE_PRINT), i18n("Add to printing queue..."), m_printPopup, ID_PRESENTER_PRINT_POPUP);	
-	m_popup->insertItem(SmallIcon(ICON_FILE_SAVE), i18n("Save..."), 	m_savePopup,ID_PRESENTER_SAVE_POPUP);		
-
-
-	m_htmlWidget->installPopup(m_popup);	
-	m_htmlWidget->installAnchorMenu(m_popup);
-	m_htmlWidget->setModules(m_moduleList);	
-
-	setCentralWidget(m_htmlWidget);
-	setIcon(LEXICON_ICON_SMALL);
-}
-
-/** No descriptions */
-void CLexiconPresenter::initConnections(){
-	connect(m_htmlWidget, SIGNAL(referenceClicked(const QString&, const QString&)),
-		this, SLOT(lookup(const QString&, const QString&)));
-	connect(m_htmlWidget, SIGNAL(referenceDropped(const QString&)),
-		this, SLOT(referenceDropped(const QString&)));
-
- 	connect(m_keyChooser, SIGNAL(keyChanged(CSwordKey*)),
-		this, SLOT(lookup(CSwordKey*)));
-	connect(m_popup, SIGNAL(aboutToShow()),this,
-		SLOT(popupAboutToShow()));
-	connect(m_moduleChooserBar, SIGNAL(sigChanged()), this,
-		SLOT(modulesChanged()));
-}
-
-/** No descriptions */
-void CLexiconPresenter::lookup(CSwordKey* key){
-	setUpdatesEnabled(false);	
-	
-	CSwordLDKey* ldKey = dynamic_cast<CSwordLDKey*>(key);
-	if (!ldKey)
-		return;
-	backend()->setFilterOptions( m_moduleOptions );
-	backend()->setDisplayOptions( m_displayOptions );
-
-	m_moduleList.first()->module()->SetKey(*ldKey);
-	
-	if (m_moduleList.first()->getDisplay()) {	//do we have a display object?
-		if (m_moduleChooserBar->getModuleList().count() > 1)  //we want to display more than one module
-			m_moduleList.first()->getDisplay()->Display( &m_moduleList );
-		else
-			m_moduleList.first()->getDisplay()->Display( m_moduleList.first() );
-		m_htmlWidget->setText(m_moduleList.first()->getDisplay()->getHTML());
-	}	
-	if (m_key != ldKey)
-		m_key->key(ldKey->key());
-		
-	setUpdatesEnabled(true);
-	setCaption( windowCaption() );
-}
-
-/** No descriptions */
-void CLexiconPresenter::popupAboutToShow(){
-	m_popup->setItemEnabled(ID_PRESENTER_LOOKUP, !m_htmlWidget->selectedText().isEmpty());
-
-	m_copyPopup->setItemEnabled(ID_PRESENTER_COPY_SELECTED, !m_htmlWidget->selectedText().isEmpty());	
-}
-
-/** No descriptions */
-void CLexiconPresenter::lookup(const QString& module, const QString& key){
-	CSwordModuleInfo* m = backend()->findModuleByName(module);
-	if (m && m_moduleList.containsRef(m)) {
-		if (!key.isEmpty())
-			m_key->key(key);
-		m_keyChooser->setKey(m_key); //the key chooser does send an update signal	
-	}
-	else {
-		emit lookupInModule(module, key);
-	}
-}
-
-/** Refreshes all parts decsribed by the parameter. */
-void CLexiconPresenter::refresh( ){
-
-//	CSwordPresenter::refresh();	//refreshes the display settings button
-
-	lookup(m_key);
-	m_htmlWidget->refresh();
-}
-
-/** Is called when the modules shown by this display window were changed. */
-void CLexiconPresenter::modulesChanged(){
-  m_moduleList = m_moduleChooserBar->getModuleList();
-  if (!m_moduleList.count())
-  	close();
-  else {
-//		m_displaySettingsButton->reset(m_moduleList);
-//    refreshFeatures();
-	  m_key->module(m_moduleList.first());
-	  m_keyChooser->setModule(m_moduleList.first());	
-		m_htmlWidget->setModules(m_moduleList);		
-	  lookup(m_key);
-	}
-}
-/**  */
-void CLexiconPresenter::optionsChanged(){
-	lookup(m_key);
-}
-
-/** Copies the highlighted text into clipboard. */
-void CLexiconPresenter::copyEntry(){
-	CSwordLDKey key(m_moduleList.first());	//this key is deleted by the printem
-	key.key(m_key->key());
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	if (currentAnchor.left(8) == "sword://")
-		currentAnchor = currentAnchor.mid(8, currentAnchor.length()-(currentAnchor.right(1) == "/" ? 9 : 8));
-	key.key(currentAnchor);
-		
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(key.key());
-}
-
-/** Copies the highlighted text into clipboard. */
-void CLexiconPresenter::copyEntryText(){
-	CSwordLDKey key(m_moduleList.first());	//this key is deleted by the printem
-	key.key(m_key->key());
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	if (currentAnchor.left(8) == "sword://")
-		currentAnchor = currentAnchor.mid(8, currentAnchor.length()-(currentAnchor.right(1) == "/" ? 9 : 8));
-	key.key(currentAnchor);
-	
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(key.strippedText());
-}
-
-/** Copies the highlighted text into clipboard. */
-void CLexiconPresenter::copyEntryAndText(){
-	CSwordLDKey key(m_moduleList.first());	//this key is deleted by the printem
-	key.key(m_key->key());
-	QString currentAnchor = m_htmlWidget->getCurrentAnchor();
-	if (currentAnchor.left(8) == "sword://")
-		currentAnchor = currentAnchor.mid(8, currentAnchor.length()-(currentAnchor.right(1) == "/" ? 9 : 8));
-	key.key(currentAnchor);
-	
-	const QString text = QString("%1\n%2").arg(key.key()).arg(key.strippedText());
-	QClipboard *cb = KApplication::clipboard();
-	cb->setText(text);
-}
-
-//print functions
-void CLexiconPresenter::printEntry(){
-	CExportManager::printKey(m_moduleList.first(), m_key->key());
-}
-
-/** Inserts the used keyboard actions into the given KAccel object. */
-void CLexiconPresenter::insertKeyboardActions(KAccel* a){
-	a->setConfigGroup("Lexicon window");	
-	a->insertItem(i18n("Next entry"), "Next entry", 0);
-	a->insertItem(i18n("Previous entry"), "Previous entry", 0);	
-}
-
-/** Initializes keyboard accelerators. */
-void CLexiconPresenter::initAccels(){
-	CSwordPresenter::initAccels();
-	m_accel->setConfigGroup("Lexicon window");	
-	m_accel->insertItem(i18n("Next entry"), "Next entry", 0);
-	m_accel->connectItem("Next entry", this, SLOT(nextEntry()));
-		
-	m_accel->insertItem(i18n("Previous entry"), "Previous entry", 0);		
-	m_accel->connectItem("Previous entry", this, SLOT(previousEntry()));
-		
-	m_accel->readSettings();
-}
-
-/** Jumps to the previous entry. */
-void CLexiconPresenter::previousEntry(){
-	m_key->PreviousEntry();
-	m_keyChooser->setKey(m_key);
-}
-
-/** Jumps to the next entry */
-void CLexiconPresenter::nextEntry(){
-	m_key->NextEntry();
-	m_keyChooser->setKey(m_key);	
-}
diff --git a/bibletime/frontend/presenters/clexiconpresenter.h b/bibletime/frontend/presenters/clexiconpresenter.h
deleted file mode 100644
index e74ea8c..0000000
--- a/bibletime/frontend/presenters/clexiconpresenter.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/***************************************************************************
-                          clexiconpresenter.h  -  description
-                             -------------------
-    begin                : Sun Mar 18 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 CLEXICONPRESENTER_H
-#define CLEXICONPRESENTER_H
-
-#include <qwidget.h>
-#include "cswordpresenter.h"
-
-class CSwordLDKey;
-
-/**
- 	* Presenter used for lexicons
-  * @author The BibleTime team
-  */
-class CLexiconPresenter : public CSwordPresenter  {
-   Q_OBJECT
-public: 
-	CLexiconPresenter(ListCSwordModuleInfo useModules, QWidget *parent=0, const char *name=0);
-	virtual ~CLexiconPresenter();
-  /**
-  * Inserts the used keyboard actions into the given KAccel object.
-  */
-  static void insertKeyboardActions(KAccel* a);
-	
-public slots: // Public slots
-  /**
-  * No descriptions
-  */
-  virtual void lookup(const QString&, const QString&);
-  /**
-  * Refreshes all parts decsribed by the parameter.
-  */
-  virtual void refresh( );
-
-protected: // Protected methods
-  /**
-  * Initializes keyboard accelerators.
-  */
-  virtual void initAccels();
-
-private slots:
-  void copyEntry();
-  void copyEntryText();
-  void copyEntryAndText();
-  void printEntry();
-  void modulesChanged();
-	void optionsChanged();
-  void popupAboutToShow();
-  void lookup(CSwordKey*);
-  void nextEntry();
-  void previousEntry();
-
-private: // Private methods
-  void initConnections();
-  void initView();
-
-  CSwordLDKey* m_key;
-};
-
-#endif
diff --git a/bibletime/frontend/presenters/cmodulechooserbar.cpp b/bibletime/frontend/presenters/cmodulechooserbar.cpp
deleted file mode 100644
index de57ba0..0000000
--- a/bibletime/frontend/presenters/cmodulechooserbar.cpp
+++ /dev/null
@@ -1,129 +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) {
-	qDebug("constructor of CModuleCHooserBar");
-
-	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 && (unsigned int)m_buttonLimit <= m_buttonList.count())
-			break;
-			
-		CModuleChooserButton* b = new CModuleChooserButton(useModules.current(),m_moduleType,++m_idCounter,this);
-		m_buttonList.append(b);
-		insertWidget(m_idCounter, b->sizeHint().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();
-	}
-  if (m_buttonLimit && (unsigned int)m_buttonLimit > m_buttonList.count() )
-	  addButton();
-}
-
-/** Adds a button to the toolbar */
-void CModuleChooserBar::addButton(){
-	CModuleChooserButton* b = new CModuleChooserButton(0, m_moduleType, ++m_idCounter, this);
-	m_buttonList.append(b);	
-	insertWidget(m_idCounter, b->sizeHint().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();
-}
-
-/** 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.remove(b);
-			//ASSERT(b);
-			b->hide();
-	 	  m_deleteID = ID;
-	 	  QTimer::singleShot( 5000, this, SLOT(deleteButton()) );
-			break;
-		}
-	}		
-	
-	emit sigChanged();
-}
-
-/** Returns a list of selected modules. */
-ListCSwordModuleInfo CModuleChooserBar::getModuleList(){
-	ListCSwordModuleInfo list;
-	list.setAutoDelete(false);
-	list.clear();
-	
-	for (m_buttonList.first(); m_buttonList.current(); m_buttonList.next()) {	
-	  CSwordModuleInfo* m = m_buttonList.current()->module();
-	  if (m)
-  		list.append( m );
-	}
-	return list;
-}
-
-/** No descriptions */
-void CModuleChooserBar::deleteButton(){
-	removeItem(m_deleteID);
-}
-
-/** Sets the number of the maximum count of buttons. */
-void CModuleChooserBar::setButtonLimit(const int limit){
-	m_buttonLimit = limit;
-	if (m_buttonList.count() > (unsigned int)m_buttonLimit ) {	//remove the last buttons
-		for (m_buttonList.last(); m_buttonList.current() && (m_buttonList.count() > (unsigned int)m_buttonLimit); m_buttonList.prev() ) {
-			CModuleChooserButton* b = m_buttonList.current();
-			m_buttonList.remove(b);
-			b->hide();
-			delete b;
-		}
-	}
-}
-
-/** Sets the modules which are chosen in this module chooser bar. */
-void CModuleChooserBar::setModules( ListCSwordModuleInfo useModules ){
-	setButtonLimit(0);	
-	setButtonLimit(-1);		//these two lines clear the bar
-	
-	for (useModules.first(); useModules.current(); useModules.next())		 {
-		if (m_buttonLimit && (unsigned int)m_buttonLimit <= m_buttonList.count())
-			break;
-			
-		CModuleChooserButton* b = new CModuleChooserButton(useModules.current(),m_moduleType,++m_idCounter,this);
-		m_buttonList.append(b);
-		insertWidget(m_idCounter, b->sizeHint().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();
-	}
-  if (m_buttonLimit && (unsigned int)m_buttonLimit > m_buttonList.count() )
-	  addButton();
-}
diff --git a/bibletime/frontend/presenters/cmodulechooserbar.h b/bibletime/frontend/presenters/cmodulechooserbar.h
deleted file mode 100644
index a1249e0..0000000
--- a/bibletime/frontend/presenters/cmodulechooserbar.h
+++ /dev/null
@@ -1,76 +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
-
-#include "cmodulechooserbutton.h"
-#include "../../backend/cswordmoduleinfo.h"
-#include "../cpointers.h"
-
-#include <qwidget.h>
-#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 slots: // Protected slots
-  /**
-  * Adds a button to the toolbar
-  */
-  void addButton();
-	/**
-	* Removes a button from the toolbar
-	*/
-	void removeButton( const int ID );
-  /**
-  * No descriptions
-  */
-  void deleteButton();
-
-private:
-	QList<CModuleChooserButton> m_buttonList;
-	CSwordModuleInfo::ModuleType m_moduleType;
-	int m_idCounter;
-	int m_deleteID;
-	int m_buttonLimit;
-
-signals: // Signals
-  void sigChanged();
-};
-
-#endif
diff --git a/bibletime/frontend/presenters/cmodulechooserbutton.cpp b/bibletime/frontend/presenters/cmodulechooserbutton.cpp
deleted file mode 100644
index 12ce8ea..0000000
--- a/bibletime/frontend/presenters/cmodulechooserbutton.cpp
+++ /dev/null
@@ -1,145 +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 "../../resource.h"
-#include "../../backend/cswordbackend.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qtooltip.h>
-
-//KDE includes
-#include <kpopupmenu.h>
-#include <klocale.h>
-
-CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, QWidget *parent, const char *name )
-	: KToolBarButton("", id, parent,name) {
-	qDebug("CModuleChooserButton::CModuleCHooserButton");
-
-	m_id = id;
-	m_moduleType = type;	
-	m_module = useModule;
-	if (!m_module)
-  	m_hasModule = false;
-  else
-    m_hasModule = true;
-	
-	setIcon( iconName() );
-	setPopupDelay(0);
-	
-	//create popup
-	m_popup = new KPopupMenu(this);	
-	m_popup->insertTitle(i18n("Select additional modules"));	
-	m_popup->setCheckable(true);
-	m_popup->insertItem(i18n("NONE"));
-	m_popup->insertSeparator();	
-	connect(m_popup, SIGNAL(activated(int)), this, SLOT(moduleChosen(int)));		
-	setPopup(m_popup);
-	
-	ListCSwordModuleInfo& modules = backend()->moduleList();
-	for (modules.first(); modules.current(); modules.next()) {
-		if (modules.current()->type() == m_moduleType) {
-			m_popup->insertItem( modules.current()->name() );
-		}
-	}	
-	//Check the appropriate entry
-	if (m_module) {
-		for (unsigned int i = 0; i < m_popup->count(); i++) {
-			if (m_popup->text(m_popup->idAt(i)) == m_module->name()) {
-				m_popup->setItemChecked(m_popup->idAt(i),true);
-	  		QToolTip::add(this, m_module->name() );				
-	  		break;
-			}
-		}
-	}
- 	else {
-		for (unsigned int i = 0; i < m_popup->count(); i++) {
-			if (m_popup->text(m_popup->idAt(i)) == i18n("NONE") )
-				m_popup->setItemChecked(m_popup->idAt(i),true);
-				break;
-		}
-	}
-}	
-
-/** Returns the icon used for the current status. */
-const QString CModuleChooserButton::iconName(){
-	switch (m_moduleType) {
-		case CSwordModuleInfo::Bible:
-			if (m_hasModule)
-				return QString::fromLatin1(BIBLE_ICON_MC);
-			else
-				return QString::fromLatin1(BIBLE_ADD_ICON_MC);
-		case CSwordModuleInfo::Commentary:
-			if (m_hasModule)
-				return QString::fromLatin1(COMMENTARY_ICON_MC);
-			else
-				return QString::fromLatin1(COMMENTARY_ICON_MC);
-		case CSwordModuleInfo::Lexicon:
-			if (m_hasModule)
-				return QString::fromLatin1(LEXICON_ICON_MC);
-			else
-				return QString::fromLatin1(LEXICON_ADD_ICON_MC);
-		case CSwordModuleInfo::GenericBook:
-			if (m_hasModule)
-				return QString::fromLatin1(BOOK_ICON_MC);
-			else
-				return QString::fromLatin1(BOOK_ADD_ICON_MC);
-		default:
-			return QString::fromLatin1(BIBLE_ICON_MC);
-	}
-}
-
-CSwordModuleInfo* CModuleChooserButton::module() {		
-	for (unsigned int i = 0; i < m_popup->count(); i++) {
-		if ( m_popup->isItemChecked(m_popup->idAt(i)) )
-			return backend()->findModuleByName( m_popup->text(m_popup->idAt(i)) );
-	}	
-	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 (unsigned int i = 0; i < m_popup->count(); i++)
-		m_popup->setItemChecked(m_popup->idAt(i),false);		
-	m_popup->setItemChecked(ID, true);
-	
-	if (m_popup->text(ID) == i18n("NONE")) {
-		if (m_hasModule) {
-  		emit sigRemoveButton(m_id);
-  		return;
-		}
-	}
-	else {
-	  if (!m_hasModule)
-	    emit sigAddButton();
-		m_hasModule = true;  	
-		m_module = module();
-		setIcon(iconName());
-//		repaint();  	  	
-  	emit sigChanged();
-  	
-  	QToolTip::remove(this);
-  	if (module())
-  		QToolTip::add(this, module()->name());
-	}
-}
diff --git a/bibletime/frontend/presenters/cmodulechooserbutton.h b/bibletime/frontend/presenters/cmodulechooserbutton.h
deleted file mode 100644
index e6d56c2..0000000
--- a/bibletime/frontend/presenters/cmodulechooserbutton.h
+++ /dev/null
@@ -1,62 +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
-
-#include "backend/cswordmoduleinfo.h"
-#include "frontend/cpointers.h"
-
-#include <ktoolbarbutton.h>
-
-class KPopupMenu;
-
-/**
-  *@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;
-	
-private:
-  /**
-  * Returns the icon used for the current status.
-  */
-  const QString iconName();		
-	
-	bool m_hasModule;
-	CSwordModuleInfo::ModuleType m_moduleType;
-	CSwordModuleInfo* m_module;
-	int m_id;
-	KPopupMenu* m_popup;
-
-private slots:
-	void moduleChosen(int ID );
-
-signals:
-	void sigRemoveButton(const int ID);
-	void sigAddButton();
-  void sigChanged();
-};
-#endif
diff --git a/bibletime/frontend/presenters/cswordpresenter.cpp b/bibletime/frontend/presenters/cswordpresenter.cpp
deleted file mode 100644
index da2d4cd..0000000
--- a/bibletime/frontend/presenters/cswordpresenter.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/***************************************************************************
-                          cswordpresenter.cpp  -  description
-                             -------------------
-    begin                : Sun Mar 18 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 "cswordpresenter.h"
-#include "../keychooser/ckeychooser.h"
-#include "../chtmlwidget.h"
-#include "../../backend/cswordkey.h"
-#include "../../printing/cprintitem.h"
-#include "../../printing/cprinter.h"
-#include "../cbtconfig.h"
-#include "cdisplaysettingsbutton.h"
-
-//Qt includes
-#include <qpopupmenu.h>
-
-//KDE includes
-#include <kaccel.h>
-
-CSwordPresenter::CSwordPresenter(ListCSwordModuleInfo useModules, QWidget *parent, const char *name )
-	: KMainWindow(parent,name,0),
-	m_mainToolBar(0),
-	m_popup(0), m_savePopup(0), m_copyPopup(0), m_printPopup(0),
-	m_lexiconPopup(new QPopupMenu(this)),	
-	m_keyChooser(0),
-	m_htmlWidget(0),
-	m_moduleChooserBar(0),	
-	m_displaySettingsButton(0),
-	m_moduleList(useModules),
-	m_accel(0),
-	m_moduleOptions( CBTConfig::getFilterOptionDefaults() ),	
-	m_displayOptions( CBTConfig::getDisplayOptionDefaults() ),
-	m_features(0),
-	m_initialized(false)	
-{		
-	ListCSwordModuleInfo& modules =  backend()->moduleList();
-	for (modules.first(); modules.current(); modules.next()) {
-		if (modules.current()->type() == CSwordModuleInfo::Lexicon) {
-			m_lexiconPopup->insertItem( modules.current()->name() );
-		}
-	}	
-	connect(m_lexiconPopup, SIGNAL(activated(int)),this, SLOT(lookupWord(int)));
-	resize(350,350);	
-	setCaption(windowCaption());	
-	
-	setFocusPolicy(QWidget::WheelFocus);
-}
-
-
-/** Returns the features used by this presenter. */
-int CSwordPresenter::getFeatures(){
-	return m_features;
-}
-
-/** Refreshes the presenter depending on the events given as parameter. */
-//void CSwordPresenter::refresh( ){	
-//}
-
-/** Prints the key given as parameter. */
-//void CSwordPresenter::printKey(const QString& startKey, const QString& stopKey, CSwordModuleInfo* module) {
-////	printer()->addItemToQueue( new CPrintItem(module, startKey, stopKey) );
-//	CExportManager::printKey(module, startKey, stopKey);
-//}
-
-/** Refreshes the supported features. */
-//void CSwordPresenter::refreshFeatures(){
-//	m_features = 0;	
-//	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) {
-//		if (m_moduleList.current()->supportsFeature( CSwordBackend::strongNumbers )){
-//			if (m_features != 0)
-//				m_features |= strongNumbers;
-//			else
-//				m_features = strongNumbers;
-//		}
-//		if (m_moduleList.current()->supportsFeature( CSwordBackend::footnotes )){
-//			if (m_features != 0)
-//				m_features |= footnotes;
-//			else
-//				m_features = footnotes;
-//		}
-//		if (m_moduleList.current()->supportsFeature( CSwordBackend::headings )){
-//			if (m_features != 0)
-//				m_features |= headings;
-//			else
-//				m_features = headings;
-//		}
-//		if (m_moduleList.current()->supportsFeature( CSwordBackend::morphTags )){
-//			if (m_features != 0)
-//				m_features |= morphTags;
-//			else
-//				m_features = morphTags;
-//		}		
-//	}
-//}
-
-void CSwordPresenter::lookupWord(int moduleID){
-	const QString module = m_lexiconPopup->text(moduleID);	
-	const QString text = m_htmlWidget->selectedText();
-	if (!text.isEmpty())
-		emit lookupInLexicon(text,module);
-}
-
-/** Look up the key given as parameter. */
-void CSwordPresenter::lookup(const QString& module, const QString& key){
-
-}
-
-/** Returns the listof used modules. */
-ListCSwordModuleInfo& CSwordPresenter::getModuleList() {
-	return m_moduleList;
-}
-
-/** Returns the used keychooser object of this presenter. */
-CKeyChooser* CSwordPresenter::keyChooser() const {
-	return m_keyChooser;
-}
-
-/** No descriptions */
-const QString CSwordPresenter::windowCaption() {
-	QString ret;
-	if (!m_moduleList.count())  {
-		return QString::null;
-	}
-	ret = m_moduleList.first()->name();		
-	if (m_moduleList.count() > 1) {
-		for (m_moduleList.next(); m_moduleList.current(); m_moduleList.next())	 {
-			ret += " | " + m_moduleList.current()->name();	
-		}
-	}
-	return ret;
-}
-
-/** Sets the caption of this display window */
-void CSwordPresenter::setCaption(const QString&){
-	QWidget::setCaption( windowCaption() ); //set everytime our own caption
-}
-
-/** Applies the settings given in the parameter to the window. */
-void CSwordPresenter::applySettings( CProfileWindow* settings ){
-	setUpdatesEnabled(false);
-	
-	if (settings->maximized()) {
-		showMaximized();
-	}
-	else {	
-		const QRect rect = settings->geometry();
-		resize(rect.width(), rect.height());
-		parentWidget()->move(rect.x(), rect.y());
-		//setGeometry( settings->geometry() );
-	}
-	m_htmlWidget->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal );
-	m_htmlWidget->verticalScrollBar()->setValue( settings->scrollbarPositions().vertical );
-	
-	setUpdatesEnabled(true);	
-}
-
-/** Stores the settings of this window in the CProfileWindow object given as parameter. */
-void CSwordPresenter::storeSettings( CProfileWindow* settings ){
-	QRect rect;
-	rect.setX(parentWidget()->x());
-	rect.setY(parentWidget()->y());
-	rect.setWidth(width());
-	rect.setHeight(height());
-	settings->setGeometry(rect);
-		
-	settings->setScrollbarPositions( m_htmlWidget->horizontalScrollBar()->value(), m_htmlWidget->verticalScrollBar()->value() );
-	settings->setType(m_moduleList.first()->type());
-	settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
-	
-	CSwordKey* key = keyChooser()->key();
-	if (key) {
-		VerseKey* vk = dynamic_cast<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 modules;
-	for (CSwordModuleInfo* m = m_moduleList.first(); m; m = m_moduleList.next()) {
-		modules.append(m->name());
-	}	
-	settings->setModules(modules);
-}
-
-/** Is called when the presenter should be closed. To delete the presenter it emits "close(CPresenter*)".*/
-void CSwordPresenter::closeEvent(QCloseEvent* e) {
-	if (!queryClose()) {
-		e->ignore();		
-	}	
-	else {
-		e->accept();
-		emit(closePresenter(this));
-	}
-}
-
-/** Inserts the action used by this display window in the given KAccel object. */
-void CSwordPresenter::insertKeyboardActions( KAccel* a ){
-	a->setConfigGroup("General window");	
-}
-
-void CSwordPresenter::initAccels(){
-}
-
-/** Initilizes widget before shown and after constructor. */
-void CSwordPresenter::polish(){
-	KMainWindow::polish();		
-	m_accel = new KAccel(this);	
-	initAccels();
-}
-
-/** Is called when this display window looses the focus. */
-void CSwordPresenter::focusInEvent( QFocusEvent* e ){
-	KMainWindow::focusInEvent(e);
-	if (m_accel)
-		m_accel->setEnabled(true);
-}
-
-/** Is called when this display window looses the focus. */
-void CSwordPresenter::focusOutEvent( QFocusEvent* e ){
-//	qDebug("CSwordPresenter::focusOutEvent( QFocusEvent* e )");	
-	KMainWindow::focusOutEvent(e);	
-	if (m_accel)
-		m_accel->setEnabled(false);
-}
-
-/** Is called when this display window looses the focus. */
-void CSwordPresenter::refresh(){
-//	qWarning("CSwordPresenter::refresh()");
-	m_moduleOptions = CBTConfig::getFilterOptionDefaults();
-	m_displayOptions = CBTConfig::getDisplayOptionDefaults();
-
-	if (m_displaySettingsButton)
-		m_displaySettingsButton->reset(m_moduleList);
-}
-
-/** Is called when a reference was dropped on this window. */
-void CSwordPresenter::referenceDropped(const QString& ref){
-	lookup(m_moduleList.first()->name(), ref);
-}
-
-/** Reimplementation from KMainWindow. */
-bool CSwordPresenter::queryClose(){
-	return true;
-}
-
-/** Returns true if the display window is fully initialized. */
-const bool CSwordPresenter::initialized(){
-	return m_initialized;
-}
-
-/** Sets the display window to the initialized state. */
-void CSwordPresenter::setInitialized(){
-	m_initialized = true;
-}
diff --git a/bibletime/frontend/presenters/cswordpresenter.h b/bibletime/frontend/presenters/cswordpresenter.h
deleted file mode 100644
index 7a9727e..0000000
--- a/bibletime/frontend/presenters/cswordpresenter.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/***************************************************************************
-                          cswordpresenter.h  -  description
-                             -------------------
-    begin                : Sun Mar 18 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 CSWORDPRESENTER_H
-#define CSWORDPRESENTER_H
-
-//BibleTime includes
-#include "../../backend/cswordmoduleinfo.h"
-#include "../../backend/cswordbackend.h"
-//#include "../../structdef.h"
-#include "../cpointers.h"
-#include "../cprofilewindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <kmainwindow.h>
-
-class KPopupMenu;
-class KToolBar;
-
-class CKeyChooser;
-class CHTMLWidget;
-
-class CModuleChooserBar;
-class CDisplaySettingsButton;
-
-class CSwordKey;
-class KAccel;
-
-/** Base class for all Sword based presneters
-	* The base class for all Sword based presenters.
-	*
-  * @author The BibleTime team
-  */
-class CSwordPresenter : public KMainWindow, public CPointers  {
-   Q_OBJECT
-public:
-	/**
-	* Default constructor
-	*/
-	CSwordPresenter(ListCSwordModuleInfo useModules, QWidget *parent=0, const char *name=0);
-  /**
-  * Returns the features used by this presenter.
-  */
-  int getFeatures();
-  /**
-  * Refreshes the presenter.
-  */
-  virtual void refresh();
-  /**
-  * Returns the listof used modules.
-  */
-  ListCSwordModuleInfo& getModuleList();
-  /**
-  * Returns the caption for this Sword display window.
-  */
-  const QString windowCaption();
-  /**
-  * Stores the settings of this window in the CProfileWindow object given as parameter.
-  */
-  virtual void storeSettings( CProfileWindow* p );
-  /**
-  * Applies the settings given in the parameter to the window.
-  */
-  virtual void applySettings( CProfileWindow* settings );
-
-public slots: // Public slots
-  /**
-  * Look up the key given as parameter.
-  */
-  virtual void lookup(const QString&, const QString&);
-  /**
-  * Returns the used keychooser object of this presenter.
-  */
-  CKeyChooser* keyChooser() const;
-  /**
-  * Sets the caption of this display window
-  */
-  virtual void setCaption(const QString&);
-  /**
-	* Is called when a reference was dropped on this window.
-	*/
-  virtual void referenceDropped(const QString&);
-  /** Reimplementation from KMainWindow. */
-  virtual bool queryClose();
-  /** Returns true if the display window is fully initialized. */
-  const bool initialized();
-  /**
-  * Inserts the action used by this display window in the given KAccel object.
-  */
-  static void insertKeyboardActions( KAccel* accel );
-
-protected: // Protected methods
-  /**
-  * Prints the key given as parameter.
-  */
-//  void printKey(const QString& startKey, const QString& stopKey, CSwordModuleInfo* module);
-  /**
-  * Refreshes the supported features.
-  */
-//  void refreshFeatures();
-  /**
-  * Is called when the presenter should be closed. To delete the presenter it emits "close(CPresenter*)".
-  */
-  virtual void closeEvent(QCloseEvent*e);
-  /** Initializes the accelerators used by this windows.
-	* Derived classes have to call this function too if the reimplemented this function.
-	* e.g.
-	*  @code
-	*			//init own additional accelerators
-	* 	 CSwordPresenter::initAccel();
-  */
-  virtual void initAccels();
-
-	KToolBar* m_mainToolBar;
-	
-	KPopupMenu* m_popup;
-	KPopupMenu* m_savePopup;
-	KPopupMenu* m_copyPopup;	
-	KPopupMenu* m_printPopup;	
-		
-	QPopupMenu* m_lexiconPopup;
-	CKeyChooser* m_keyChooser;
-	CHTMLWidget* m_htmlWidget;	
-
-  CModuleChooserBar* m_moduleChooserBar;
-	CDisplaySettingsButton* m_displaySettingsButton;
-
-  ListCSwordModuleInfo m_moduleList;
- 	QString m_highlightedVerse;
-
- 	KAccel* m_accel;
-
-	CSwordBackend::FilterOptionsBool m_moduleOptions;
-	CSwordBackend::DisplayOptionsBool m_displayOptions;
- 	 	  	
-protected slots: // Protected slots
-  void lookupWord(int ID);
-  /**
-  * Initilizes widget before shown and after constructor.
-  */
-  virtual void polish();
-  /**
-  * Is called when this display window looses the focus.
-  */
-  virtual void focusInEvent( QFocusEvent* e );
-  /**
-  * Is called when this display window looses the focus.
-  */
-  virtual void focusOutEvent( QFocusEvent* e );
-  /**
-  * Sets the display window to the initialized state.
-  */
-  void setInitialized();
-
-
-private:
-	int m_features;
-	bool m_initialized;
-
-signals: // Signals
-  void lookupInLexicon(const QString& text, const QString& lexicon);
-	void lookupInModule(const QString& module, const QString& text);
-  void closePresenter(CSwordPresenter*);
-
-};
-
-#endif
diff --git a/bibletime/frontend/searchdialog/Makefile.am b/bibletime/frontend/searchdialog/Makefile.am
index bdcd8a4..24541be 100644
--- a/bibletime/frontend/searchdialog/Makefile.am
+++ b/bibletime/frontend/searchdialog/Makefile.am
@@ -6,21 +6,11 @@ noinst_LIBRARIES = libsearchdialog.a
 
 libsearchdialog_a_SOURCES = \
 csearchdialog.cpp \
-csearchdialoganalysis.cpp \
-csearchdialogresultview.cpp \
-csearchdialogresult.cpp \
-csearchdialogtext.cpp \
-csearchdialogscope.cpp \
-csearchdialogmodulechooser.cpp
+csearchdialogpages.cpp
 
-all_headers = csearchdialogmodulechooser.h \
-csearchdialogtext.h \
-csearchdialogscope.h \
-csearchdialogresult.h \
-csearchdialogresultview.h \
-csearchdialoganalysis.h \
-csearchdialogmodulechooser.h \
-csearchdialog.h
+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
index 29c86f8..0def193 100644
--- a/bibletime/frontend/searchdialog/Makefile.in
+++ b/bibletime/frontend/searchdialog/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,155 +229,180 @@ 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@
-micodir = @micodir@
+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 csearchdialoganalysis.cpp csearchdialogresultview.cpp csearchdialogresult.cpp csearchdialogtext.cpp csearchdialogscope.cpp csearchdialogmodulechooser.cpp
+libsearchdialog_a_SOURCES = \
+csearchdialog.cpp \
+csearchdialogpages.cpp
 
 
-all_headers = csearchdialogmodulechooser.h csearchdialogtext.h csearchdialogscope.h csearchdialogresult.h csearchdialogresultview.h csearchdialoganalysis.h csearchdialogmodulechooser.h csearchdialog.h
+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 = ../../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libsearchdialog_a_LIBADD = 
-#>- libsearchdialog_a_OBJECTS =  csearchdialog.$(OBJEXT) \
-#>- csearchdialoganalysis.$(OBJEXT) csearchdialogresultview.$(OBJEXT) \
-#>- csearchdialogresult.$(OBJEXT) csearchdialogtext.$(OBJEXT) \
-#>- csearchdialogscope.$(OBJEXT) csearchdialogmodulechooser.$(OBJEXT)
-#>+ 9
+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) \
-csearchdialoganalysis.$(OBJEXT) csearchdialogresultview.$(OBJEXT) \
-csearchdialogresult.$(OBJEXT) csearchdialogtext.$(OBJEXT) \
-csearchdialogscope.$(OBJEXT) csearchdialogmodulechooser.$(OBJEXT)\
-csearchdialogresult.moc.o csearchdialog.moc.o csearchdialoganalysis.moc.o csearchdialogresultview.moc.o csearchdialogmodulechooser.moc.o csearchdialogscope.moc.o csearchdialogtext.moc.o  \
-libsearchdialog_a_meta_unload.o 
+	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)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
 
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+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
-KDE_DIST=csearchdialogresultview.h csearchdialogtext.h csearchdialogmodulechooser.h csearchdialogscope.h csearchdialoganalysis.h csearchdialog.h csearchdialogresult.h 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/csearchdialog.P .deps/csearchdialoganalysis.P \
-#>- .deps/csearchdialogmodulechooser.P .deps/csearchdialogresult.P \
-#>- .deps/csearchdialogresultview.P .deps/csearchdialogscope.P \
-#>- .deps/csearchdialogtext.P
-#>+ 10
-@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/csearchdialogresult.moc.P $(DEPDIR)/csearchdialog.moc.P $(DEPDIR)/csearchdialoganalysis.moc.P $(DEPDIR)/csearchdialogresultview.moc.P $(DEPDIR)/csearchdialogmodulechooser.moc.P $(DEPDIR)/csearchdialogscope.moc.P $(DEPDIR)/csearchdialogtext.moc.P $(DEPDIR)/libsearchdialog_a_meta_unload.P  $(DEPDIR)/libsearchdialog_a.all_cpp.P \
-	  .deps/csearchdialog.P .deps/csearchdialoganalysis.P \
-.deps/csearchdialogmodulechooser.P .deps/csearchdialogresult.P \
-.deps/csearchdialogresultview.P .deps/csearchdialogscope.P \
-.deps/csearchdialogtext.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/csearchdialogresult.moc.P $(DEPDIR)/csearchdialog.moc.P $(DEPDIR)/csearchdialoganalysis.moc.P $(DEPDIR)/csearchdialogresultview.moc.P $(DEPDIR)/csearchdialogmodulechooser.moc.P $(DEPDIR)/csearchdialogscope.moc.P $(DEPDIR)/csearchdialogtext.moc.P $(DEPDIR)/libsearchdialog_a_meta_unload.P   .deps/csearchdialog.P .deps/csearchdialoganalysis.P \
-.deps/csearchdialogmodulechooser.P .deps/csearchdialogresult.P \
-.deps/csearchdialogresultview.P .deps/csearchdialogscope.P \
-.deps/csearchdialogtext.P
-
+@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)
-OBJECTS = $(libsearchdialog_a_OBJECTS)
 
-#>- all: all-redirect
+#>- all: all-am
 #>+ 1
-all: docs-am  all-redirect
+all: docs-am  all-am
+
 .SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile
+.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: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
+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)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+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 *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
+@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)/'`$<
 
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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`
 
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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
@@ -359,288 +411,286 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 
-maintainer-clean-libtool:
+ETAGS = etags
+ETAGSFLAGS =
 
-libsearchdialog.a: $(libsearchdialog_a_OBJECTS) $(libsearchdialog_a_DEPENDENCIES)
-	-rm -f libsearchdialog.a
-	$(AR) cru libsearchdialog.a $(libsearchdialog_a_OBJECTS) $(libsearchdialog_a_LIBADD)
-	$(RANLIB) libsearchdialog.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
+CTAGS = ctags
+CTAGSFLAGS =
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+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
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-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)
 
-subdir = bibletime/frontend/searchdialog
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/frontend/searchdialog/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(LIBRARIES)
 
-install-data-am:
+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
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-#>- clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-moc-classes clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
+	@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
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
+#>- 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
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+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
-csearchdialogresult.moc.cpp: $(srcdir)/csearchdialogresult.h
-	$(MOC) $(srcdir)/csearchdialogresult.h -o csearchdialogresult.moc.cpp
+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
 
-#>+ 3
-csearchdialoganalysis.moc.cpp: $(srcdir)/csearchdialoganalysis.h
-	$(MOC) $(srcdir)/csearchdialoganalysis.h -o csearchdialoganalysis.moc.cpp
-
-#>+ 3
-csearchdialogresultview.moc.cpp: $(srcdir)/csearchdialogresultview.h
-	$(MOC) $(srcdir)/csearchdialogresultview.h -o csearchdialogresultview.moc.cpp
-
-#>+ 3
-csearchdialogmodulechooser.moc.cpp: $(srcdir)/csearchdialogmodulechooser.h
-	$(MOC) $(srcdir)/csearchdialogmodulechooser.h -o csearchdialogmodulechooser.moc.cpp
-
-#>+ 3
-csearchdialogscope.moc.cpp: $(srcdir)/csearchdialogscope.h
-	$(MOC) $(srcdir)/csearchdialogscope.h -o csearchdialogscope.moc.cpp
-
-#>+ 3
-csearchdialogtext.moc.cpp: $(srcdir)/csearchdialogtext.h
-	$(MOC) $(srcdir)/csearchdialogtext.h -o csearchdialogtext.moc.cpp
+#>+ 2
+mocs: csearchdialog.moc.cpp
 
 #>+ 3
 clean-metasources:
-	-rm -f  csearchdialogresult.moc.cpp csearchdialog.moc.cpp csearchdialoganalysis.moc.cpp csearchdialogresultview.moc.cpp csearchdialogmodulechooser.moc.cpp csearchdialogscope.moc.cpp csearchdialogtext.moc.cpp
+	-rm -f  csearchdialogpages.moc.cpp csearchdialog.moc.cpp
+
+#>+ 2
+KDE_DIST=csearchdialog.h csearchdialogpages.h 
 
 #>+ 2
 docs-am:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  bibletime/frontend/searchdialog/Makefile
 	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/searchdialog/Makefile.in
 
 
-#>+ 10
-libsearchdialog_a_meta_unload.cpp:  csearchdialogresult.moc.cpp csearchdialog.moc.cpp csearchdialogmodulechooser.moc.cpp csearchdialogresultview.moc.cpp csearchdialoganalysis.moc.cpp csearchdialogscope.moc.cpp csearchdialogtext.moc.cpp
-	@echo 'creating libsearchdialog_a_meta_unload.cpp'
-	@-rm -f libsearchdialog_a_meta_unload.cpp
-	@echo 'static const char * _metalist_libsearchdialog_a[] = {' > libsearchdialog_a_meta_unload.cpp
-	@cat  csearchdialogresult.moc.cpp csearchdialog.moc.cpp csearchdialogmodulechooser.moc.cpp csearchdialogresultview.moc.cpp csearchdialoganalysis.moc.cpp csearchdialogscope.moc.cpp csearchdialogtext.moc.cpp | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libsearchdialog_a_meta_unload.cpp
-	@echo '0};' >> libsearchdialog_a_meta_unload.cpp
-	@echo '#include <kunload.h>' >> libsearchdialog_a_meta_unload.cpp
-	@echo '_UNLOAD(libsearchdialog_a)' >> libsearchdialog_a_meta_unload.cpp
-
+#>+ 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
 
-#>+ 3
-clean-moc-classes:
-	-rm -f  libsearchdialog_a_meta_unload.cpp
 
 #>+ 11
-libsearchdialog_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/csearchdialog.cpp $(srcdir)/csearchdialoganalysis.cpp $(srcdir)/csearchdialogresultview.cpp $(srcdir)/csearchdialogresult.cpp $(srcdir)/csearchdialogtext.cpp $(srcdir)/csearchdialogscope.cpp $(srcdir)/csearchdialogmodulechooser.cpp libsearchdialog_a_meta_unload.cpp  csearchdialogresult.moc.cpp csearchdialog.moc.cpp csearchdialoganalysis.moc.cpp csearchdialogresultview.moc.cpp csearchdialogmodulechooser.moc.cpp csearchdialogscope.moc.cpp csearchdialogtext.moc.cpp
+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 csearchdialoganalysis.cpp csearchdialogresultview.cpp csearchdialogresult.cpp csearchdialogtext.cpp csearchdialogscope.cpp csearchdialogmodulechooser.cpp libsearchdialog_a_meta_unload.cpp  csearchdialogresult.moc.cpp csearchdialog.moc.cpp csearchdialoganalysis.moc.cpp csearchdialogresultview.moc.cpp csearchdialogmodulechooser.moc.cpp csearchdialogscope.moc.cpp csearchdialogtext.moc.cpp; do \
+	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; \
+	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
 
-#>+ 2
+#>+ 3
 final:
 	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_final_OBJECTS)" all-am
-#>+ 2
+
+#>+ 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) -f $(top_srcdir)/admin/Makefile.common 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
index fe1965a..7be6b1a 100644
--- a/bibletime/frontend/searchdialog/csearchdialog.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialog.cpp
@@ -1,9 +1,9 @@
 /***************************************************************************
-                       csearchdialog.cpp  -  description
+                          csearchdialog.cpp  -  description
                              -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
+    begin                : Die Jul 30 2002
+    copyright            : (C) 2002 by The BibleTime team
+    email                : info@bibletime.de
  ***************************************************************************/
 
 /***************************************************************************
@@ -16,275 +16,1233 @@
  ***************************************************************************/
 
 #include "csearchdialog.h"
-#include "csearchdialogmodulechooser.h"
-#include "csearchdialogtext.h"
-#include "csearchdialogresult.h"
-#include "csearchdialoganalysis.h"
-#include "csearchdialogscope.h"
-#include "frontend/chtmldialog.h"
-#include "backend/cswordmodulesearch.h"
+
+#include "backend/cswordkey.h"
 #include "backend/cswordversekey.h"
-#include "backend/cswordmoduleinfo.h"
-#include "frontend/ctoolclass.h"
+
 #include "frontend/cbtconfig.h"
-#include "resource.h"
 
-//KDE includes
-#include <kapp.h>
-#include <klocale.h>
-#include <kkeydialog.h>
-#include <kfontdialog.h>
-#include <kfiledialog.h>
-#include <kapp.h>
+#include "util/cresmgr.h"
+#include "util/ctoolclass.h"
 
-//QT includes
-#include <qlabel.h>
-#include <qframe.h>
-#include <qbutton.h>
-#include <qdict.h>
-#include <qlayout.h>
+//Qt includes
 #include <qhbox.h>
-#include <qvbox.h>
-#include <qgrid.h>
-#include <qhbuttongroup.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 <qcanvas.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;
 
-CSearchDialog::CSearchDialog( ListCSwordModuleInfo& modules, QWidget *parent, const char *name )
-	: KDialogBase(Tabbed, i18n("Search Dialog"), Close | User1 | User2, User1, parent, name,	false, true, i18n("Search"), i18n("Interrupt"), QString::null)
-{
-	setIcon(MODULE_SEARCH_ICON_SMALL);
+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();	
-	readSettings();	
-		
-	setModuleList( modules );
-	if (modules.count())
-		showPage(pageIndex(m_searchTextPage));		
+
+  initView();
+  initConnections();
 }
 
 CSearchDialog::~CSearchDialog(){
-	saveSettings();	
 }
 
-/** Reads the settings from the configfile */
-void CSearchDialog::readSettings(){
+/** 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);
+//  };  
 }
 
-/** Saves the settings to the config file */
-void CSearchDialog::saveSettings(){
+/** 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();
 }
 
-/** Initializs the view */
-void CSearchDialog::initView() {
+/** 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); 	
+}
 
-	m_moduleChooserPage 	= addVBoxPage(i18n("Choose modules"), i18n("Choose the modules for the search"));
-	m_moduleChooser			= new CSearchDialogModuleChooser(m_moduleChooserPage);
-	connect(m_moduleChooser, SIGNAL(chosenModulesChanged()), SLOT(chosenModulesChanged()));
- 	
-	m_searchTextPage = addVBoxPage(i18n("Search Text"), i18n("Enter the text to search for"));
-	m_searchText			= new CSearchDialogText(m_searchTextPage);
-	m_searchTextPage->setEnabled(false);
-	
-	m_searchResultPage = addHBoxPage(i18n("Search Result"), i18n("The result of your search"));
-	m_searchResult = new CSearchDialogResult(m_searchResultPage);
-	m_searchResultPage->setEnabled(false);
-	
-	m_searchAnalysisPage = addVBoxPage(i18n("Search Analysis"), i18n("Graphical analysis of your search result"));	
-	m_searchAnalysis = new CSearchDialogAnalysis(m_searchAnalysisPage);
-	m_searchAnalysisView =	new CSearchDialogAnalysisView(m_searchAnalysis, m_searchAnalysisPage);
-	m_searchAnalysisPage->setEnabled(false);
+void CSearchDialog::showModulesSelector() {
+  m_searchOptionsPage->chooseModules();
+}
 
-	m_searchAnalysisSaveButton = new QPushButton("Save Analysis to Disk", m_searchAnalysisPage);
+/** 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*)));
+}
 
-	connect(m_searchAnalysisSaveButton, SIGNAL(clicked()),
-		this, SLOT(slotSaveSearchAnalysis()));	
+/** 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));
 }
 
-ListCSwordModuleInfo& CSearchDialog::getModuleList() {
-//	ASSERT(moduleList);
-	m_moduleList = m_moduleChooser->getChosenModules();
-	return m_moduleList;
+/** Interrupts the search. */
+void CSearchDialog::interruptSearch(){
+  m_interruptedSearch = true;
+  m_searcher.interruptSearch();
+  m_searchOptionsPage->prepareSearch();
 }
 
-void CSearchDialog::setModuleList(ListCSwordModuleInfo& list) {
-  //if (m_moduleList != list) // this is an inefficient hack to allow compile on gcc3 ???WDG
-		m_moduleList = list; //copy the items of "list"
-	
-	m_moduleChooser->blockSignals(true);
-	m_moduleChooser->setChosenModules(m_moduleList);
-	m_moduleChooser->blockSignals(false);	
-	
-	m_searchTextPage->setEnabled(m_moduleList.count()>0);	
-	m_searchResult->clearResult();
-	m_searchAnalysis->reset();
+/** Resets the parts to the default. */
+void CSearchDialog::reset(){
+  m_searchOptionsPage->reset();
+  m_searchResultPage->reset();
+  showPage(m_index.optionsPage);
 }
 
-void CSearchDialog::slotSaveSearchAnalysis(){
- 	const QString file = KFileDialog::getSaveFileName(QString::null, QString::fromLatin1("*.html | %1").arg(i18n("HTML files")), 0, i18n("Save Search Analysis"));
-	if (!file.isNull()) {
-		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: thin solid black;}\nTH {font-size: 130%;text-align: left;vertical-align:top;}\n</style>\n");	
-		CSwordVerseKey key(0);
-		ListKey searchResult;
-		
-		key.key("Genesis 1:1");
-	
-		if (m_searchText->scopeChooser->getScopeType() != CSwordModuleSearch::Scope_NoScope) {
-			ListKey verses = m_searcher.scope();
-			for (int i = 0; i < verses.Count(); ++i) {
-				VerseKey* element = dynamic_cast<VerseKey*>(verses.GetElement(i));
-				if (element) {
-					VerseRange += QString("%1 - %2").arg(QString::fromLocal8Bit((const char*)element->LowerBound())).arg(QString::fromLocal8Bit((const char*)element->UpperBound())) + "<br>";
-				}
-			}
-		}
+/** 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();
+  };
+}
 
-		QDict<CSearchDialogAnalysisItem>* m_searchAnalysisItems = m_searchAnalysis->getSearchAnalysisItemList();
-		CSearchDialogAnalysisItem* analysisItem = m_searchAnalysisItems->find( key.book() );
-		
-    QString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + "</head>\n<body>\n";
-		text += "<table>\n<tr><th>" + i18n("Search Text :") + "</th><th>" + m_searchText->getText() + "</th></tr>\n";
-		text += "<tr><th>" + i18n("Search Type :") + "</th><th>" + m_searchText->getSearchTypeString() + "</th></tr>\n";
-		text += "<tr><th>" + i18n("Search Scope:") + "</th><th>" + ((m_searchText->scopeChooser->getScopeType() != CSwordModuleSearch::Scope_NoScope) ? VerseRange : m_searchText->scopeChooser->getScopeTypeString()) + "</th></tr>\n</table>\n<br>\n";
+/** 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);
+};
 
 
-	  tableTitle = "<tr><th align=\"left\">" + i18n("Book") + "</th>";
-		tableTotals = "<tr><td align=\"left\">" + i18n("Total Hits") + "</td>";
+/**************************/
+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) {
-				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_searchAnalysisItems->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);
+			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;
 		}
-		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.de/\">BibleTime</a></center>");
-		text += QString::fromLatin1("</body></html>");
-		CToolClass::savePlainFile(file, text);
+		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();
 }
 
-void CSearchDialog::slotUser1() {
-	startSearch();
+/** 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();
 }
 
-void CSearchDialog::slotUser2() {
-//	if (searcher->isSearching())
-	m_searcher.interruptSearch();
+/** 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();
 }
 
-void CSearchDialog::startSearch(void) {
-	int searchFlags = m_searchText->getSearchType();	
-	// set the parameters
-	m_searchText->updateCurrentProgress(0);
-	m_searchText->updateOverallProgress(0);
-	m_searchText->setText( m_searchText->getText() );
-		
-	m_searcher.setModules( getModuleList() );
-	m_searcher.setSearchedText(m_searchText->getText());
+/** 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];
+}
 
-	if (m_searchText->isCaseSensitive())
-		searchFlags |= CSwordModuleSearch::caseSensitive;
-	m_searcher.resetSearchScope();
-	CSwordModuleSearch::scopeType scopeType = m_searchText->scopeChooser->getScopeType();
+/** 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;
 	
-	if (scopeType == CSwordModuleSearch::Scope_LastSearch) {
-		searchFlags |= CSwordModuleSearch::useLastResult;
+	//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);
 	}
-	else if ( scopeType == CSwordModuleSearch::Scope_Bounds ) {
-		searchFlags |= CSwordModuleSearch::useScope;	
-		m_searcher.setSearchScope( m_searchText->scopeChooser->getScope() );
+	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)
+		);
 	}
-	m_searcher.setSearchOptions(searchFlags);
-	enableButton(User1,false);
-	enableButton(User2,true);
- 	m_searchAnalysis->reset();
- 	m_searchResult->clearResult();
- 		
-	m_searcher.startSearchThread();
+	ret += "</TABLE>";
+	return ret;
 }
 
-void CSearchDialog::setSearchText(const QString text){
-  m_searchText->setText(text);
-	if (!text.isEmpty())
-		showPage(pageIndex(m_searchTextPage));
+//------------------------------------------------------------------
+//------------------------------------------------------------------
+
+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 search text. If no text was entered return QString::null. */
-const QString CSearchDialog::getSearchedText() const {
-	return m_searchText->getText();
+/** Returns the sizeHint for this view */
+QSize CSearchAnalysisView::sizeHint(){
+	if ( parentWidget() )
+		return parentWidget()->sizeHint();
+	return QCanvasView::sizeHint();
 }
 
 /** No descriptions */
-void CSearchDialog::chosenModulesChanged(){
-	setModuleList(getModuleList());
+void CSearchAnalysisView::resizeEvent( QResizeEvent* e){
+	QCanvasView::resizeEvent(e);
+	canvas()->resize( canvas()->width(), viewport()->height() );
 }
 
-/** Reimplementation to show the "First time opened" dialog. */
-void CSearchDialog::show(){
-	KDialogBase::show();
+CSearchAnalysisView::ToolTip::ToolTip(QWidget* parent) : QToolTip(parent) {
+}
 
-	if ( CBTConfig::get(CBTConfig::firstSearchDialog) ){
-		CHTMLDialog dlg(HELPDIALOG_FIRSTTIME_SEARCH);
-		dlg.exec();
-		CBTConfig::set(CBTConfig::firstSearchDialog, false);
-	}			
+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);
 }
 
-/** No descriptions */
-void CSearchDialog::searchFinished(){
-//	qWarning("CSearchDialog::searchFinished()");
- 	m_searchText->updateCurrentProgress(100);
- 	m_searchText->updateOverallProgress(100);
- 	m_searchAnalysis->reset();
- 	if ( m_searcher.foundItems() ){
- 		m_searchResult->setModuleList(getModuleList());			
- 		m_searchAnalysis->setModuleList(getModuleList());
- 		m_searchAnalysisView->setContentsPos(0,0);
- 		m_searchResultPage->setEnabled(true);
- 		m_searchAnalysisPage->setEnabled(true);						
- 		showPage(pageIndex(m_searchResultPage));	//the result page
-						
- 		m_searchAnalysis->analyse();			
- 	}
- 	else
- 		m_searchResult->clearResult();
 
- 	enableButton(User2,false);
- 	enableButton(User1,true); 	
+/** 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 CSearchDialog::percentUpdate(){
-//	old_overallProgress = m_searcher.getPercent(CSwordModuleSearch::currentModule);
-	m_searchText->updateOverallProgress(m_searcher.getPercent(CSwordModuleSearch::allModules));
-	
-//	old_currentProgress = m_searcher.getPercent(CSwordModuleSearch::currentModule);
-	m_searchText->updateCurrentProgress(m_searcher.getPercent(CSwordModuleSearch::currentModule));
-	KApplication::kapp->processEvents();
+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
index ae7a332..c54dae6 100644
--- a/bibletime/frontend/searchdialog/csearchdialog.h
+++ b/bibletime/frontend/searchdialog/csearchdialog.h
@@ -1,9 +1,9 @@
 /***************************************************************************
-                        csearchdialog.h  -  description
+                          csearchdialog.h  -  description
                              -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
+    begin                : Die Jul 30 2002
+    copyright            : (C) 2002 by The BibleTime team
+    email                : info@bibletime.de
  ***************************************************************************/
 
 /***************************************************************************
@@ -15,122 +15,446 @@
  *                                                                         *
  ***************************************************************************/
 
-/* $HEADER	*/
-/* $REVISION	*/
-
 #ifndef CSEARCHDIALOG_H
 #define CSEARCHDIALOG_H
 
 //BibleTime includes
+#include "csearchdialogpages.h"
+
 #include "backend/cswordmoduleinfo.h"
+#include "backend/cswordbackend.h"
 #include "backend/cswordmodulesearch.h"
-#include "frontend/cpointers.h"
 
-//QT includes
+#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>
-#include <kaccel.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();
 
-class QPushButton;
-class QHBox;
-class QVBox;
-class QGrid;
-class	CSearchDialogModuleChooser;
-class	CSearchDialogText;
-class	CSearchDialogScopeEdit;
-class	CSearchDialogResult;
-class CSearchDialogAnalysis;
-class CSearchDialogAnalysisView;
+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();  
 
-class CSwordModuleInfo;
-class CSwordModuleSearch;
+private:
+  KListView* m_rangeList;
+  KListView* m_resultList;
+  QLineEdit* m_nameEdit;
+  QTextEdit* m_rangeEdit;
+  QPushButton* m_newRangeButton;
+  QPushButton* m_deleteRangeButton;
+};
 
 /**
-	* The searchdialog of BibleTime
+	* CSearchDialogAnaylsis shows the graphical analysis of the search result.
   * @author The BibleTime Team
   */
-class CSearchDialog : public KDialogBase, public CPointers  {
+class CSearchAnalysis : public QCanvas {
    Q_OBJECT
-public:
-	/**
-	* The constructor of the CSearchDialog class.
-	* @param parent The widget this dialog is centered on
-	* @param name The name of this Qt widget
-	*/
-	CSearchDialog(ListCSwordModuleInfo& modules,QWidget *parent=0, const char *name=0 );
-	~CSearchDialog();
-	/**
-	*
-	*/
-	ListCSwordModuleInfo& getModuleList();
-	/**
-	* Sets the module list for this dialog.
-	* The module lsit contains the modules where we should search in
-	*/
-	void setModuleList(ListCSwordModuleInfo&);
-	/**
-	* Sets the text we should search in the modules
-	*/
-	void setSearchText(const QString);
-	/**
-	* Reimplementation from Qt.
-	* This is used to refresh the progres bars
-	* and to switch to the resultpage if the search was finished.
+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.
 	*/
-//  virtual void timerEvent(QTimerEvent *e);
+  void analyse(ListCSwordModuleInfo modules);
   /**
- 	* Returns the search text. If no text was enetered return QSTring::null.
+  * 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
  	*/
-  const QString getSearchedText() const;
-	void startSearch();
-	
-protected: // Protected methods
+ 	QDict<CSearchAnalysisItem>* getSearchAnalysisItemList();
+  void reset();
+
+protected slots: // Protected slots
   /**
- 	* Initializs the view
- 	*/
-  void initView();
+  * No descriptions
+  */
+  void slotResized();
+
+protected:
+  void setModules(ListCSwordModuleInfo modules);
+
+private:
   /**
- 	* Reads the settings from the configfile
- 	*/
-  void readSettings();
+  * 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:	
 	/**
-	* Saves the settings of this widget to the config file
+	* Standard constructor.
 	*/
-  void saveSettings();
+	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:
-	friend class CSearchDialogResult;
-	QVBox* m_moduleChooserPage;	
-	QVBox* m_searchTextPage;
-	QHBox* m_searchResultPage;
-	QVBox* m_searchAnalysisPage;
-	CSearchDialogModuleChooser *m_moduleChooser;	
-	CSearchDialogText	*m_searchText;
-	CSearchDialogResult	*m_searchResult;
-	CSearchDialogAnalysis* m_searchAnalysis;
-	CSearchDialogAnalysisView* 	m_searchAnalysisView;
-	CSwordModuleSearch m_searcher;
-	ListCSwordModuleInfo m_moduleList;
-//	int old_overallProgress;
-//	int old_currentProgress;
+  virtual void draw (QPainter & painter);	
+	
+	ListCSwordModuleInfo* m_moduleList;	
+	double *m_scaleFactor;
+	QString m_bookName;
+ 	int m_moduleCount;
+ 	QMemArray<int> m_resultCountArray;
+ 	QPixmap* m_bufferPixmap;
+};
 
-	QPushButton* m_searchAnalysisSaveButton;
+class CSearchAnalysisLegendItem : public QCanvasRectangle  {
 
-private slots: // Private slots
-  void chosenModulesChanged();
-	virtual void slotUser1();
-	virtual void slotUser2();
-	void slotSaveSearchAnalysis();
-  void searchFinished();
-  void percentUpdate();
+public:	
+	CSearchAnalysisLegendItem(QCanvas* parent, ListCSwordModuleInfo* list );
 
-public slots: // Public slots
+private:
+  virtual void draw (QPainter & painter);
+  ListCSwordModuleInfo* m_moduleList;
+};
+
+//----------------------------------------------------------
+//----------------------------------------------------------
+class CSearchAnalysisView : public QCanvasView  {
+   Q_OBJECT
+public:
+	/**
+	* Standard constructor
+	*/
+	CSearchAnalysisView(QCanvas* canvas, QWidget* parent);
   /**
-  * Reimplementation to show the "First time opened" dialog.
+  * Returns the sizeHint for this view
+  * We give back the size of the parent widgetas default.
+  * This is a reimplementation from QCanvasView::sizeHint().
   */
-  virtual void show();
+  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/csearchdialoganalysis.cpp b/bibletime/frontend/searchdialog/csearchdialoganalysis.cpp
deleted file mode 100644
index fa0784a..0000000
--- a/bibletime/frontend/searchdialog/csearchdialoganalysis.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/***************************************************************************
-                          csearchdialoganalysis.cpp  -  description
-                             -------------------
-    begin                : Sat Mar 4 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 "csearchdialoganalysis.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordcommentarymoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordbackend.h"
-#include "frontend/ctoolclass.h"
-#include "csearchdialog.h"
-#include "whatsthisdef.h"
-
-//QT includes
-#include <qpixmap.h>
-#include <qdatetime.h>
-#include <qlist.h>
-#include <qpicture.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qrect.h>
-#include <qpoint.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qstring.h>
-
-//KDE includes
-#include <kfiledialog.h>
-#include <klocale.h>
-#include <kapp.h>
-
-//Sword includes
-#include <swkey.h>
-#include <swmodule.h>
-#include <versekey.h>
-
-//library includes
-#include <iostream.h>
-
-//our defines
-#define SPACE_BETWEEN_PARTS 5
-#define RIGHT_BORDER 15
-#define LEFT_BORDER 15
-#define LOWER_BORDER 10
-#define UPPER_BORDER 10
-
-#define ITEM_TEXT_SIZE 8
-#define LABEL_TEXT_SIZE 6
-
-//used for the shift between the bars
-#define BAR_DELTAX 4
-#define BAR_DELTAY 2
-#define BAR_WIDTH 2+2*BAR_DELTAX  //should be equal or bigger than the label font size
-//used for the text below the bars
-#define BAR_LOWER_BORDER 100
-
-#define LEGEND_INNER_BORDER 5
-#define LEGEND_DELTAY 4
-#define LEGEND_WIDTH 85
-
-CSearchDialogAnalysis::CSearchDialogAnalysis(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()));
-}
-
-CSearchDialogAnalysis::~CSearchDialogAnalysis(){
-//  qWarning("CSearchDialogAnalysis::~CSearchDialogAnalysis()");
-  reset(); // deletes the legend and the items
-}
-
-QDict<CSearchDialogAnalysisItem>* CSearchDialogAnalysis::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 CSearchDialogAnalysis::analyse(){
-	qDebug("void CSearchDialogAnalysis::analyse()");
-  /**
-	* 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
-	*/
-	m_lastPosList.clear();		
-	const int numberOfModules = m_moduleList.count();
-	if (!numberOfModules)
-		return;	
-	m_legend = new CSearchDialogAnalysisLegendItem(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");	
-	
-	CSearchDialogAnalysisItem* 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 CSearchDialogAnalysis::setModuleList(ListCSwordModuleInfo& modules){
-//	ASSERT(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();
-	CSearchDialogAnalysisItem* analysisItem = 0;	
-	CSwordVerseKey key(0);	
-	key.key("Genesis 1:1");
-	do {
-   	analysisItem = new CSearchDialogAnalysisItem(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 CSearchDialogAnalysis::reset(){
-	m_scaleFactor = 0.0;
-  QDictIterator<CSearchDialogAnalysisItem> 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 CSearchDialogAnalysis::slotResized(){
-	m_scaleFactor = (double)( (double)(height()-UPPER_BORDER-LOWER_BORDER-BAR_LOWER_BORDER-(m_moduleList.count()-1)*BAR_DELTAY)
-	                                    /(double)m_maxCount);	
-	QDictIterator<CSearchDialogAnalysisItem> 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 CSearchDialogAnalysis::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 CSearchDialogAnalysis::getCount( const QString book, CSwordModuleInfo* module ){
-	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);
-//	m_lastPosList.replace(module,i);
-	return count;
-}
-
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchDialogAnalysisItem::CSearchDialogAnalysisItem(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;
-}
-
-CSearchDialogAnalysisItem::~CSearchDialogAnalysisItem() {
-//	qWarning("CSearchDialogAnalysisItem::~CSearchDialogAnalysisItem()");
-//	if (m_bufferPixmap)
-		delete m_bufferPixmap;
-}
-
-/** Sets the resultcount of this item for the given module */
-void CSearchDialogAnalysisItem::setCountForModule( const int moduleIndex, const int count) {
-	m_resultCountArray[moduleIndex] = count;
-}
-
-/** Returns the resultcount of this item for the given module */
-int CSearchDialogAnalysisItem::getCountForModule( const int moduleIndex) {
-	return m_resultCountArray[moduleIndex];
-}
-
-/** Reimplementation. Draws the content of this item. */
-void CSearchDialogAnalysisItem::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 widt 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,
-    		          height()+(int)y()-BAR_LOWER_BORDER-(m_moduleCount-drawn)*BAR_DELTAY);
-    		QPoint p2((int)p1.x() + BAR_WIDTH,
-    		          (int)(p1.y() - (!m_resultCountArray[index] ? 0 : ((m_resultCountArray[index])*(*m_scaleFactor))) ));
-    		QRect r(p1, p2);
-    		painter.fillRect(r, QBrush(CSearchDialogAnalysis::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(),height()+(int)y()-BAR_LOWER_BORDER), *m_bufferPixmap);
-}
-
-/** Returns the width of this item. */
-int CSearchDialogAnalysisItem::width(){
-	return m_moduleCount*(m_moduleCount>1 ? BAR_DELTAX : 0) + BAR_WIDTH;	
-}
-
-/** Returns the tooltip for this item. */
-const QString CSearchDialogAnalysisItem::getToolTip(){
-	QString ret = QString::fromLatin1("<CENTER><B>%1</B></CENTER><HR>").arg(m_bookName);
-	ret.append("<TABLE CELLPADDING=\"3\" WIDTH=\"100%\" ALIGN=\"center\">");
-	for (int i = 0; i < m_moduleCount; ++i) {
-		CSwordModuleInfo* info = m_moduleList->at(i);
-		const QColor c = CSearchDialogAnalysis::getColor(i);
-		ret.append(
-			QString::fromLatin1("<TR BGCOLOR=\"white\"><TD><B><FONT COLOR=\"#%1\">%2</FONT></B></TD><TD>%3</TD></TR>")
-				.arg(QString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
-				.arg(info ? info->name() : QString::null)
-				.arg(m_resultCountArray[i])
-		);
-	}
-	ret.append("</TABLE>");			
-	return ret;
-}
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchDialogAnalysisView::CSearchDialogAnalysisView(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 CSearchDialogAnalysisView::sizeHint(){
-	if ( parentWidget() )
-		return parentWidget()->sizeHint();
-	return QCanvasView::sizeHint();
-}
-
-/** No descriptions */
-void CSearchDialogAnalysisView::resizeEvent( QResizeEvent* e){
-	QCanvasView::resizeEvent(e);
-	canvas()->resize( canvas()->width(), viewport()->height() );
-}
-
-CSearchDialogAnalysisView::ToolTip::ToolTip(QWidget* parent) : QToolTip(parent) {
-}
-
-void CSearchDialogAnalysisView::ToolTip::maybeTip(const QPoint& p) {
-	CSearchDialogAnalysisView* view = dynamic_cast<CSearchDialogAnalysisView*>(parentWidget());
-	if (!view)
-		return;
-	QPoint point(p);
-	point = view->viewport()->mapFrom(view, point);
-	CSearchDialogAnalysisItem* 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. */
-CSearchDialogAnalysisItem* CSearchDialogAnalysisView::itemAt( const QPoint& p ){
-	QCanvasItemList l = canvas()->collisions(p);
-	if (!l.count())
-		return 0;
-	return dynamic_cast<CSearchDialogAnalysisItem*>(l.first());	
-}
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchDialogAnalysisLegendItem::CSearchDialogAnalysisLegendItem(QCanvas *parent, ListCSwordModuleInfo *list )
-	: QCanvasRectangle(parent) {
-	m_moduleList = list;
-}
-
-/** Reimplementation. Draws the content of this item. */
-void CSearchDialogAnalysisLegendItem::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( (int)p1.x() + ITEM_TEXT_SIZE, (int)p1.y() + ITEM_TEXT_SIZE);
- 	  QRect r(p1,p2);
- 		painter.fillRect(r, QBrush(CSearchDialogAnalysis::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();
-}
diff --git a/bibletime/frontend/searchdialog/csearchdialoganalysis.h b/bibletime/frontend/searchdialog/csearchdialoganalysis.h
deleted file mode 100644
index 1b1b61c..0000000
--- a/bibletime/frontend/searchdialog/csearchdialoganalysis.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/***************************************************************************
-                          csearchdialoganalysis.h  -  description
-                             -------------------
-    begin                : Sat Mar 4 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 CSEARCHDIALOGANALYSIS_H
-#define CSEARCHDIALOGANALYSIS_H
-
-//BibleTime includes
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qcanvas.h>
-#include <qarray.h>
-#include <qdict.h>
-#include <qtooltip.h>
-
-class QPixmap;
-class QString;
-
-class CSearchDialog;
-class CSearchDialogAnalysisItem;
-class CSearchDialogAnalysisLegendItem;
-
-/**
-	* CSearchDialogAnaylsis shows the graphical analysis of the search result.
-  * @author The BibleTime Team
-  */
-class CSearchDialogAnalysis : public QCanvas {
-   Q_OBJECT
-public:	
-	CSearchDialogAnalysis(QObject *parent=0, const char *name=0);
-  virtual ~CSearchDialogAnalysis();
-  /**
-  * Sets the module list used for the analysis.
-  */
-  void setModuleList(ListCSwordModuleInfo&);
-  /**
-  * Starts the analysis of the search result.
-	* This should be called only once because
-	*	QCanvas handles the updates automatically.
-	*/
-  void analyse();
-  /**
-  * Sets back the items and deletes things to cleanup
-  */
-  void reset();
-  /**
-  * 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<CSearchDialogAnalysisItem>* getSearchAnalysisItemList();
-
-
-protected slots: // Protected slots
-  /**
-  * No descriptions
-  */
-  void slotResized();
-
-private:
-  /**
-  * Returns the count of the book in the module
-  */
-  const unsigned int getCount( const QString book, CSwordModuleInfo* module );
-	
-	ListCSwordModuleInfo m_moduleList;
- 	QDict<CSearchDialogAnalysisItem> m_canvasItemList;
- 	QMap<CSwordModuleInfo*,unsigned int> m_lastPosList; 	
-  int m_maxCount;
-  double m_scaleFactor;
-  CSearchDialogAnalysisLegendItem* m_legend;
-
-};
-
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-
-/** Paints the bars for one book for one or more modules
-	*
-	*/
-class CSearchDialogAnalysisItem : public QCanvasRectangle  {
-public:	
-	/**
-	* Standard constructor.
-	*/
-	CSearchDialogAnalysisItem(QCanvas* parent, const int moduleCount, const QString& bookname, double *scaleFactor, ListCSwordModuleInfo* modules);
-	virtual ~CSearchDialogAnalysisItem();	
-  /**
-  * 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;
- 	QArray<int> m_resultCountArray;
- 	QPixmap* m_bufferPixmap;
-};
-
-class CSearchDialogAnalysisLegendItem : public QCanvasRectangle  {
-
-public:	
-	CSearchDialogAnalysisLegendItem(QCanvas* parent, ListCSwordModuleInfo* list );
-
-private:
-  virtual void draw (QPainter & painter);
-  ListCSwordModuleInfo* m_moduleList;
-};
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-class CSearchDialogAnalysisView : public QCanvasView  {
-   Q_OBJECT
-public:
-	/**
-	* Standard constructor
-	*/
-	CSearchDialogAnalysisView(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.
-	*/
-  CSearchDialogAnalysisItem* 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/csearchdialogmodulechooser.cpp b/bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp
deleted file mode 100644
index b098624..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogmodulechooser.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-
-/***************************************************************************
-                          csearchdialogmodulechooser.cpp  -  description
-                             -------------------
-    begin                : Fri Mar 30 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's includes
-#include "csearchdialogmodulechooser.h"
-
-#include "backend/cswordbackend.h"
-#include "frontend/groupmanager/cgroupmanager.h"
-#include "frontend/groupmanager/cgroupmanageritem.h"
-#include "frontend/ctoolclass.h"
-#include "whatsthisdef.h"
-#include "tooltipdef.h"
-
-//Qt includes
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtoolbutton.h>
-#include <qlist.h>
-#include <qlistbox.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kiconloader.h>
-
-CSearchDialogModuleChooser::CSearchDialogModuleChooser(QWidget *parent, const char *name ) : QWidget(parent,name) {
-	m_initialized = false;
-	
-	m_moduleList = 0;
-//	m_itemsDict.setAutoDelete(false);
-
-	QVBoxLayout* mainLayout = new QVBoxLayout(this);
-	
-	mainLayout->addWidget(CToolClass::explanationLabel(this, i18n("Choose modules"), i18n("Choose the module you want to use for the search. The tree on the left contains all available modules, the tree on the right the modules for the search. Use the two arrow buttons to add or remove modules from the right tree.")));
-  mainLayout->addSpacing(5);
-
-	QHBoxLayout* chooserLayout = new QHBoxLayout();
-	  		
-	m_moduleIndex = new CGroupManager(this, "module index", &backend()->moduleList(), false, false, false, false, false, false);	
-	QWhatsThis::add(m_moduleIndex, WT_SD_MODULECHOOSER);
-	
-	m_moduleList = new QListBox(this);
-	QWhatsThis::add(m_moduleList, WT_SD_MC_MODULELIST);
-
-	QVBoxLayout* buttonLayout = new QVBoxLayout();
-	
-	QToolButton* addButton = new QToolButton(this);
-	addButton->setOnIconSet(SmallIcon("forward"));
-	addButton->setOffIconSet(SmallIcon("forward"));	
-	addButton->setFixedSize( addButton->sizeHint() );	
-	QWhatsThis::add(addButton, WT_SD_MC_ADD_MODULE);
-	QToolTip::add(addButton, TT_SD_MC_ADD_MODULE);
-	connect( addButton, SIGNAL(clicked()), SLOT(addCurrentItem()));
-
-	QToolButton* removeButton = new QToolButton(this);
-	removeButton->setOnIconSet(SmallIcon("back"));
-	removeButton->setOffIconSet(SmallIcon("back"));	
-	removeButton->setFixedSize( removeButton->sizeHint() );
-	QToolTip::add(removeButton, TT_SD_MC_REMOVE_MODULE);
-	QWhatsThis::add(removeButton, WT_SD_MC_REMOVE_MODULE);	
-	connect(removeButton, SIGNAL(clicked()), SLOT(removeCurrentItem()));
-	
-	buttonLayout->addWidget(addButton,0);
-	buttonLayout->addSpacing(5);
-	buttonLayout->addWidget(removeButton,0);
-	buttonLayout->addStretch(5);
-		
-	chooserLayout->addWidget(m_moduleIndex,2);
-	chooserLayout->addLayout(buttonLayout,0);
-	chooserLayout->addWidget(m_moduleList,2);
-
-	mainLayout->addLayout(chooserLayout);	
-	
-	QListViewItem* child = m_moduleIndex->firstChild();
-	while (child) {
-		QListViewItem* nextChild = child->nextSibling();
-		if (child->childCount())
- 			child->setOpen(true);
- 		else {
- 			CGroupManagerItem* i = (CGroupManagerItem*)child;
- 			if (i && (i->type() == CGroupManagerItem::Group)) {
-				if (m_moduleIndex->isChild(child, nextChild)) {						
-					delete child;
-					nextChild = m_moduleIndex->firstChild();
-				}
-				else
-					delete child;
- 			}
- 		}
-		child = nextChild;
-	}
-	m_initialized = true;
-}
-
-CSearchDialogModuleChooser::~CSearchDialogModuleChooser(){
-}
-
-/** Sets the chosen modules for this object. */
-void CSearchDialogModuleChooser::setChosenModules(ListCSwordModuleInfo& modules){
-//	if (!modules.coun)
-//		return;
-	if (getChosenModules() == modules)
-		return;
-		
-	m_moduleList->clear();
-	m_itemsDict.clear();	
-	m_moduleIndex->clear();
-	m_moduleIndex->readSettings();	
-
-	for (modules.first(); modules.current(); modules.next()) {
-		const QString module = modules.current()->name();
-		QListViewItemIterator it( m_moduleIndex );
-		for ( ; it.current(); ++it )
-			if (it.current()->text(0) == module) {
-				m_moduleIndex->setCurrentItem(it.current());
-				m_moduleIndex->setSelected(it.current(), true);
-				addCurrentItem();
-			}
-	}
-}
-
-/** Returns the modules chosen in this widget. */
-ListCSwordModuleInfo CSearchDialogModuleChooser::getChosenModules(){
-	ListCSwordModuleInfo modules;
-	for (unsigned int i=0; i < m_moduleList->count(); ++i) {
-		CSwordModuleInfo* m = backend()->findModuleByName(m_moduleList->text(i));
-		if (m)
-			modules.append(m);
-	}	
-	return modules;
-}
-
-/** Adds the selected item to the list */
-void CSearchDialogModuleChooser::addCurrentItem(){
-	CGroupManagerItem* i = dynamic_cast<CGroupManagerItem*>(m_moduleIndex->selectedItem());
-	QListViewItem* nextItem = 0;
-	if (i)
-		nextItem = i->itemBelow();
-	if (i && !nextItem)
-		nextItem = i->itemAbove();
-
-	if ( i && (i->type() == CGroupManagerItem::Module) && i->moduleInfo() ) {
-		m_moduleList->insertItem( CToolClass::getIconForModule(i->moduleInfo()), i->moduleInfo()->name(),-1 );
-		QListViewItem* parentItem = i->parent();
-		m_itemsDict.insert(i, parentItem ? (const char*)parentItem->text(0).latin1() : "");//I don't know why .local8Bit() doesn't work
-		parentItem ? parentItem->takeItem(i) : m_moduleIndex->takeItem(i);			
-		
-		if (nextItem)
-			m_moduleIndex->setSelected(nextItem, true);
-	}
-	if (m_initialized)
-		emit chosenModulesChanged();
-}
-
-/** Removes the selected item from the module list */
-void CSearchDialogModuleChooser::removeCurrentItem(){
-	if (!m_itemsDict.count())
-		return;		
-	QString text = QString::null;
-	if (m_moduleList->currentItem() != -1) {
-		text = m_moduleList->text(m_moduleList->currentItem());
-		const int currentItem = m_moduleList->currentItem();
-		int newIndex = currentItem;
-		
-		if (currentItem+1 < (int)m_moduleList->count())
-			newIndex = currentItem+1;
-		else
-			newIndex = currentItem-1;		
-		m_moduleList->removeItem(m_moduleList->currentItem());
-		if (newIndex != -1)
-			m_moduleList->setSelected(newIndex, true);
-	}
-	else
-		return;
-
-	QPtrDictIterator<char> m_it( m_itemsDict ); // iterator for dict
-	while ( m_it.current() ) {
-		QString parentName = QString::fromLatin1(m_it.current());
-		CGroupManagerItem* item = (CGroupManagerItem*)m_it.currentKey();
-		if (item && item->text(0) == text) {
-			CGroupManagerItem* folder = 0;
-	    QListViewItemIterator l_it( m_moduleIndex );
-			for ( ; l_it.current(); ++l_it ) {
-				folder = dynamic_cast<CGroupManagerItem*>(l_it.current());
-				if (folder && folder->text(0) == parentName)
-					break;
-			}
-			if (folder)
-				folder->insertItem(item);
-			else
-				m_moduleIndex->insertItem(item);
-			m_itemsDict.remove(item);
-			break;
-		}
-		++m_it;
-	}			
-	if (m_initialized)
-		emit chosenModulesChanged();
-}
diff --git a/bibletime/frontend/searchdialog/csearchdialogmodulechooser.h b/bibletime/frontend/searchdialog/csearchdialogmodulechooser.h
deleted file mode 100644
index c9b170a..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogmodulechooser.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************
-                          csearchdialogmodulechooser.h  -  description
-                             -------------------
-    begin                : Fri Mar 30 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 CSEARCHDIALOGMODULECHOOSER_H
-#define CSEARCHDIALOGMODULECHOOSER_H
-
-#include "backend/cswordmoduleinfo.h"
-#include "frontend/cpointers.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qptrdict.h>
-
-class CGroupManager;
-class QListBox;
-
-/** A widget to select the modules in which you want to search.
-  * @author The BibleTime team
-  */
-class CSearchDialogModuleChooser : public QWidget, public CPointers  {
-   Q_OBJECT
-public: 
-	CSearchDialogModuleChooser(QWidget *parent, const char *name=0);
-	~CSearchDialogModuleChooser();
-  /**
-  * Sets the chosen modules for this object.
-  */
-  void setChosenModules( ListCSwordModuleInfo& modules );
-  /**
-  * Returns the modules chosen in this widget.
-  */
-  ListCSwordModuleInfo getChosenModules();
-
-private:
-	CGroupManager* m_moduleIndex;
-	QListBox* m_moduleList;
-	QPtrDict<char> m_itemsDict;
-	bool m_initialized;
-	
-private slots: // Private slots
-  /**
-  * Removes the selected item from the module list
-  */
-  void removeCurrentItem();
-  /**
-  * Adds the selected item to the list
-  */
-  void addCurrentItem();
-
-signals: // Signals
-  /**
-  * No descriptions
-  */
-  void chosenModulesChanged();
-};
-
-#endif
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
new file mode 100644
index 0000000..ac4eb3c
--- /dev/null
+++ b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
@@ -0,0 +1,851 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..8dd9fb2
--- /dev/null
+++ b/bibletime/frontend/searchdialog/csearchdialogpages.h
@@ -0,0 +1,336 @@
+/***************************************************************************
+                          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/frontend/searchdialog/csearchdialogresult.cpp b/bibletime/frontend/searchdialog/csearchdialogresult.cpp
deleted file mode 100644
index 0373527..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogresult.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/***************************************************************************
-                      csearchdialogresult.cpp  -  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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-//BIbleTime includes
-#include "../../backend/cswordmodulesearch.h"
-#include "../../whatsthisdef.h"
-#include "csearchdialog.h"
-#include "csearchdialogtext.h"
-#include "csearchdialogresult.h"
-#include "csearchdialogresultview.h"
-#include "../ctoolclass.h"
-#include "../cbtconfig.h"
-
-//Qt includes
-#include <qpixmap.h>
-#include <qregexp.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qheader.h>
-#include <qstringlist.h>
-#include <qwidget.h>
-#include <qsplitter.h>
-
-// KDE includes
-#include <klocale.h>
-#include <kstringhandler.h>
-
-CSearchDialogResult::CSearchDialogResult(QWidget *parent, const char *name) : QWidget(parent, name) {	
-	
-	QHBoxLayout* l = new QHBoxLayout(this);
-	m_splitter = new QSplitter(Qt::Vertical, this, "result splitter");	
-	l->addWidget(m_splitter);
-	
-	QWidget* d = new QWidget(m_splitter);
-	QHBoxLayout* main_layout = new QHBoxLayout(d);	
-	QLabel *label1 = new QLabel(d, "label1");
-	label1->setText( i18n( "Modules:" ) );
-	label1->setAutoResize(true);
-	QLabel* label2 = new QLabel(d, "label2");
-	label2->setText( i18n("Entries found:") );
-	label2->setAutoResize(true);
-
-	resultModuleTree = new CSearchDialogResultModuleView(d, "resultModuleTree");
-	resultTree = new CSearchDialogResultView( d, "resultTree");
-
-	html_widget = new CHTMLWidget(true, m_splitter, "html_widget");
-	html_widget->setMinimumHeight(80);
-
-	connect(resultModuleTree, SIGNAL(moduleSelected(CSwordModuleInfo*)), resultTree, SLOT(setModule(CSwordModuleInfo*)));
-	connect(resultTree, SIGNAL(keySelected(const QString)), this, SLOT(updatePreview(const QString)));
-
-	QVBoxLayout* layout_1 = new QVBoxLayout();
-	QVBoxLayout* layout_2 = new QVBoxLayout();	
-		
-	layout_1->addWidget(label1);
-	layout_1->addWidget(resultModuleTree);
-	
-	layout_2->addWidget(label2);
-	layout_2->addWidget(resultTree, 5);
-	
-	main_layout->addLayout(layout_1);
-	main_layout->addSpacing(2);
-	main_layout->addLayout(layout_2);
-}
-
-void CSearchDialogResult::setModuleList(ListCSwordModuleInfo&	modules) {
-	moduleList = modules;
-	
-	resultModuleTree->setModuleList(moduleList);
-	resultModuleTree->clear();
-	resultModuleTree->setupTree();	
-	
-	resultTree->clear();
-}
-
-
-/** preview items data in the HTML previewer */
-void CSearchDialogResult::updatePreview(const QString newText) {
-	qDebug("CSearchDialogResult::updatePreview(const QString newText) ");
-	QString text = newText;
-	//find text page
-	QString searchedText;
-	CSearchDialogText* textPart = 0;
-	for (QObject* w = parent(); w; w = w->parent()) {
-		if (w->isA("CSearchDialog")) {
-			CSearchDialog*	dlg = dynamic_cast<CSearchDialog*>(w);
-			searchedText = dlg->getSearchedText().stripWhiteSpace();
-			textPart = dlg->m_searchText;
-			break;
-		}		
-	}
-	
-	const QString part1( "<font color=\"red\"><b>");
-	const QString part2("</b></font>");
-	const int insertLength(part1.length()+part2.length());
-
- 	int searchType(textPart->getSearchType());
-  if (searchType & CSwordModuleSearch::exactPhrase) {
-		for (int pos = 0 ; pos != -1;){
- 			pos = text.find(searchedText,pos,textPart->isCaseSensitive());
- 			if (pos!=-1 && !CToolClass::inHTMLTag(pos, text)) {	//something was found
- 				text.insert(pos + searchedText.length(),part2);			
- 				text.insert(pos, part1);
- 				pos += searchedText.length() + insertLength;
- 			}
- 		}
- 	}
- 	else if (searchType & CSwordModuleSearch::multipleWords) {
- 		QStringList searchedWords;		
- 		int wordIndex = 0;
- 		QString word = QString::null;
- 		while (!(word = KStringHandler::word(searchedText, wordIndex)).isEmpty()) {
- 			searchedWords.append(word);
- 			++wordIndex;
- 		}
-
- 		QString currentWord;
- 		for (unsigned int i=0; i < searchedWords.count(); i++) {
- 			currentWord = searchedWords[i];
- 			int count = text.contains(currentWord, textPart->isCaseSensitive());	
- 			int pos = 0;			
- 			int i2 = 0;
- 			while (i2 < count) {
- 				pos = text.find(currentWord,pos?pos+1:0, textPart->isCaseSensitive());
- 				if (pos!=-1 && !CToolClass::inHTMLTag(pos, text)) {	//something was found
-
- 					text.insert(pos + currentWord.length(), part2);
- 					text.insert(pos, part1);
- 						
- 					pos += currentWord.length() + insertLength;
- 				}
- 				++i2;
- 			}
- 		}
- 	}
- 	else if (searchType & CSwordModuleSearch::regExp) {
- 		QRegExp regExp(searchedText);
- 		regExp.setCaseSensitive( textPart->isCaseSensitive() );
- 		int matchLength = 0;
-		for (int pos = 0; pos != -1;){
- 			pos = regExp.match(text,pos,&matchLength);
- 			if (pos!=-1 && matchLength > 0 && !CToolClass::inHTMLTag(pos, text)) {
- 					text.insert(pos + matchLength, part2);
- 					text.insert(pos, part1);
- 					pos += matchLength + insertLength;
- 			}
- 		}			
- 	}
-
-	//module is Unicode-based
-	if (resultModuleTree->getCurrentModule()->isUnicode() ) {
-		const QFont f = CBTConfig::get( CBTConfig::unicode);
-		text = QString::fromLatin1("<FONT FACE=\"%1\" SIZE=\"%2\">%3</FONT>").arg(f.family()).arg(f.pointSize()).arg(text);
-	}
-	html_widget->setText(
-		QString::fromLatin1("<HTML><HEAD></HEAD><BODY><FONT color=\"red\">%1 </FONT><SMALL>(%2)</SMALL><BR><HR>%3</BODY></HTML>")
-		 .arg(resultTree->currentText())
-		 .arg((resultModuleTree->getCurrentModule()) ? resultModuleTree->getCurrentModule()->config(CSwordModuleInfo::Description) : QString::fromLatin1("<I>%1</I>").arg(i18n("module not set")) )
-		 .arg(text)
-	);
-}
-
-void CSearchDialogResult::clearResult() {
-	resultTree->clear();
-	resultModuleTree->clear();
-	html_widget->setText("<HTML><HEAD></HEAD><BODY></BODY></HTML>");
-}
diff --git a/bibletime/frontend/searchdialog/csearchdialogresult.h b/bibletime/frontend/searchdialog/csearchdialogresult.h
deleted file mode 100644
index a5b1271..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogresult.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
-                      csearchdialogresult.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 CSEARCHDIALOGRESULT_H
-#define CSEARCHDIALOGRESULT_H
-
-#include <qwidget.h>
-
-#include "backend/cswordmoduleinfo.h"
-#include "frontend/chtmlwidget.h"
-
-class CSearchDialog;
-class CSearchDialogResultModuleView;
-class CSearchDialogResultView;
-class CSearchResultItem;
-
-class QSplitter;
-
-class CSearchDialogResult : public QWidget
-{
-  Q_OBJECT
-	friend class CSearchDialog;
-public:
-	/**
-	* Standard constructor
-	*/
-	CSearchDialogResult(QWidget *parent = 0, const char *name = 0);
-	/**
-	* Sets the module list and clears the result list.
-	*/
-	void setModuleList(ListCSwordModuleInfo& moduleList);
-	/**
-	* Removes the listed module items and the current search result from the lists
-	*/
-	void clearResult();
-
-public slots:
-	/**
-	* Updates the preview using the parameter as new key.
-	*/
-	void updatePreview(const QString);
-
-private:
-	ListCSwordModuleInfo moduleList;
-	CSearchDialogResultModuleView *resultModuleTree;
-	CSearchDialogResultView	*resultTree;
-	CHTMLWidget	*html_widget;
-	QSplitter* m_splitter;
-};
-
-
-#endif
diff --git a/bibletime/frontend/searchdialog/csearchdialogresultview.cpp b/bibletime/frontend/searchdialog/csearchdialogresultview.cpp
deleted file mode 100644
index bb66330..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogresultview.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-/***************************************************************************
-                   csearchdialogresultview.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 "csearchdialogresultview.h"
-#include "csearchdialog.h"
-#include "../../resource.h"
-#include "../../whatsthisdef.h"
-#include "../../tooltipdef.h"
-#include "../../backend/cswordbiblemoduleinfo.h"
-#include "../../backend/cswordlexiconmoduleinfo.h"
-#include "../../backend/cswordversekey.h"
-#include "../../backend/cswordldkey.h"
-#include "../../backend/creferencemanager.h"
-#include "../cexportmanager.h"
-#include "../ctoolclass.h"
-#include "../cbtconfig.h"
-#include "../../printing/cprintitem.h"
-#include "../../printing/cprinter.h"
-
-#include "../../util/scoped_resource.h"
-
-//QT includes
-#include <qlist.h>
-#include <qheader.h>
-#include <qevent.h>
-#include <qmessagebox.h>
-#include <qdragobject.h>
-#include <qwidget.h>
-#include <qclipboard.h>
-#include <qprogressdialog.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-
-//KDE includes
-#include <kfiledialog.h>
-#include <klocale.h>
-#include <kstddirs.h>
-#include <kiconloader.h>
-#include <kapp.h>
-#include <kpopupmenu.h>
-#include <kglobalsettings.h>
-#include <kaction.h>
-
-//Sword includes
-#include <listkey.h>
-#include <swmodule.h>
-
-CSearchDialogResultModuleView::CSearchDialogResultModuleView(QWidget *parent, const char *name)
-	: QListView ( parent, name )	{	
-	initView();
-	adjustSize();
-}
-
-CSearchDialogResultModuleView::~CSearchDialogResultModuleView() {
-	qDebug("CSearchDialogResultModuleView::~CSearchDialogResultModuleView()");
-}
-
-/** Initializes the tree of this ResultView */
-void CSearchDialogResultModuleView::setupTree() {
-	ListKey moduleSearchResult;
-	QListViewItem	*module = 0;
-
-	for (moduleList.first(); moduleList.current(); moduleList.next()) {
-		moduleSearchResult = moduleList.current()->searchResult();
-		module = new QListViewItem(this, QString("%1 [%2]").arg( moduleList.current()->name() ).arg( moduleSearchResult.Count() ));
-		module->setPixmap(0,CToolClass::getIconForModule(moduleList.current()) );
-	}	
-	setFixedWidth( sizeHint().width() );
-//	resize(sizeHint());
-}
-
-void CSearchDialogResultModuleView::viewportMousePressEvent(QMouseEvent *e) {
-	qDebug("CSearchDialogResultModuleView::viewportMousePressEvent");
-	QListView::viewportMousePressEvent(e);
-
-	m_currentItem = (QListViewItem*)itemAt(e->pos());
-	if (!m_currentItem)
-	{
-		qDebug("item is NULL");
-		return;
-	}
-	if ((e->state() & ControlButton) || (e->state() & ShiftButton))
-			return;
-	for (moduleList.first();moduleList.current();moduleList.next()){
-		QString modName = m_currentItem->text(0);
-		modName = modName.left( modName.find(" [") );
-		m_currentModule = backend()->findModuleByName(modName);
-		if (m_currentModule)
-			emit moduleSelected(m_currentModule);
-	}	
-	if (e->button() == RightButton)
-		m_popup->popup( mapToGlobal(e->pos()) );
-}
-
-/** Initializes this widget */
-void CSearchDialogResultModuleView::initView(){
-	QWhatsThis::add(this, WT_SD_RESULT_MODULE_VIEW);
-	
-	setFocusPolicy(QWidget::WheelFocus);
-	setAllColumnsShowFocus( true );
-	setRootIsDecorated( false );
-	addColumn( i18n( "Modules" ), -1 );
-	header()->hide();
-	setSorting( -1 );
-	
-	m_popup = new KPopupMenu(this);
-	
-	m_copyPopup = new KPopupMenu(m_popup);	
-	m_copyPopup->insertItem(i18n("Search result"), this, SLOT(slotCopySearchResult()));	
-	m_copyPopup->insertItem(i18n("Search result with text"), this, SLOT(slotCopySearchResultWithKeytext()));
-	
-	m_printPopup = new KPopupMenu(m_popup);		
-	m_printPopup->insertItem(i18n("Search result"), this, SLOT(printSearchResult()));
-	
-	m_savePopup = new KPopupMenu(m_popup);		
-	m_savePopup->insertItem(i18n("Search result"), this, SLOT(slotSaveSearchResult()));
-	m_savePopup->insertItem(i18n("Search result with text"), this, SLOT(slotSaveSearchResultWithKeytext()));
-	
-	m_popup->insertItem(SmallIcon(ICON_EDIT_COPY), i18n("Copy..."), 	m_copyPopup);
-	m_popup->insertItem(SmallIcon(ICON_FILE_PRINT), i18n("Add to printing queue..."), m_printPopup);
-	m_popup->insertItem(SmallIcon(ICON_FILE_SAVE), i18n("Save..."), 	m_savePopup);
-}
-
-/** Returns the module belonging to the selected item. */
-CSwordModuleInfo* CSearchDialogResultModuleView::getCurrentModule() {
-	return m_currentModule;
-}
-
-/** Reimplementation. Sets the cortrect QHeader width. */
-void CSearchDialogResultModuleView::resizeEvent( QResizeEvent* e){
-	QListView::resizeEvent(e);	
-	header()->resize( visibleWidth(), header()->height() );
-}
-
-/** Adds all items  of the search result of this module to the printing queue of BibleTime. */
-void CSearchDialogResultModuleView::printSearchResult(){
-	CExportManager::printKeyList( &(m_currentModule->searchResult()), m_currentModule, i18n("Appending keys to the printing queue ...") );		
-}
-
-/** This function copies the search result into the clipboard */
-void CSearchDialogResultModuleView::slotCopySearchResult(){
-	//get the searched text
-//	QString searchedText;
-//	for (QObject* w = parent(); w; w = w->parent()) {
-//		if (w->isA("CSearchDialog")) {
-//			CSearchDialog*	dlg = (CSearchDialog*)w;
-//			searchedText = dlg->getSearchedText().stripWhiteSpace();
-//			break;
-//		}		
-//	}
-	CExportManager::copyKeyList(&m_currentModule->searchResult(), m_currentModule, i18n("Copying search result to clipboard..."), false);
-}
-
-/** This slot saves the search result to disk. */
-void CSearchDialogResultModuleView::slotSaveSearchResult(){
-	//get the searched text
-	QString searchedText;
-	for (QObject* w = parent(); w; w = w->parent()) {
-		if (w->isA("CSearchDialog")) {
-			CSearchDialog*	dlg = dynamic_cast<CSearchDialog*>(w);
-			searchedText = dlg->getSearchedText().stripWhiteSpace();
-			break;
-		}		
-	}
-	ListKey& searchResult = m_currentModule->searchResult();
-	CExportManager::saveKeyList(&searchResult, m_currentModule, i18n("Saving the search result ..."), false, true);	
-}
-
-
-void CSearchDialogResultModuleView::slotCopySearchResultWithKeytext(){
-	//get the searched text
-	QString searchedText;
-	for (QObject* w = parent(); w; w = w->parent()) {
-		if (w->isA("CSearchDialog")) {
-			CSearchDialog*	dlg = (CSearchDialog*)w;
-			searchedText = dlg->getSearchedText().stripWhiteSpace();
-			break;
-		}		
-	}
-	CExportManager::copyKeyList(&m_currentModule->searchResult(), m_currentModule, i18n("Copying search result to clipboard..."), true );
-}
-
-/** This slot saves the search result to disk. */
-void CSearchDialogResultModuleView::slotSaveSearchResultWithKeytext(){
-	//get the searched text
-	QString searchedText;
-	for (QObject* w = parent(); w; w = w->parent()) {
-		if (w->isA("CSearchDialog")) {
-			CSearchDialog*	dlg = (CSearchDialog*)w;
-			searchedText = dlg->getSearchedText().stripWhiteSpace();
-			break;
-		}		
-	}
-	CExportManager::saveKeyList(&m_currentModule->searchResult(), m_currentModule,i18n("Saving the search result..."), true, true);
-}
-
-//------------class CSearchDialogResultView-----------//
-CSearchDialogResultView::CSearchDialogResultView(QWidget *parent, const char *name)
-	: QListBox(parent,name),
-	m_module(0),
-	m_currentItem(0),	
-	m_pressedPos()
-{
-	initView();
-	initConnections();
-}
-
-CSearchDialogResultView::~CSearchDialogResultView() {
-}
-
-/** Initializes the tree of this ResultView */
-void CSearchDialogResultView::setupTree() {
-	ListKey& moduleSearchResult = m_module->searchResult();
-	const int count = moduleSearchResult.Count();
-		
-	clear();	
-	setUpdatesEnabled(false);
-	for (int index = 0; index < count; index++) {
-		insertItem( QString::fromLocal8Bit((const char*)*moduleSearchResult.GetElement(index)), -1);
-	}
-	setUpdatesEnabled(true);	
-}
-
-/** Initializes the connections of this class */
-void CSearchDialogResultView::initConnections() {
-	connect(m_popup, SIGNAL(aboutToShow()),
-		this, SLOT(popupAboutToShow()));
-//	connect(this, SIGNAL(pressed(QListBoxItem*)),
-//		this, SLOT(mousePressed(QListBoxItem*)));	
-		
-	connect(this, SIGNAL(currentChanged(QListBoxItem*)),
-		this, SLOT(mousePressed(QListBoxItem*)));	
-		
-	connect(this, SIGNAL(rightButtonPressed(QListBoxItem*, const QPoint&)),
-		this, SLOT(rightButtonPressed(QListBoxItem*, const QPoint&)));
-}
-
-/** Initializes this widget */
-void CSearchDialogResultView::initView(){
-	QWhatsThis::add(this, WT_SD_RESULT_RESULT_VIEW);
-	setSelectionMode(QListBox::Extended);
-	
-	m_popup = new KPopupMenu(this);		
-	m_copyPopup = new KPopupMenu(m_popup);	
-	m_copyPopup->insertItem(i18n("Key"), this, SLOT(slotCopyCurrent()));	
-	m_copyPopup->insertItem(i18n("Key with text"), this, SLOT(slotCopyCurrentWithKeytext()));
-	
-	m_printPopup = new KPopupMenu(m_popup);		
-	m_printPopup->insertItem(i18n("Key with text"), this, SLOT(printItem()));
-	
-	m_savePopup = new KPopupMenu(m_popup);		
-	m_savePopup->insertItem(i18n("Key"), this, SLOT(slotSaveCurrent()));
-	m_savePopup->insertItem(i18n("Key with text"), this, SLOT(slotSaveCurrentWithKeytext()));
-	
-	m_popup->insertItem(SmallIcon(ICON_EDIT_COPY), i18n("Copy..."), m_copyPopup);
-	m_popup->insertItem(SmallIcon(ICON_FILE_PRINT),i18n("Add to printing queue..."),m_printPopup);
-	m_popup->insertItem(SmallIcon(ICON_FILE_SAVE), i18n("Save..."), m_savePopup);		
-	
-	setFocusPolicy(QWidget::WheelFocus);
-}
-
-
-/** Is called before the menu is shown */
-void CSearchDialogResultView::popupAboutToShow(){
-}
-
-/**  */
-void CSearchDialogResultView::viewportMouseMoveEvent(QMouseEvent *e){
-//	qDebug("CSearchDialogResultView::viewportMouseMoveEvent(QMouseEvent *e)");
-	if ( !(e->state() & QMouseEvent::LeftButton) ){
-	  QListBox::viewportMouseMoveEvent(e);
-		return;
-	}
-		
-	//Is it time to start a drag?
- 	if (m_currentItem && (abs(e->pos().x() - m_pressedPos.x()) > KGlobalSettings::dndEventDelay() ||
- 		abs(e->pos().y() - m_pressedPos.y()) > KGlobalSettings::dndEventDelay()) )
- 	{
-		QString mod;
-		QString ref;
-		mod = m_module->name();
-		ref = m_currentItem->text();
-
-		QTextDrag *d = new QTextDrag(CReferenceManager::encodeReference(mod,ref), viewport());
-		if (d){
-			d->setSubtype(REFERENCE);
-			d->setPixmap(REFERENCE_ICON_SMALL);
-			d->drag();
-			return;
-		}
- 	}
-  else
-  	QListBox::viewportMouseMoveEvent(e);
-}
-
-/**  */
-void CSearchDialogResultView::printItem() {
-	QList<QListBoxItem> list = selectedItems();	
-	if (!list.count())
-		return;
-	for (list.first(); list.current(); list.next()) {
-		CExportManager::printKey(m_module,list.current()->text(),QString::null);
-	}
-}
-
-/** This slot is called when the current item changed. */
-void CSearchDialogResultView::itemChanged(QListBoxItem* item){
-	m_currentItem = item;
-}
-
-/** Opens the popup menu. */
-void CSearchDialogResultView::rightButtonPressed( QListBoxItem* item, const QPoint& p){
-	m_currentItem = item;	
-	if (m_currentItem) {
-		mousePressed(item);
-		m_popup->popup(p);
-	}
-}
-
-/**  */
-void CSearchDialogResultView::mousePressed(QListBoxItem* item){
-	qDebug("CSearchDialogResultView::mousePressed(QListBoxItem* item)");
-	if (!( m_currentItem = item ))
-		return;	
-	QString text = QString::null;
-	
-	//we have to set the standard module view options for the module!!	
-	util::scoped_ptr<CSwordKey> key(CSwordKey::createInstance(m_module));
-	if ( key ) {
-		backend()->setFilterOptions( CBTConfig::getFilterOptionDefaults() );				
-		key->key(item->text());
-		emit keySelected(key->renderedText());
-	}		
-}
-
-/** This slot copies the current active item into the clipboard. */
-void CSearchDialogResultView::slotCopyCurrent(){
-	QString text;
-	QList<QListBoxItem> list = selectedItems();
-	for (list.first(); list.current(); list.next()) {
-		text += list.current()->text()+"\n";
-	}
-	KApplication::clipboard()->setText(text);
-}
-
-/** This slot copies the current active item into the clipboard. */
-void CSearchDialogResultView::slotCopyCurrentWithKeytext(){
-	QList<QListBoxItem> list = selectedItems();
-	QString text;
-	QString keyText, keyName;
-	for (list.first(); list.current(); list.next()) {
-		CSwordKey* key = CSwordKey::createInstance(m_module);
-		if (!key)
-			continue;
-			
-		key->key(list.current()->text());
-		keyName = key->key();
-		keyText = key->strippedText();
-		
-		delete key;
-		
-		text += QString("%1\n%2\n\n").arg(keyName).arg(keyText);
-	}
-	
-	KApplication::clipboard()->setText(text);
-}
-
-/** This slot copies the current active item into the clipboard. */
-void CSearchDialogResultView::slotSaveCurrent(){
- 	const QString file = KFileDialog::getSaveFileName (QString::null, i18n("*.txt | Text files\n *.* | All files (*.*)"), 0, i18n("Save key ..."));	
-	if (!file.isNull()) {
-		QList<QListBoxItem> list = selectedItems();
-		QString text;
-		for (list.first(); list.current(); list.next())
-			text += list.current()->text()+"\n";
-		CToolClass::savePlainFile(file, text);
-	}
-}
-
-/** This slot copies the current active item into the clipboard. */
-void CSearchDialogResultView::slotSaveCurrentWithKeytext(){
-	QList<QListBoxItem> list = selectedItems();
-	QString text;
-	QString keyText, keyName;
-	for (list.first(); list.current(); list.next()) {
-		CSwordKey* key = CSwordKey::createInstance(m_module);
-		if (!key)
-			continue;
-			
-		key->key(list.current()->text());
-		keyName = key->key();
-		keyText = key->strippedText();
-		
-		delete key;
-		
-		text += QString("%1\n%2\n\n").arg(keyName).arg(keyText);
-	}
-	
- 	const QString file = KFileDialog::getSaveFileName (QString::null, i18n("*.txt | Text files\n *.* | All files (*.*)"), 0, i18n("Save key ..."));	
-	if (!file.isNull()) {
-		CToolClass::savePlainFile( file, text);
-	}
-}
-
-/** Returns the selected items of this listbox. */
-QList<QListBoxItem> CSearchDialogResultView::selectedItems(){
-	QList<QListBoxItem> list;
-	QListBoxItem* item = firstItem();
-	while (item) {
-		if (item->selected())
-			list.append(item);
-		item = item->next();
-	}
-	return list;
-}
-
-/** Reimplementation to make Drag&Drop work. */
-void CSearchDialogResultView::viewportMousePressEvent( QMouseEvent* e ){
-	qDebug("CSearchDialogResultView::viewportMousePressEvent( QMouseEvent* e )");
-	m_pressedPos = e->pos();	
-	QListBox::viewportMousePressEvent(e);
-}
diff --git a/bibletime/frontend/searchdialog/csearchdialogresultview.h b/bibletime/frontend/searchdialog/csearchdialogresultview.h
deleted file mode 100644
index 107fe0c..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogresultview.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/***************************************************************************
-                   csearchdialogresultview.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 CSEARCHDIALOGRESULTVIEW_H
-#define CSEARCHDIALOGRESULTVIEW_H
-
-//BibleTime includes
-#include "../../backend/cswordmoduleinfo.h"
-#include "../cpointers.h"
-
-//QT includes
-#include <qwidget.h>
-#include <qlistview.h>
-#include <qlistbox.h>
-#include <qlistview.h>
-
-class KPopupMenu;
-class CSearchDialogResultItem;
-class CSearchDialog;
-class KAction;
-
-/**
-	*	Handles the search result
-  *	@author The BibleTime Team
-  */
-class CSearchDialogResultModuleView : public QListView, public CPointers {
-	Q_OBJECT
-public:
-	CSearchDialogResultModuleView(QWidget *parent=0, const char *name=0);
-	virtual ~CSearchDialogResultModuleView();
-	/**
-	*	Sets te modulelist displayed in this module tree.
-	*/
-	void setModuleList(ListCSwordModuleInfo& modules) { this->moduleList = modules; };
-	/**
-	* Initializes the tree of this CGroupmanager
-	*/
-	void setupTree();
-	/**
-	* Initiales the view of this widget.
-	*/
-	void initView();
-  /**
- 	* Returns the module belonging to the selected item.
- 	*/
-  CSwordModuleInfo* getCurrentModule();
-  /**
- 	* Reimplementation. Sets the cortrect QHeader width.
- 	*/
-  void resizeEvent( QResizeEvent* e);
-
-protected:
-  void viewportMousePressEvent(QMouseEvent *e);
-
-protected slots: // Protected slots
-  /**
- 	* Adds all items  of the search result of this module
- 	* to the printing queue of BibleTime.
-  */
-  void printSearchResult();
-  /**
- 	* This slot saves the search result to disk.
- 	*/
-  void slotSaveSearchResult();
-  /**
- 	* This function copies the search result into the clipboard
- 	*/
-  void slotCopySearchResult();
-  /**
- 	* This slot saves the search result to disk.
- 	*/
-  void slotSaveSearchResultWithKeytext();
-  /**
- 	* This function copies the search result into the clipboard
- 	*/
-  void slotCopySearchResultWithKeytext();
-
-signals: // Signals
-  /**
- 	* Is emitted when a module in the tree was selected.
- 	*/
-  void moduleSelected(CSwordModuleInfo*);
-
-private:
-  ListCSwordModuleInfo	moduleList;
-  QListViewItem*	m_currentItem;
-  CSwordModuleInfo*	m_currentModule;
-
-  KPopupMenu* m_popup;	
-	KPopupMenu* m_copyPopup;	
-	KPopupMenu* m_savePopup;	
-	KPopupMenu* m_printPopup;		
-};
-
-
-class CSearchDialogResultView : public QListBox, public CPointers  {
-   Q_OBJECT
-public:
-	CSearchDialogResultView(QWidget *parent=0, const char *name=0);
-	virtual ~CSearchDialogResultView();
-	/**
-	* Initializes the tree of this CGroupmanager
-	*/
-	void setupTree();
-  /**
- 	* Initialzes the view of this widget.
- 	*/
-	void initView();
-
-protected:
-	/**
-	* Initializes the connections of this class
-	*/
-  void initConnections();
-  void viewportMouseMoveEvent(QMouseEvent *e);
-  /**
-  * Returns the selected items of this listbox.
-  */
-  QList<QListBoxItem> selectedItems();
-  /**
-   Reimplementation to make Drag&Drop work.
-  */
-  virtual void viewportMousePressEvent( QMouseEvent* e );
-
-public slots:
-  /**
- 	* Appends the selected item to prinint queue
- 	*/
-  void printItem();
-  /**
- 	*
- 	*/
-	void setModule(CSwordModuleInfo *module) { if (module) m_module = module; setupTree();};
-	
-protected slots: // Protected slots
-	/**
-	* Is called before the menu is shown
-	*/	
-	void popupAboutToShow();
-  /**
- 	* This slot is called when the current item changed.
- 	*/
-  void itemChanged(QListBoxItem*);
-  /**
- 	* Reimplementation from QListBox
- 	*/
-  void mousePressed(QListBoxItem*);
-  /**
- 	* Opens the popup menu.
- 	*/
-  void rightButtonPressed( QListBoxItem*, const QPoint&);
-  /**
- 	* This slot copies the current active item into the clipboard.
- 	*/
-  void slotCopyCurrent();
-  /**
- 	* This slot copies the current active item into the clipboard.
- 	*/
-  void slotCopyCurrentWithKeytext();
-  /**
- 	* This slot copies the current active item into the clipboard.
- 	*/  	
-  void slotSaveCurrent();
-  /**
- 	* This slot copies the current active item into the clipboard.
- 	*/
-  void slotSaveCurrentWithKeytext();
-
-private:
-  KPopupMenu	*m_popup;
-	KPopupMenu* m_copyPopup;	
-	KPopupMenu* m_savePopup;	
-	KPopupMenu* m_printPopup;		
-	
-  CSwordModuleInfo*	m_module;
-  QListBoxItem	*m_currentItem;
-  QPoint m_pressedPos;
-  	
-signals: // Signals	
-	/**
-	* Is emitted when a key in the tree was selected.
-	*/
-	void keySelected(const QString);	
-};
-
-#endif
diff --git a/bibletime/frontend/searchdialog/csearchdialogscope.cpp b/bibletime/frontend/searchdialog/csearchdialogscope.cpp
deleted file mode 100644
index 38203aa..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogscope.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/***************************************************************************
-                          csearchdialogscope.cpp  -  description
-                             -------------------
-    begin                : Sun Nov 12 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 "csearchdialogscope.h"
-#include "../../whatsthisdef.h"
-#include "../../tooltipdef.h"
-
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qgroupbox.h>
-#include <qinputdialog.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-
-#include <klocale.h>
-#include <ksimpleconfig.h>
-
-#include "versekey.h"
-
-CSearchDialogScopeChooser::CSearchDialogScopeChooser(QWidget *parent, const char *name ) : QWidget(parent,name) {
-
-  QHBoxLayout*	HLayout = new QHBoxLayout(this);
-
-  noScope = new QRadioButton(i18n("No scope"	 ),this);
-	QToolTip::add(noScope, TT_SD_SCOPE_NO_SCOPE);
-	QWhatsThis::add(noScope, WT_SD_SCOPE_NO_SCOPE);
-	
-  lastResultScope = new QRadioButton(i18n("Last result"),this);
-	QToolTip::add(lastResultScope, TT_SD_SCOPE_LAST_RESULT);
-	QWhatsThis::add(lastResultScope, WT_SD_SCOPE_LAST_RESULT);
-
-  useScope = new QRadioButton(i18n("Use scope"  ),this);
-	QToolTip::add(useScope, TT_SD_SCOPE_OWN_SCOPE);
-	QWhatsThis::add(useScope, WT_SD_SCOPE_OWN_SCOPE);
-
-  group = new QButtonGroup();
-  group->insert(noScope);
-  group->insert(lastResultScope);
-  group->insert(useScope);
-  noScope->setChecked(true);
-
-  RangeChooser = new QComboBox(this);
-  RangeLabel = new QLabel(RangeChooser,  i18n("Choose custom range"),this);
-	QToolTip::add(RangeChooser, TT_SD_SCOPE_CHOOSER);
-  QWhatsThis::add(RangeChooser, WT_SD_SCOPE_CHOOSER);
-
-  editButton = new QPushButton(i18n("Edit ranges"),this);
-  editButton->setFixedWidth(editButton->sizeHint().width());
-	QToolTip::add(editButton, TT_SD_SCOPE_EDIT_SCOPE_BUTTON);
-	QWhatsThis::add(editButton, WT_SD_SCOPE_EDIT_SCOPE_BUTTON);	
-  connect(editButton,SIGNAL(clicked()),this,SLOT(editButtonClicked()));
-  connect(group,SIGNAL(clicked(int)),this,SLOT(scopeChanged()));
-
-  QVBoxLayout*	VLayout_1 = new QVBoxLayout(HLayout);
-  VLayout_1->addWidget(noScope, 				Qt::AlignTop);
-  VLayout_1->addWidget(lastResultScope, Qt::AlignTop);
-  VLayout_1->addWidget(useScope, 				Qt::AlignTop);
-
-  HLayout->addStretch();
-
-  QVBoxLayout*	VLayout_2 = new QVBoxLayout(HLayout);
-  VLayout_2->addWidget(RangeLabel);
-  VLayout_2->addWidget(RangeChooser);
-  VLayout_2->addWidget(editButton);
-
-  HLayout->addStretch();
-
-  config = new KSimpleConfig("bt-custom_ranges", false);
-  //we use this to use the global standard
-  config->setGroup(QString::fromLatin1("main"));
-  if (config->readBoolEntry("first usage", true)) {		
-  	config->writeEntry("first usage", false);
-  	config->setGroup(QString::fromLatin1("custom ranges"));
-  	
-	  QMap<QString,QString> entryMap;
-	  entryMap.insert(i18n("Old testament"),          QString::fromLatin1("Gen - Mal"));
-	  entryMap.insert(i18n("Moses/Pentateuch/Torah"), QString::fromLatin1("Gen - Deut"));				
-	  entryMap.insert(i18n("History"),                QString::fromLatin1("Jos - Est"));		
-	  entryMap.insert(i18n("Prophets"),               QString::fromLatin1("Isa - Mal")); 	
- 	  entryMap.insert(i18n("New testament"),          QString::fromLatin1("Mat - Rev"));
-	  entryMap.insert(i18n("Gospels"), 								QString::fromLatin1("Mat - Joh"));
-	  entryMap.insert(i18n("Letters/Epistels"), 			QString::fromLatin1("Rom - Jude"));
-	  entryMap.insert(i18n("Paul's Epistels"), 				QString::fromLatin1("Rom - Phile"));
-
-	  QMap<QString,QString>::Iterator it;			
-				
-		for ( it = entryMap.begin(); it != entryMap.end(); ++it) {
-		  if (it.key() != QString::null) {
-				QString text = QString::null;
-		   	ListKey lk = VerseKey().ParseVerseList(it.data().local8Bit(),"Genesis 1:1",true);
-				for (int i = 0; i < lk.Count(); ++i) {
-					if (i)
-						text.append(";");											
-					VerseKey* element = dynamic_cast<VerseKey*>(lk.GetElement(i));
-					if (element) 	
-						text +=	QString::fromLatin1("%1 - %2")
-							.arg( QString::fromLocal8Bit((const char*)element->LowerBound()) )
-							.arg( QString::fromLocal8Bit((const char*)element->UpperBound()) );
-					else
-						text += QString::fromLocal8Bit((const char*)*lk.GetElement(i));			
-				}
-				config->writeEntry(it.key(),text);
-			}	
-  	}
-  }
-
-  config->setGroup(QString("custom ranges"));
-  QMap<QString,QString> entryMap = config->entryMap(QString("custom ranges"));
-  QMap<QString,QString>::Iterator it;	
-	for ( it = entryMap.begin(); it != entryMap.end(); ++it)
-	  if (it.key() != QString::null)
-		  RangeChooser->insertItem( it.key() );
-	scopeChanged(); //set initial state
-}
-
-ListKey CSearchDialogScopeChooser::getScope(){
-	return VerseKey().ParseVerseList( config->readEntry( RangeChooser->currentText() ).local8Bit(), "Genesis 1:1", true);
-}
-
-const CSwordModuleSearch::scopeType CSearchDialogScopeChooser::getScopeType() const {
-  if (noScope->isChecked())         return CSwordModuleSearch::Scope_NoScope;
-  if (lastResultScope->isChecked()) return CSwordModuleSearch::Scope_LastSearch;
-  if (useScope->isChecked())        return CSwordModuleSearch::Scope_Bounds;
-
-  return CSwordModuleSearch::Scope_NoScope;
-}
-
-const QString CSearchDialogScopeChooser::getScopeTypeString() {
-  if (noScope->isChecked())         return noScope->text();
-  if (lastResultScope->isChecked()) return lastResultScope->text();
-  if (useScope->isChecked())        return useScope->text();
-
-  return noScope->text();
-}
-void CSearchDialogScopeChooser::editButtonClicked(){
-  CSearchDialogScopeEdit *dialog = new CSearchDialogScopeEdit(this->config, this, "ranges dialog");
-  dialog->exec();
-
-  //refresh the rangechooser
-  RangeChooser->clear();
-
-  QMap<QString,QString> entryMap = config->entryMap(QString("custom ranges"));
-  QMap<QString,QString>::Iterator it;
-  for ( it = entryMap.begin(); it != entryMap.end(); ++it) {
-	  qDebug(it.key().local8Bit());
-	  if (it.key() != QString::null)
-		  RangeChooser->insertItem( it.key() );
-	}
-}
-
-/** No descriptions */
-void CSearchDialogScopeChooser::scopeChanged(){
-	RangeLabel->setEnabled  (getScopeType() == CSwordModuleSearch::Scope_Bounds ? true : false);
-	RangeChooser->setEnabled(getScopeType() == CSwordModuleSearch::Scope_Bounds ? true : false);
-	editButton->setEnabled  (getScopeType() == CSwordModuleSearch::Scope_Bounds ? true : false);
-}
-
-
-CSearchDialogScopeChooser::~CSearchDialogScopeChooser(){
-	if (config) {
-	  config->setGroup(QString("main"));	
-	  config->writeEntry("firstUsage", true);
-		config->sync();
-		delete config;
-	}
-}
-
-CSearchDialogScopeEdit::~CSearchDialogScopeEdit(){	
-  //not delete config, because it points to the parent config
-}
-
-CSearchDialogScopeEdit::CSearchDialogScopeEdit(KSimpleConfig *parentconfig, QWidget *parent, const char *name ) : QDialog(parent,name,/*modal*/true) {
-
-  QGridLayout*	Layout = new QGridLayout(this, 5, 5, 5, 0);
-
-  RangeChooser = new QComboBox(this);
-	QToolTip::add(RangeChooser, TT_SD_SCOPE_CHOOSER);
-  QWhatsThis::add(RangeChooser, WT_SD_SCOPE_CHOOSER);
-  RangeChooser->setEnabled(false);
-
-  RangeEdit = new QLineEdit(this);
-	QToolTip::add(RangeChooser, TT_SD_SCOPE_EDIT_LINE);
-  QWhatsThis::add(RangeChooser, WT_SD_SCOPE_EDIT_LINE);
-  RangeEdit->setEnabled(false);
-
-  RangeDisp = new QListBox(this);
-	QToolTip::add(RangeDisp, TT_SD_SCOPE_PARSED_LIST);
-  QWhatsThis::add(RangeDisp, WT_SD_SCOPE_PARSED_LIST);
-
-  newButton   = new QPushButton(i18n("Add"),this);
-	QToolTip::add(newButton, TT_SD_SCOPE_NEW_SCOPE);
-  QWhatsThis::add(newButton, WT_SD_SCOPE_NEW_SCOPE);
-
-  deleteButton= new QPushButton(i18n("Delete"),this);
-  deleteButton->setEnabled(false);	
-	QToolTip::add(deleteButton, TT_SD_SCOPE_DELETE_SCOPE);
-  QWhatsThis::add(deleteButton, WT_SD_SCOPE_DELETE_SCOPE);
-
-  closeButton = new QPushButton(i18n("Close"),this);
-	QToolTip::add(closeButton, TT_SD_SCOPE_CLOSE);
-  QWhatsThis::add(closeButton, WT_SD_SCOPE_CLOSE);
-
-  QLabel* RangeLabel = new QLabel(i18n("Choose custom range"),this);
-  QLabel* RangeEditLabel = new QLabel(i18n("Define range text"),this);
-  QLabel* RangeDispLabel = new QLabel(i18n("Range parsing results"),this);
-
-
-  Layout->addMultiCellWidget(RangeLabel,  0,0,0,2);
-  Layout->addMultiCellWidget(RangeChooser,1,1,0,2);
-
-  Layout->addMultiCellWidget(RangeEditLabel,0,0,4,4);
-  Layout->addMultiCellWidget(RangeEdit,     1,1,4,4);
-
-  Layout->addMultiCellWidget(RangeDispLabel,2,2,4,4);
-  Layout->addMultiCellWidget(RangeDisp,     3,4,4,4);
-
-  Layout->addMultiCellWidget(newButton,   3,3,0,0, Qt::AlignCenter);
-  Layout->addMultiCellWidget(deleteButton,3,3,2,2, Qt::AlignCenter);
-  Layout->addMultiCellWidget(closeButton, 4,4,0,2, Qt::AlignCenter);
-
-  Layout->addRowSpacing(0, RangeLabel->sizeHint().height());
-  Layout->addRowSpacing(1, RangeChooser->sizeHint().height());
-  Layout->addRowSpacing(2, RangeDispLabel->sizeHint().height());
-  Layout->addRowSpacing(3, newButton->sizeHint().height());
-  Layout->addRowSpacing(4, RangeEdit->sizeHint().height() * 4);// 4 lines
-  Layout->setRowStretch(4, 1); //only 4 will be stretched
-
-  Layout->addColSpacing(0, newButton->sizeHint().width());
-  Layout->addColSpacing(1, 2);
-  Layout->addColSpacing(2, deleteButton->sizeHint().width());
-  Layout->addColSpacing(3, 10);
-  Layout->addColSpacing(4, RangeLabel->sizeHint().width() * 2);
-  Layout->setColStretch(4, 1);//only 4 ill be stretched
-
-
-  connect(newButton,SIGNAL(clicked()),
-           this,SLOT(NewButtonClicked()));
-	connect(deleteButton, SIGNAL(clicked()),
-	         this,SLOT(DeleteButtonClicked()));
-	connect(closeButton, SIGNAL(clicked()),
-	         this,SLOT(closeButtonClicked()));
-  connect(RangeEdit,SIGNAL(textChanged(const QString &)),
-           this,SLOT(RangeEditTextChanged(const QString &)));
-	connect(RangeChooser,SIGNAL(activated(int)),
-	         this,SLOT(RangeChooserActivated(int)));
-
-
-	config = parentconfig;
-	
-  config->setGroup(QString("custom ranges"));
-  QMap<QString,QString> entryMap = config->entryMap(QString("custom ranges"));
-  QMap<QString,QString>::Iterator it;
-	for ( it = entryMap.begin(); it != entryMap.end(); ++it) {
-  	qDebug(it.key().local8Bit());
-	  if (it.key() != QString::null)
-		  RangeChooser->insertItem( it.key() );
-	}
-	if (RangeChooser->count()>0){
-	  RangeChooser->setEnabled(true);
-	  RangeEdit->setEnabled(true);
-	  deleteButton->setEnabled(true);
- 	  RangeEdit->setFocus();
-	  emit RangeChooserActivated(0);
-	}
-}
-
-void CSearchDialogScopeEdit::NewButtonClicked(){
-  bool ok = false;
-  QString text = QInputDialog::getText( i18n( "Range name" ), i18n( "Please enter a name for the new range" ), QString::null, &ok, this );
-	if (!ok)
-		return;
-
-  if ( !text.isEmpty() /*&& !config->hasKey( text )*/ )
-    config->writeEntry(text, QString::null);// user entered something and pressed ok
-  //refresh the rangechooser
-  RangeChooser->clear();
-
-  QMap<QString,QString> entryMap = config->entryMap(QString("custom ranges"));
-  QMap<QString,QString>::Iterator it;
-  for ( it = entryMap.begin(); it != entryMap.end(); ++it) {
-	  qDebug(it.key().local8Bit());
-	  if (it.key() != QString::null)
-		  RangeChooser->insertItem( it.key() );
-	}
-	if (RangeChooser->count()>0){
- 	  RangeChooser->setEnabled(true);
-	  RangeEdit->setEnabled(true);
-	  deleteButton->setEnabled(true);
-	  RangeChooser->setCurrentItem( RangeChooser->count()-1 );
-	  emit RangeChooserActivated( RangeChooser->currentItem() );
- 	  RangeEdit->setFocus();
-	}
-}
-
-void CSearchDialogScopeEdit::DeleteButtonClicked(void){
-  int index = RangeChooser->currentItem();
-  QString text=RangeChooser->currentText();
-  if ( !text.isEmpty() ){
-  	config->deleteEntry(text,false);
-				
-		//refresh the rangechooser
-    RangeChooser->clear();
-
-    QMap<QString,QString> entryMap = config->entryMap(QString("custom ranges"));
-    QMap<QString,QString>::Iterator it;
-    for ( it = entryMap.begin(); it != entryMap.end(); ++it) {
-  	  qDebug(it.key().local8Bit());
-  	  if (it.key() != QString::null)
-  		  RangeChooser->insertItem( it.key() );
-  	}
-  	if (RangeChooser->count()>0){
-  	  RangeChooser->setCurrentItem( (index>0)?(index-1):0 );
-  	  emit RangeChooserActivated( RangeChooser->currentItem() );
-  	}
-  	else{
- 	  RangeChooser->setEnabled(false);
-	  RangeEdit->setEnabled(false);
-	  deleteButton->setEnabled(false);
- 	  //clear
- 	  RangeEdit->setText(QString::null);
-	  RangeDisp->clear();
-
-	  }
-  }
-}
-
-void CSearchDialogScopeEdit::RangeChooserActivated(int index){
-	QString value = config->readEntry(RangeChooser->text(index));
-  RangeEdit->setText(value);
-
-  //a workaround, maybe emitted twice, which is no problem
-  emit RangeEditTextChanged(value);
-}
-
-void CSearchDialogScopeEdit::RangeEditTextChanged(const QString &text){
-	config->writeEntry(RangeChooser->currentText(), text);
-  RangeDisp->clear();
-	VerseKey key;
-  ListKey verses = key.ParseVerseList((const char*)text.local8Bit(), key, true);
-	for (int i = 0; i < verses.Count(); ++i) {
-		VerseKey* element = dynamic_cast<VerseKey*>(verses.GetElement(i));
-		if (element) 	
-			RangeDisp->insertItem(QString("%1 - %2").arg(QString::fromLocal8Bit((const char*)element->LowerBound())).arg(QString::fromLocal8Bit((const char*)element->UpperBound())));
-		else
-			RangeDisp->insertItem(QString::fromLocal8Bit((const char*)*verses.GetElement(i)));
-	}
-}
-
-
-/** No descriptions */
-void CSearchDialogScopeEdit::closeButtonClicked(){
-	close();
-}
diff --git a/bibletime/frontend/searchdialog/csearchdialogscope.h b/bibletime/frontend/searchdialog/csearchdialogscope.h
deleted file mode 100644
index c05f253..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogscope.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************
-                          csearchdialogscope.h  -  description
-                             -------------------
-    begin                : Sun Nov 12 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 CSEARCHDIALOGSCOPE_H
-#define CSEARCHDIALOGSCOPE_H
-
-#include <qwidget.h>
-#include <qdialog.h>
-
-#include <listkey.h>
-#include "../../backend/cswordmodulesearch.h"
-
-class QComboBox;
-class QLineEdit;
-class QPushButton;
-class QListBox;
-class QLabel;
-class QRadioButton;
-class QButtonGroup;
-class KSimpleConfig;
-
-/**
-	* This class (CSearchDialogScope) provides the graphical user interface
-	* for the scope part of the searchdialog.
-	* It provides an easy to use interface with the following functions:
-	*
-	*	-Possibility to define mltiple scopes for each module
-	*	-Possibilty to define wheter we want to use no scope,
-	*	 the result of the last search as scope or an own set of ranges
-	*
-  * @author The BibleTime team
-  */
-
-
-
-class CSearchDialogScopeChooser : public QWidget {
-   Q_OBJECT
-public:
-	CSearchDialogScopeChooser(QWidget *parent, const char *name=0);
-	~CSearchDialogScopeChooser();
-  ListKey getScope();
-  const CSwordModuleSearch::scopeType getScopeType() const;
-  const QString getScopeTypeString();
-
-private:
-  QComboBox*  RangeChooser;
-  QButtonGroup* group;
-  KSimpleConfig* config;
-  QRadioButton *noScope;
-  QRadioButton *lastResultScope;
-  QRadioButton *useScope;
-  QPushButton *editButton;
-  QLabel *RangeLabel;
-
-private slots:
-  void editButtonClicked();
-  void scopeChanged();
-};
-
-class CSearchDialogScopeEdit : public QDialog {
-   Q_OBJECT
-public:
-	CSearchDialogScopeEdit(KSimpleConfig *config, QWidget *parent, const char *name=0);
-	~CSearchDialogScopeEdit();
-
-private:
-  QComboBox*  RangeChooser;
-  QLineEdit*  RangeEdit;
-  QListBox*   RangeDisp;
-  KSimpleConfig* config;
-  QPushButton* newButton;
-  QPushButton* deleteButton;
-  QPushButton* closeButton;
-
-private slots: // Private slots
-  void NewButtonClicked(void);
-  void DeleteButtonClicked(void);
-  void RangeChooserActivated(int);
-  void RangeEditTextChanged(const QString &);
-  void closeButtonClicked();
-};
-
-
-#endif
diff --git a/bibletime/frontend/searchdialog/csearchdialogtext.cpp b/bibletime/frontend/searchdialog/csearchdialogtext.cpp
deleted file mode 100644
index 844e423..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogtext.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/***************************************************************************
-                       csearchdialogtext.cpp  -  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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-//BibleTime includes
-#include "csearchdialogtext.h"
-#include "csearchdialogscope.h"
-#include "../../whatsthisdef.h"
-#include "../../tooltipdef.h"
-#include "../../backend/cswordmodulesearch.h"
-#include "../cbtconfig.h"
-
-//QT includes
-#include <qpixmap.h>
-#include <qlayout.h>
-#include <qvbuttongroup.h>
-#include <qhbuttongroup.h>
-#include <qradiobutton.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qcombobox.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-//KDE includes
-#include <kcombobox.h>
-#include <kiconloader.h>
-#include <kprogress.h>
-#include <klocale.h>
-
-
-CSearchDialogText::CSearchDialogText(QWidget *parent, const char *name)
-	: QWidget(parent, name, 48)
-{
-	/* the first main Group - search text, options etc.*/
-	QGroupBox *textBox = new QGroupBox(2,Qt::Vertical,i18n("Search properties"),this,"textBox");
-
-	m_editCombo = new KHistoryCombo(textBox);
-	m_editCombo->setInsertionPolicy(QComboBox::AtTop);	
-	m_editCombo->setMaxCount(25);		
-	m_editCombo->setDuplicatesEnabled(false);				
-	m_editCombo->setFocusPolicy(QWidget::StrongFocus);
-	m_editCombo->setFocus();
-	connect( m_editCombo, SIGNAL( activated( const QString& )),	m_editCombo, SLOT( addToHistory( const QString& )));
-	connect( m_editCombo, SIGNAL(returnPressed ( const QString& )),m_editCombo,  SLOT(addToHistory(const QString&)) );
-	
-	QToolTip::add(m_editCombo, TT_SD_SEARCH_TEXT_EDIT);
-	QWhatsThis::add(m_editCombo, WT_SD_SEARCH_TEXT_EDIT);
-	
-	QHBox *settingsBox = new QHBox(textBox,"settingsBox");
-	QVBox *radioBox = new QVBox(settingsBox,"radioBox");
-
-	m_radioMultipleWords = new QRadioButton( radioBox,"RadioButton_1");
-	m_radioMultipleWords->setFocusPolicy(QWidget::TabFocus);
-	m_radioMultipleWords->setText( i18n( "Multiple Words" ) );
-	m_radioMultipleWords->setAutoResize( true );
-	m_radioMultipleWords->setChecked( true );
-	QToolTip::add(m_radioMultipleWords, TT_SD_SEARCH_MULTIPLE_WORDS);
-	QWhatsThis::add(m_radioMultipleWords, WT_SD_SEARCH_MULTIPLE_WORDS);	
-	
-	m_radioExactSearch = new QRadioButton(radioBox, "RadioButton_2");
-	m_radioExactSearch->setFocusPolicy(QWidget::TabFocus);
-	m_radioExactSearch->setText( i18n( "Exact Search" ) );
-	m_radioExactSearch->setAutoResize( true );
-	QToolTip::add(m_radioExactSearch, TT_SD_SEARCH_EXACT_MATCH);
-	QWhatsThis::add(m_radioExactSearch, WT_SD_SEARCH_EXACT_MATCH);	
-
-	m_radioRegularExpression = new QRadioButton(radioBox, "RadioButton_3");
-	m_radioRegularExpression->setFocusPolicy(QWidget::TabFocus);
-	m_radioRegularExpression->setText( i18n( "Regular Expression" ) );
-	m_radioRegularExpression->setAutoResize( true );
-	QToolTip::add(m_radioRegularExpression, TT_SD_SEARCH_REGEXP );
-	QWhatsThis::add(m_radioRegularExpression, WT_SD_SEARCH_REGEXP );
-	
-	/* this widget is hidden - it is only used for exclusive radio button management*/
-	QVButtonGroup *bgroup1 = new QVButtonGroup();
-	bgroup1->insert(m_radioMultipleWords); //they are automatically exclusive
-	bgroup1->insert(m_radioExactSearch);
-	bgroup1->insert(m_radioRegularExpression);
-
-	m_checkCaseSensitive = new QCheckBox(settingsBox, "CheckBox_1");
-	m_checkCaseSensitive->setFocusPolicy(QWidget::TabFocus);
-	m_checkCaseSensitive->setText( i18n("Case Sensitive") );
-	QToolTip::add(m_checkCaseSensitive, TT_SD_SEARCH_CASE_SENSITIVE);
-	QWhatsThis::add(m_checkCaseSensitive, WT_SD_SEARCH_CASE_SENSITIVE);
-	
-  QGroupBox *scopeBox = new QGroupBox(2,Qt::Horizontal,i18n("Search scope"),this,"scopeBox");
-  scopeChooser = new CSearchDialogScopeChooser(scopeBox, "scopeChooser");
-	
-	/*the third main groupbox - progress indication */
-	QGroupBox *progressBox = new QGroupBox(2,Qt::Horizontal,i18n("Search progress"),this,"progressBox");
-
-	/* manages the 2 buttons (vertically)*/
-	QVBox *buttonBox = new QVBox(progressBox,"currentBox");
-
-	(void)new QLabel(m_editCombo,i18n("Current module:"),buttonBox);
-	(void)new QLabel(m_editCombo,i18n("Overall:"),buttonBox);
-
-	/* manages the 2 bars (vertically) */
-	QVBox *barBox = new QVBox(progressBox,"overallBox");
-	m_currentProgressBar = new KProgress(0,100,0,Horizontal,barBox, "m_currentProgressBar");
-	m_overallProgressBar = new KProgress(0,100,0,Horizontal,barBox, "m_overallProgressBar");
-
-	/* the main layout for the 3 groupboxes (vertical)*/
-	QVBoxLayout* layout_1 = new QVBoxLayout( this );
-	layout_1->setAutoAdd(false);
-	
-	textBox->setFixedHeight( textBox->sizeHint().height() );	
-	layout_1->addWidget( textBox,1, Qt::AlignTop );
-	
-	layout_1->addWidget( scopeBox, Qt::AlignVCenter);
-	scopeBox->setFixedHeight( scopeBox->sizeHint().height() );	
-	
-	progressBox->setFixedHeight( progressBox->sizeHint().height() );	
-	layout_1->addWidget( progressBox,1,Qt::AlignBottom );
-	
-		
-	readSettings();
-}
-
-CSearchDialogText::~CSearchDialogText() {
-	saveSettings();
-}
-	
-const QString CSearchDialogText::getText() const {
-	return m_editCombo->currentText();
-}
-
-void CSearchDialogText::setText(const QString text){
-	//only insert the item to the list if it's not yet included
-	bool found = false;
-	for (int i = 0; !found && i < m_editCombo->count(); ++i) {
-		if (m_editCombo->text(i) == text)
-			found = true;
-	}
-	if (!found) {
-		m_editCombo->insertItem(text,0);
-		m_editCombo->setCurrentItem(0);
-	}
-	m_editCombo->setFocus();	
-}
-
-const bool CSearchDialogText::isCaseSensitive() {
-	return m_checkCaseSensitive->isChecked();
-}
-
-const int CSearchDialogText::getSearchType() {
-	int ret = CSwordModuleSearch::multipleWords;	//"multiple words" is standard
-	if (m_radioExactSearch->isChecked()) {
-		ret = CSwordModuleSearch::exactPhrase;
-	}
-	else if (m_radioRegularExpression->isChecked()) {
-		ret = CSwordModuleSearch::regExp;
-	}
-	return ret;
-}
-
-const QString CSearchDialogText::getSearchTypeString() {
-	QString ret = m_radioMultipleWords->text();	//"multiple words" is standard
-	if (m_radioExactSearch->isChecked()) {
-		ret = m_radioExactSearch->text();
-	}
-	else if (m_radioRegularExpression->isChecked()) {
-		ret = m_radioRegularExpression->text();
-	}
-	return ret;
-
-}
-void CSearchDialogText::updateCurrentProgress(const unsigned short int percent){
-	m_currentProgressBar->setValue(percent);
-}
-
-void CSearchDialogText::updateOverallProgress(const unsigned short int percent){
-	m_overallProgressBar->setValue(percent);
-}
-
-/** resets the widgets. */
-void CSearchDialogText::reset(){
-	m_currentProgressBar->setValue(0);
-	m_overallProgressBar->setValue(0);
-	m_editCombo->clear();
-}
-
-/** Reads settings to restore the last used state. */
-void CSearchDialogText::readSettings(){
-	QStringList list = CBTConfig::get( CBTConfig::searchCompletionTexts );
-	m_editCombo->completionObject()->setItems( list );
-	
-	list = CBTConfig::get(CBTConfig::searchTexts);
-	m_editCombo->setHistoryItems( list );
-}
-
-void CSearchDialogText::saveSettings(){
-	QStringList list = m_editCombo->completionObject()->items();
-	CBTConfig::set(CBTConfig::searchCompletionTexts, list);
-	
-	list = m_editCombo->historyItems();
-	CBTConfig::set(CBTConfig::searchTexts, list);	
-}
diff --git a/bibletime/frontend/searchdialog/csearchdialogtext.h b/bibletime/frontend/searchdialog/csearchdialogtext.h
deleted file mode 100644
index e76b87f..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogtext.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
-                        csearchdialogtext.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 CSEARCHDIALOGTEXT_H
-#define CSEARCHDIALOGTEXT_H
-
-//Qt includes
-#include <qwidget.h>
-
-class KHistoryCombo;
-class QRadioButton;
-class QCheckBox;
-class KProgress;
-class CSearchDialogScopeChooser;
-
-/** First tab page of the searchdialog.
-	* This class is the first tab pge of the searchdialog.
-	* It provides the interface to define the search text, the search scope and the modules to search in.
-	*/
-class CSearchDialogText : public QWidget
-{
-    Q_OBJECT
-public:
-  /**
-  * The constructor of the search dialog search tab page.
-  */
-	CSearchDialogText(QWidget *parent = 0, const char *name = 0);
-	virtual ~CSearchDialogText();
-  /**
-  * Returns the scopechooser
-  */
-  CSearchDialogScopeChooser *scopeChooser;
-  /**
-  * Returns the text the user want to search for
-  */
-	const QString getText() const;
-  /**
-  * Sets the search text
-  */
-	void setText(const QString);
-  /**
-  * Returns true if case sensitive search is enabled.
-  */
-	const bool isCaseSensitive();
-  /**
-  * Returns the current type of search.
-  */
-	const int getSearchType();
-  /**
-  * Returns the string of current type of search.
-  */
-  const QString getSearchTypeString();
-  /**
-  * Updates the progress bar for the modulw which is searched at the moment
-  */
-	void updateCurrentProgress(const unsigned short int);
-  /**
-  * Updates the progres bar which gives the progress for the whole search
-  */
-	void updateOverallProgress(const unsigned short int);
-  /**
-  * Resets the widgets.
-  */
-  void reset();
-
-private:
-  void readSettings();
-  void saveSettings();
-
-	KHistoryCombo *m_editCombo;
-	QRadioButton	*m_radioMultipleWords;
-	QRadioButton	*m_radioExactSearch;
-	QRadioButton	*m_radioRegularExpression;
-	QCheckBox			*m_checkCaseSensitive;
-	KProgress			*m_currentProgressBar;
-	KProgress			*m_overallProgressBar;
-};
-#endif
diff --git a/bibletime/frontend/thirdparty/Makefile.am b/bibletime/frontend/thirdparty/Makefile.am
deleted file mode 100644
index ba0e987..0000000
--- a/bibletime/frontend/thirdparty/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-KDE_CXXFLAGS=-fno-rtti -fno-exceptions
-SUBDIRS = qt3stuff
-INCLUDES = $(all_includes)
-libthirdparty_a_METASOURCES = AUTO
-noinst_LIBRARIES = libthirdparty.a
-libthirdparty_a_SOURCES = dummy.cpp
-EXTRA_DIST = $(libthirdparty_a_SOURCES)
-
-dummy.cpp:
-	touch dummy.cpp
diff --git a/bibletime/frontend/thirdparty/Makefile.in b/bibletime/frontend/thirdparty/Makefile.in
deleted file mode 100644
index 06993a3..0000000
--- a/bibletime/frontend/thirdparty/Makefile.in
+++ /dev/null
@@ -1,646 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_CXXFLAGS = -fno-rtti -fno-exceptions
-SUBDIRS = qt3stuff
-INCLUDES = $(all_includes)
-#>- libthirdparty_a_METASOURCES = AUTO
-noinst_LIBRARIES = libthirdparty.a
-libthirdparty_a_SOURCES = dummy.cpp
-EXTRA_DIST = $(libthirdparty_a_SOURCES)
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libthirdparty_a_LIBADD = 
-#>- libthirdparty_a_OBJECTS =  dummy.$(OBJEXT)
-#>+ 1
-libthirdparty_a_OBJECTS = dummy.$(OBJEXT)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/dummy.P
-#>+ 4
-@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libthirdparty_a.all_cpp.P \
-	  .deps/dummy.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =    .deps/dummy.P
-
-SOURCES = $(libthirdparty_a_SOURCES)
-OBJECTS = $(libthirdparty_a_OBJECTS)
-
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/thirdparty/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/thirdparty/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/thirdparty/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libthirdparty.a: $(libthirdparty_a_OBJECTS) $(libthirdparty_a_DEPENDENCIES)
-	-rm -f libthirdparty.a
-	$(AR) cru libthirdparty.a $(libthirdparty_a_OBJECTS) $(libthirdparty_a_LIBADD)
-	$(RANLIB) libthirdparty.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/frontend/thirdparty
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/frontend/thirdparty/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-#>- clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-dummy.cpp:
-	touch dummy.cpp
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/thirdparty/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/thirdparty/Makefile.in
-
-
-#>+ 11
-libthirdparty_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp  
-	@echo 'creating libthirdparty_a.all_cpp.cpp ...'; \
-	rm -f libthirdparty_a.all_cpp.files libthirdparty_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libthirdparty_a.all_cpp.final; \
-	for file in dummy.cpp ; do \
-	  echo "#include \"$$file\"" >> libthirdparty_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libthirdparty_a.all_cpp.final; \
-	done; \
-	cat libthirdparty_a.all_cpp.final libthirdparty_a.all_cpp.files  > libthirdparty_a.all_cpp.cpp; \
-	rm -f libthirdparty_a.all_cpp.final libthirdparty_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libthirdparty_a.all_cpp.cpp
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/frontend/thirdparty/dummy.cpp b/bibletime/frontend/thirdparty/dummy.cpp
deleted file mode 100644
index e69de29..0000000
--- a/bibletime/frontend/thirdparty/dummy.cpp
+++ /dev/null
diff --git a/bibletime/frontend/thirdparty/qt3stuff/Makefile.am b/bibletime/frontend/thirdparty/qt3stuff/Makefile.am
deleted file mode 100644
index b10c1cb..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-KDE_OPTIONS = qtonly
-
-INCLUDES = $(all_includes)
-
-libqt3stuff_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libqt3stuff.a
-
-libqt3stuff_a_SOURCES = \
-qrichtext.cpp \
-qstylesheet.cpp \
-qtextview.cpp \
-qtextedit.cpp \
-qcomplextext.cpp
-
-all_headers = qrichtext_p.h \
-qstylesheet.h \
-qtextview.h \
-qtextedit.h \
-qcomplextext_p.h \
-qt3stuff.h \
-qcleanuphandler.h
-
-EXTRA_DIST = $(libqt3stuff_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/thirdparty/qt3stuff/Makefile.in b/bibletime/frontend/thirdparty/qt3stuff/Makefile.in
deleted file mode 100644
index 5c435d4..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/Makefile.in
+++ /dev/null
@@ -1,610 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_OPTIONS = qtonly
-
-INCLUDES = $(all_includes)
-
-#>- libqt3stuff_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libqt3stuff.a
-
-libqt3stuff_a_SOURCES =  qrichtext.cpp qstylesheet.cpp qtextview.cpp qtextedit.cpp qcomplextext.cpp
-
-
-all_headers = qrichtext_p.h qstylesheet.h qtextview.h qtextedit.h qcomplextext_p.h qt3stuff.h qcleanuphandler.h
-
-
-EXTRA_DIST = $(libqt3stuff_a_SOURCES) $(all_headers)
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libqt3stuff_a_LIBADD = 
-#>- libqt3stuff_a_OBJECTS =  qrichtext.$(OBJEXT) qstylesheet.$(OBJEXT) \
-#>- qtextview.$(OBJEXT) qtextedit.$(OBJEXT) qcomplextext.$(OBJEXT)
-#>+ 6
-libqt3stuff_a_final_OBJECTS = libqt3stuff_a.all_cpp.o 
-libqt3stuff_a_nofinal_OBJECTS = qrichtext.$(OBJEXT) qstylesheet.$(OBJEXT) \
-qtextview.$(OBJEXT) qtextedit.$(OBJEXT) qcomplextext.$(OBJEXT)\
-qstylesheet.moc.o qrichtext_p.moc.o qtextview.moc.o qtextedit.moc.o 
-@KDE_USE_FINAL_FALSE@libqt3stuff_a_OBJECTS = $(libqt3stuff_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libqt3stuff_a_OBJECTS = $(libqt3stuff_a_final_OBJECTS)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=qcomplextext_p.h qtextview.h qcleanuphandler.h qtextedit.h qt3stuff.h qrichtext_p.h qstylesheet.h 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/qcomplextext.P .deps/qrichtext.P .deps/qstylesheet.P \
-#>- .deps/qtextedit.P .deps/qtextview.P
-#>+ 6
-@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/qstylesheet.moc.P $(DEPDIR)/qrichtext_p.moc.P $(DEPDIR)/qtextview.moc.P $(DEPDIR)/qtextedit.moc.P  $(DEPDIR)/libqt3stuff_a.all_cpp.P \
-	  .deps/qcomplextext.P .deps/qrichtext.P .deps/qstylesheet.P \
-.deps/qtextedit.P .deps/qtextview.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/qstylesheet.moc.P $(DEPDIR)/qrichtext_p.moc.P $(DEPDIR)/qtextview.moc.P $(DEPDIR)/qtextedit.moc.P   .deps/qcomplextext.P .deps/qrichtext.P .deps/qstylesheet.P \
-.deps/qtextedit.P .deps/qtextview.P
-
-SOURCES = $(libqt3stuff_a_SOURCES)
-OBJECTS = $(libqt3stuff_a_OBJECTS)
-
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/thirdparty/qt3stuff/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/thirdparty/qt3stuff/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/thirdparty/qt3stuff/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libqt3stuff.a: $(libqt3stuff_a_OBJECTS) $(libqt3stuff_a_DEPENDENCIES)
-	-rm -f libqt3stuff.a
-	$(AR) cru libqt3stuff.a $(libqt3stuff_a_OBJECTS) $(libqt3stuff_a_LIBADD)
-	$(RANLIB) libqt3stuff.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/frontend/thirdparty/qt3stuff
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/frontend/thirdparty/qt3stuff/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-#>- clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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
-qstylesheet.moc.cpp: $(srcdir)/qstylesheet.h
-	$(MOC) $(srcdir)/qstylesheet.h -o qstylesheet.moc.cpp
-
-#>+ 3
-qrichtext_p.moc.cpp: $(srcdir)/qrichtext_p.h
-	$(MOC) $(srcdir)/qrichtext_p.h -o qrichtext_p.moc.cpp
-
-#>+ 3
-qtextview.moc.cpp: $(srcdir)/qtextview.h
-	$(MOC) $(srcdir)/qtextview.h -o qtextview.moc.cpp
-
-#>+ 3
-qtextedit.moc.cpp: $(srcdir)/qtextedit.h
-	$(MOC) $(srcdir)/qtextedit.h -o qtextedit.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  qstylesheet.moc.cpp qrichtext_p.moc.cpp qtextview.moc.cpp qtextedit.moc.cpp
-
-#>+ 2
-docs-am:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/thirdparty/qt3stuff/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/thirdparty/qt3stuff/Makefile.in
-
-
-#>+ 11
-libqt3stuff_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/qrichtext.cpp $(srcdir)/qstylesheet.cpp $(srcdir)/qtextview.cpp $(srcdir)/qtextedit.cpp $(srcdir)/qcomplextext.cpp  qstylesheet.moc.cpp qrichtext_p.moc.cpp qtextview.moc.cpp qtextedit.moc.cpp
-	@echo 'creating libqt3stuff_a.all_cpp.cpp ...'; \
-	rm -f libqt3stuff_a.all_cpp.files libqt3stuff_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libqt3stuff_a.all_cpp.final; \
-	for file in qrichtext.cpp qstylesheet.cpp qtextview.cpp qtextedit.cpp qcomplextext.cpp  qstylesheet.moc.cpp qrichtext_p.moc.cpp qtextview.moc.cpp qtextedit.moc.cpp; do \
-	  echo "#include \"$$file\"" >> libqt3stuff_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libqt3stuff_a.all_cpp.final; \
-	done; \
-	cat libqt3stuff_a.all_cpp.final libqt3stuff_a.all_cpp.files  > libqt3stuff_a.all_cpp.cpp; \
-	rm -f libqt3stuff_a.all_cpp.final libqt3stuff_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libqt3stuff_a.all_cpp.cpp
-
-#>+ 2
-final:
-	$(MAKE) libqt3stuff_a_OBJECTS="$(libqt3stuff_a_final_OBJECTS)" all-am
-#>+ 2
-no-final:
-	$(MAKE) libqt3stuff_a_OBJECTS="$(libqt3stuff_a_nofinal_OBJECTS)" all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qcleanuphandler.h b/bibletime/frontend/thirdparty/qt3stuff/qcleanuphandler.h
deleted file mode 100644
index 39f5af8..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qcleanuphandler.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef QCLEANUPHANDLER_H
-#define QCLEANUPHANDLER_H
-
-#ifndef QT_H
-#include <qlist.h>
-#include <qguardedptr.h>
-#endif // QT_H
-
-template<class Type>
-class Q_EXPORT QGuardedCleanupHandler
-{
-public:
-    ~QGuardedCleanupHandler() { clear(); }
-
-    void add( Type* object )
-    {
-	cleanupObjects.insert( 0, new QGuardedPtr<Type>(object) );
-    }
-
-    void remove( Type *object )
-    {
-	QListIterator<QGuardedPtr<Type> > it( cleanupObjects );
-	while ( it.current() ) {
-	    QGuardedPtr<Type>* guard = it.current();
-	    ++it;
-	    if ( (Type *)guard == object ) {
-		cleanupObjects.removeRef( guard );
-		delete guard;
-		break;
-	    }
-	}
-    }
-
-    bool isEmpty() const
-    {
-	QListIterator<QGuardedPtr<Type> > it( cleanupObjects );
-	while ( it.current() ) {
-	    QGuardedPtr<Type>* guard = it.current();
-	    ++it;
-	    if ( (Type*)*guard )
-		return FALSE;
-	}
-	return TRUE;
-    }
-
-    void clear() {
-	QListIterator<QGuardedPtr<Type> > it( cleanupObjects );
-	it.toLast();
-	while ( it.current() ) {
-	    QGuardedPtr<Type>* guard = it.current();
-	    --it;
-	    cleanupObjects.removeRef( guard );
-	    delete (Type*)*guard;
-	    delete guard;
-	}
-    }
-
-private:
-    QList<QGuardedPtr<Type> > cleanupObjects;
-};
-
-template<class Type>
-class Q_EXPORT QCleanupHandler
-{
-public:
-    QCleanupHandler() : cleanupObjects( 0 )
-    {}
-    ~QCleanupHandler() { clear(); }
-
-    void add( Type* object )
-    {
-	if ( !cleanupObjects ) {
-	    cleanupObjects = new QList<Type>;
-	}
-	cleanupObjects->insert( 0, object );
-    }
-
-    void remove( Type *object )
-    {
-	if ( !cleanupObjects )
-	    return;
-	if ( object )
-	    cleanupObjects->removeRef( object );
-    }
-
-    bool isEmpty() const
-    {
-	return cleanupObjects ? cleanupObjects->isEmpty() : TRUE;
-    }
-
-    void clear()
-    {
-	if ( !cleanupObjects )
-	    return;
-
-	QListIterator<Type> it( *cleanupObjects );
-	it.toLast();
-	while ( it.current() ) {
-	    Type* object = it.current();
-	    --it;
-	    cleanupObjects->removeRef( object );
-	    delete object;
-	}
-
-	delete cleanupObjects;
-	cleanupObjects = 0;
-    }
-
-private:
-    QList<Type> *cleanupObjects;
-};
-
-#endif //QCLEANUPHANDLER_H
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qcomplextext.cpp b/bibletime/frontend/thirdparty/qt3stuff/qcomplextext.cpp
deleted file mode 100644
index 8f675f2..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qcomplextext.cpp
+++ /dev/null
@@ -1,1313 +0,0 @@
-#include "qcomplextext_p.h"
-#include "qrichtext_p.h"
-//#include "qfontdata_p.h"
-#include "qfontmetrics.h"
-#include "qrect.h"
-#include <stdlib.h>
-
-using namespace Qt3;
-
-// -----------------------------------------------------
-
-/* a small helper class used internally to resolve Bidi embedding levels.
-   Each line of text caches the embedding level at the start of the line for faster
-   relayouting
-*/
-QBidiContext::QBidiContext( uchar l, QChar::Direction e, QBidiContext *p, bool o )
-    : level(l) , override(o), dir(e)
-{
-    if ( p )
-	p->ref();
-    parent = p;
-    count = 0;
-}
-
-QBidiContext::~QBidiContext()
-{
-    if( parent && parent->deref() )
-	delete parent;
-}
-
-//static QChar *shapeBuffer = 0;
-//static int shapeBufSize = 0;
-
-/*
-   Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on
-   arabic).
-
-   Each unicode char has a joining class (right, dual (left&right), center (joincausing) or transparent).
-   transparent joining is not encoded in QChar::joining(), but applies to all combining marks and format marks.
-
-   Right join-causing: dual + center
-   Left join-causing: dual + right + center
-
-   Rules are as follows (for a string already in visual order, as we have it here):
-
-   R1 Transparent characters do not affect joining behaviour.
-   R2 A right joining character, that has a right join-causing char on the right will get form XRight
-   (R3 A left joining character, that has a left join-causing char on the left will get form XLeft)
-   Note: the above rule is meaningless, as there are no pure left joining characters defined in Unicode
-   R4 A dual joining character, that has a left join-causing char on the left and a right join-causing char on
-             the right will get form XMedial
-   R5  A dual joining character, that has a right join causing char on the right, and no left join causing char on the left
-         will get form XRight
-   R6 A dual joining character, that has a  left join causing char on the left, and no right join causing char on the right
-         will get form XLeft
-   R7 Otherwise the character will get form XIsolated
-
-   Additionally we have to do the minimal ligature support for lam-alef ligatures:
-
-   L1 Transparent characters do not affect ligature behaviour.
-   L2 Any sequence of Alef(XRight) + Lam(XMedial) will form the ligature Alef.Lam(XLeft)
-   L3 Any sequence of Alef(XRight) + Lam(XLeft) will form the ligature Alef.Lam(XIsolated)
-
-   The two functions defined in this class do shaping in visual and logical order. For logical order just replace right with
-   previous and left with next in the above rules ;-)
-*/
-
-/*
-  Two small helper functions for arabic shaping. They get the next shape causing character on either
-  side of the char in question. Implements rule R1.
-
-  leftChar() returns true if the char to the left is a left join-causing char
-  rightChar() returns true if the char to the right is a right join-causing char
-*/
-static inline const QChar *prevChar( const QString &str, int pos )
-{
-    //qDebug("leftChar: pos=%d", pos);
-    pos--;
-    const QChar *ch = str.unicode() + pos;
-    while( pos > -1 ) {
-        if( !ch->isMark() )
-            return ch;
-        pos--;
-        ch--;
-    }
-    return &QChar::replacement;
-}
-
-static inline const QChar *nextChar( const QString &str, int pos)
-{
-    pos++;
-    int len = str.length();
-    const QChar *ch = str.unicode() + pos;
-    while( pos < len ) {
-        //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
-        if( !ch->isMark() )
-            return ch;
-        // assume it's a transparent char, this might not be 100% correct
-        pos++;
-        ch++;
-    }
-    return &QChar::replacement;
-}
-
-static inline bool prevVisualCharJoins( const QString &str, int pos)
-{
-    return (     prevChar( str, pos )->joining() != QChar::OtherJoining );
-}
-
-static inline bool nextVisualCharJoins( const QString &str, int pos)
-{
-    QChar::Joining join = nextChar( str, pos )->joining();
-    return ( join == QChar::Dual || join == QChar::Center );
-}
-
-// QT2HACK
-#if 0
-
-QComplexText::Shape QComplexText::glyphVariant( const QString &str, int pos)
-{
-    // ignores L1 - L3, done in the codec
-    QChar::Joining joining = str[pos].joining();
-    //qDebug("checking %x, joining=%d", str[pos].unicode(), joining);
-    switch ( joining ) {
-        case QChar::OtherJoining:
-        case QChar::Center:
-            // these don't change shape
-            return XIsolated;
-        case QChar::Right:
-            // only rule R2 applies
-            if( nextVisualCharJoins( str, pos ) )
-                return XFinal;
-            return XIsolated;
-        case QChar::Dual:
-            bool right = nextVisualCharJoins( str, pos );
-            bool left = prevVisualCharJoins( str, pos );
-            //qDebug("dual: right=%d, left=%d", right, left);
-            if( right && left )
-                return XMedial;
-            else if ( right )
-                return XFinal;
-            else if ( left )
-                return XInitial;
-            else
-                return XIsolated;
-    }
-    return XIsolated;
-}
-
-/* and the same thing for logical ordering :)
- */
-static inline bool prevLogicalCharJoins( const QString &str, int pos)
-{
-    return (     nextChar( str, pos )->joining() != QChar::OtherJoining );
-}
-
-static inline bool nextLogicalCharJoins( const QString &str, int pos)
-{
-    QChar::Joining join = prevChar( str, pos )->joining();
-    return ( join == QChar::Dual || join == QChar::Center );
-}
-
-
-QComplexText::Shape QComplexText::glyphVariantLogical( const QString &str, int pos)
-{
-    // ignores L1 - L3, ligatures are job of the codec
-    QChar::Joining joining = str[pos].joining();
-    //qDebug("checking %x, joining=%d", str[pos].unicode(), joining);
-    switch ( joining ) {
-        case QChar::OtherJoining:
-        case QChar::Center:
-            // these don't change shape
-            return XIsolated;
-        case QChar::Right:
-            // only rule R2 applies
-            if( nextLogicalCharJoins( str, pos ) )
-                return XFinal;
-            return XIsolated;
-        case QChar::Dual:
-            bool right = nextLogicalCharJoins( str, pos );
-            bool left = prevLogicalCharJoins( str, pos );
-            //qDebug("dual: right=%d, left=%d", right, left);
-            if( right && left )
-                return XMedial;
-            else if ( right )
-                return XFinal;
-            else if ( left )
-                return XInitial;
-            else
-                return XIsolated;
-    }
-    return XIsolated;
-}
-
-// -------------------------------------------------------------
-
-// The unicode to unicode shaping codec.
-// does only presentation forms B at the moment, but that should be enough for
-// simple display
-static const ushort arabicUnicodeMapping[256][4] = {
-    // base of shaped forms, and number-1 of them ( 0 for non shaping,
-    // 1 for right binding and 3 for dual binding
-    { 0x0600, 0 }, // 0x600
-    { 0x0601, 0 }, // 0x601
-    { 0x0602, 0 }, // 0x602
-    { 0x0603, 0 }, // 0x603
-    { 0x0604, 0 }, // 0x604
-    { 0x0605, 0 }, // 0x605
-    { 0x0606, 0 }, // 0x606
-    { 0x0607, 0 }, // 0x607
-    { 0x0608, 0 }, // 0x608
-    { 0x0609, 0 }, // 0x609
-    { 0x060a, 0 }, // 0x60a
-    { 0x060b, 0 }, // 0x60b
-    { 0x060c, 0 }, // 0x60c     Arabic comma
-    { 0x060d, 0 }, // 0x60d
-    { 0x060e, 0 }, // 0x60e
-    { 0x060f, 0xfffd, 0xfffd, 0xfffd }, // 0x60f
-
-    { 0x0610, 0 }, // 0x610
-    { 0x0611, 0 }, // 0x611
-    { 0x0612, 0 }, // 0x612
-    { 0x0613, 0 }, // 0x613
-    { 0x0614, 0 }, // 0x614
-    { 0x0615, 0 }, // 0x615
-    { 0x0616, 0 }, // 0x616
-    { 0x0617, 0 }, // 0x617
-    { 0x0618, 0 }, // 0x618
-    { 0x0619, 0 }, // 0x619
-    { 0x061a, 0 }, // 0x61a
-    { 0x061b, 0 }, // 0x61b     Arabic semicolon
-    { 0x061c, 0 }, // 0x61c
-    { 0x061d, 0 }, // 0x61d
-    { 0x061e, 0 }, // 0x61e
-    { 0x061f, 0 }, // 0x61f     Arabic question mark
-
-    { 0x0620, 0 }, // 0x620
-    { 0xfe80, 0 }, // 0x621     Hamza
-    { 0xfe81, 1 }, // 0x622     R       Alef with Madda above
-    { 0xfe83, 1 }, // 0x623     R       Alef with Hamza above
-    { 0xfe85, 1 }, // 0x624     R       Waw with Hamza above
-    { 0xfe87, 1 }, // 0x625     R       Alef with Hamza below
-    { 0xfe89, 3 }, // 0x626     D       Yeh with Hamza above
-    { 0xfe8d, 1 }, // 0x627     R       Alef
-    { 0xfe8f, 3 }, // 0x628     D       Beh
-    { 0xfe93, 1 }, // 0x629     R       Teh Marbuta
-    { 0xfe95, 3 }, // 0x62a     D       Teh
-    { 0xfe99, 3 }, // 0x62b     D       Theh
-    { 0xfe9d, 3 }, // 0x62c     D       Jeem
-    { 0xfea1, 3 }, // 0x62d     D       Hah
-    { 0xfea5, 3 }, // 0x62e     D       Khah
-    { 0xfea9, 1 }, // 0x62f     R       Dal
-
-    { 0xfeab, 1 }, // 0x630     R       Thal
-    { 0xfead, 1 }, // 0x631     R       Reh
-    { 0xfeaf, 1 }, // 0x632     R       Zain
-    { 0xfeb1, 1 }, // 0x633     D       Seen
-    { 0xfeb5, 3 }, // 0x634     D       Sheen
-    { 0xfeb9, 3 }, // 0x635     D       Sad
-    { 0xfebd, 3 }, // 0x636     D       Dad
-    { 0xfec1, 3 }, // 0x637     D       Tah
-    { 0xfec5, 3 }, // 0x638     D       Zah
-    { 0xfec9, 3 }, // 0x639     D       Ain
-    { 0xfecd, 3 }, // 0x63a     D       Ghain
-    { 0x063b, 0 }, // 0x63b
-    { 0x063c, 0 }, // 0x63c
-    { 0x063d, 0 }, // 0x63d
-    { 0x063e, 0 }, // 0x63e
-    { 0x063f, 0 }, // 0x63f
-
-    { 0x0640, 0 }, // 0x640     C       Tatweel
-    { 0xfed1, 3 }, // 0x641     D       Feh
-    { 0xfed5, 3 }, // 0x642     D       Qaf
-    { 0xfed9, 3 }, // 0x643     D       Kaf
-    { 0xfedd, 3 }, // 0x644     D       Lam
-    { 0xfee1, 3 }, // 0x645     D       Meem
-    { 0xfee5, 3 }, // 0x646     D       Noon
-    { 0xfee9, 3 }, // 0x647     D       Heh
-    { 0xfeed, 1 }, // 0x648     R       Waw
-    { 0xfeef, 1 }, // 0x649     R       Alef Maksura // ### Dual according to newest arabicshaping.txt
-    { 0xfef1, 3 }, // 0x64a     D       Yeh
-    { 0x064b, 0 }, // 0x64b     Mark Fathatan
-    { 0x064c, 0 }, // 0x64c     Mark Dammatan
-    { 0x064d, 0 }, // 0x64d     Mark Kasratan
-    { 0x064e, 0 }, // 0x64e     Mark Fatha
-    { 0x064f, 0 }, // 0x64f     Mark Damma
-
-    { 0x0650, 0 }, // 0x650     Mark Kasra
-    { 0x0651, 0 }, // 0x651     Mark Shadda
-    { 0x0652, 0 }, // 0x652     Mark Sukan
-    // these do not exist in latin6 anymore:
-    { 0x0653, 0 }, // 0x653     Mark Maddah above
-    { 0x0654, 0 }, // 0x654     Mark Hamza above
-    { 0x0655, 0 }, // 0x655     Mark Hamza below
-    { 0x0656, 0 }, // 0x656
-    { 0x0657, 0 }, // 0x657
-    { 0x0658, 0 }, // 0x658
-    { 0x0659, 0 }, // 0x659
-    { 0x065a, 0 }, // 0x65a
-    { 0x065b, 0 }, // 0x65b
-    { 0x065c, 0 }, // 0x65c
-    { 0x065d, 0 }, // 0x65d
-    { 0x065e, 0 }, // 0x65e
-    { 0x065f, 0 }, // 0x65f
-
-    { 0x0660, 0 }, // 0x660     Arabic 0
-    { 0x0661, 0 }, // 0x661     Arabic 1
-    { 0x0662, 0 }, // 0x662     Arabic 2
-    { 0x0663, 0 }, // 0x663     Arabic 3
-    { 0x0664, 0 }, // 0x664     Arabic 4
-    { 0x0665, 0 }, // 0x665     Arabic 5
-    { 0x0666, 0 }, // 0x666     Arabic 6
-    { 0x0667, 0 }, // 0x667     Arabic 7
-    { 0x0668, 0 }, // 0x668     Arabic 8
-    { 0x0669, 0 }, // 0x669     Arabic 9
-    { 0x066a, 0 }, // 0x66a     Arabic % sign
-    { 0x066b, 0 }, // 0x66b     Arabic decimal separator
-    { 0x066c, 0 }, // 0x66c     Arabic thousands separator
-    { 0x066d, 0 }, // 0x66d     Arabic five pointed star
-    { 0x066e, 0 }, // 0x66e
-    { 0x066f, 0 }, // 0x66f
-
-        // ### some glyphs do not have shaped mappings in the presentation forms A.
-        // these have the shaping set to 0 for the moment. Will have to find out better mappings for them.
-    { 0x0670, 0 }, // 0x670
-    { 0xfb50, 1 }, // 0x671 R   Alef Wasla
-    { 0x0672, 0 }, // 0x672 R    Alef with wavy Hamza above
-    { 0x0673, 0 }, // 0x673 R   Alef with wavy Hamza below
-    { 0x0674, 0 }, // 0x674 U   High Hamza
-    { 0x0675, 0 }, // 0x675 R   High Hamza Alef
-    { 0x0676, 0 }, // 0x676 R   High Hamza Wav
-    { 0xfbdd, 0 }, // 0x677 R   U with hamza above // ### only isolated form found...
-    { 0x0678, 0 }, // 0x678 D   High hamza yeh
-    { 0xfb66, 3 }, // 0x679 D   ttheh
-    { 0xfb5e, 3 }, // 0x67a D   theheh
-    { 0xfb52, 3 }, // 0x67b D   beeh
-    { 0x067c, 0 }, // 0x67cD    teh with ring
-    { 0x067d, 0 }, // 0x67d D   teh with three dots above downwards
-    { 0xfb56, 3 }, // 0x67e D   peh
-    { 0xfb62, 3 }, // 0x67f D   teheh
-
-    { 0xfb5a, 3 }, // 0x680 D   beheh
-    { 0x0681, 0 }, // 0x681 D   hah with hamza above
-    { 0x0682, 0 }, // 0x682 D   hah with two dots vertical above
-    { 0xfb76, 3 }, // 0x683 D   nyeh
-    { 0xfb72, 3 }, // 0x684 D   dyeh
-    { 0x0685, 0 }, // 0x685 D   hah with three dots above
-    { 0xfb7a, 3 }, // 0x686 D   tcheh
-    { 0xfb7e, 3 }, // 0x687 D   tcheheh
-    { 0xfb88, 1 }, // 0x688 R   ddal
-    { 0x0689, 0 }, // 0x689 R   dal with ring
-    { 0x068a, 0 }, // 0x68a R   dal with dot
-    { 0x068b, 0 }, // 0x68b R   dal with dot below and small tah
-    { 0xfb84, 1 }, // 0x68cR    dahal
-    { 0xfb82, 1 }, // 0x68d R   ddahal
-    { 0xfb86, 1 }, // 0x68e R   dul
-    { 0x068f, 0 }, // 0x68f R   dal with three dots above downwards
-
-    { 0x0690, 0 }, // 0x690 R   dal with four dots above
-    { 0xfb8c, 1 }, // 0x691 R   rreh
-    { 0x0692, 0 }, // 0x692 R   reh with small v
-    { 0x0693, 0 }, // 0x693 R   reh with ring
-    { 0x0694, 0 }, // 0x694 R   reh with dot below
-    { 0x0695, 0 }, // 0x695 R   reh with small v below
-    { 0x0696, 0 }, // 0x696 R   reh with dot below and dot above
-    { 0x0697, 0 }, // 0x697 R   reh with two dots above
-    { 0xfb8a, 1 }, // 0x698 R   jeh
-    { 0x0699, 0 }, // 0x699 R   reh with four dots above
-    { 0x069a, 0 }, // 0x69a D   seen with dot below and dot above
-    { 0x069b, 0 }, // 0x69b D   seen with three dots below
-    { 0x069c, 0 }, // 0x69cD    seen with three dots below and three dots above
-    { 0x069d, 0 }, // 0x69d D   sad with two dots below
-    { 0x069e, 0 }, // 0x69e D   sad with three dots above
-    { 0x069f, 0 }, // 0x69f D   tah with three dots above
-
-    { 0x06a0, 0 }, // 0x6a0 D   ain with three dots above
-    { 0x06a1, 0 }, // 0x6a1 D   dotless feh
-    { 0x06a2, 0 }, // 0x6a2 D   feh with dot moved below
-    { 0x06a3, 0 }, // 0x6a3 D   feh with dot below
-    { 0xfb6a, 3 }, // 0x6a4 D   veh
-    { 0x06a5, 0 }, // 0x6a5 D   feh with three dots below
-    { 0xfb6e, 3 }, // 0x6a6 D   peheh
-    { 0x06a7, 0 }, // 0x6a7 D   qaf with dot above
-    { 0x06a8, 0 }, // 0x6a8 D   qaf woith three dots above
-    { 0xfb8e, 3 }, // 0x6a9 D   keheh
-    { 0x06aa, 0 }, // 0x6aa D   swash kaf
-    { 0x06ab, 0 }, // 0x6ab D   kaf with ring
-    { 0x06ac, 0 }, // 0x6acD    kaf with dot above
-    { 0xfbd3, 3 }, // 0x6ad D   ng
-    { 0x06ae, 0 }, // 0x6ae D   kaf with three dots below
-    { 0xfb92, 3 }, // 0x6af D   gaf
-
-    { 0x06b0, 0 }, // 0x6b0 D   gaf with ring
-    { 0xfb9a, 3 }, // 0x6b1 D   ngoeh
-    { 0x06b2, 0 }, // 0x6b2 D   gaf with two dots below
-    { 0xfb96, 3 }, // 0x6b3 D   gueh
-    { 0x06b4, 0 }, // 0x6b4 D   gaf with three dots above
-    { 0x06b5, 0 }, // 0x6b5 D   lam with small v
-    { 0x06b6, 0 }, // 0x6b6 D   lam with dot above
-    { 0x06b7, 0 }, // 0x6b7 D   lam with three dots above
-    { 0x06b8, 0 }, // 0x6b8 D   lam with three dots below
-    { 0x06b9, 0 }, // 0x6b9 D   noon with dot below
-    { 0xfb9e, 1 }, // 0x6ba R   noon ghunna
-    { 0xfba0, 3 }, // 0x6bb D   rnoon
-    { 0x06bc, 0 }, // 0x6bcD    noon with ring
-    { 0x06bd, 0 }, // 0x6bd D   noon with three dots above
-    { 0xfbaa, 3 }, // 0x6be D   heh doachashmee
-    { 0x06bf, 0 }, // 0x6bf D   tcheh with dot above
-
-    { 0xfba4, 1 }, // 0x6c0 R   heh with yeh above = ligature hamza on hah (06d5 + 0654)
-    { 0xfba6, 3 }, // 0x6c1 D   heh goal
-    { 0x06c2, 0 }, // 0x6c2 R   heh goal with hamza above (06c1 + 0654)
-    { 0x06c3, 0 }, // 0x6c3 R   teh marbuta goal
-    { 0x06c4, 0 }, // 0x6c4 R   waw with ring
-    { 0xfbe0, 1 }, // 0x6c5 R   kirghiz oe
-    { 0xfbd9, 1 }, // 0x6c6 R   oe
-    { 0xfbd7, 1 }, // 0x6c7 R   u
-    { 0xfbdb, 1 }, // 0x6c8 R   yu
-    { 0xfbe2, 1 }, // 0x6c9 R   kirghiz yu
-    { 0x06ca, 0 }, // 0x6ca R   waw with teo dots above
-    { 0xfbde, 1 }, // 0x6cb R   ve
-    { 0x06cc, 0 }, // 0x6cc D   farsi yeh
-    { 0x06cd, 0 }, // 0x6cd R   yeh with tail
-    { 0x06ce, 0 }, // 0x6ce D   yeh with small v
-    { 0x06cf, 0 }, // 0x6cf R   waw with dot above
-
-    { 0xfbe4, 3 }, // 0x6d0 D   e
-    { 0x06d1, 0 }, // 0x6d1 D   yeh with three dots below
-    { 0xfbae, 1 }, // 0x6d2 R   yeh barree
-    { 0xfbb0, 1 }, // 0x6d3 R   yeh barree with hamza above
-    { 0x06d4, 0 }, // 0x6d4 U   full stop
-    { 0x06d5, 0 }, // 0x6d5 D   ae
-    { 0x06d6, 0 }, // 0x6d6     koreanic annotaion signs
-    { 0x06d7, 0 }, // 0x6d7     ...
-    { 0x06d8, 0 }, // 0x6d8
-    { 0x06d9, 0 }, // 0x6d9
-    { 0x06da, 0 }, // 0x6da
-    { 0x06db, 0 }, // 0x6db
-    { 0x06dc, 0 }, // 0x6dc
-    { 0x06dd, 0 }, // 0x6dd
-    { 0x06de, 0 }, // 0x6de
-    { 0x06df, 0 }, // 0x6df
-
-    { 0x06e0, 0 }, // 0x6e0
-    { 0x06e1, 0 }, // 0x6e1
-    { 0x06e2, 0 }, // 0x6e2
-    { 0x06e3, 0 }, // 0x6e3
-    { 0x06e4, 0 }, // 0x6e4
-    { 0x06e5, 0 }, // 0x6e5
-    { 0x06e6, 0 }, // 0x6e6
-    { 0x06e7, 0 }, // 0x6e7
-    { 0x06e8, 0 }, // 0x6e8
-    { 0x06e9, 0 }, // 0x6e9
-    { 0x06ea, 0 }, // 0x6ea
-    { 0x06eb, 0 }, // 0x6eb
-    { 0x06ec, 0 }, // 0x6ec
-    { 0x06ed, 0 }, // 0x6ed
-    { 0x06ee, 0 }, // 0x6ee
-    { 0x06ef, 0 }, // 0x6ef
-
-    { 0x06f0, 0 }, // 0x6f0     Arabic indic digit 0
-    { 0x06f1, 0 }, // 0x6f1
-    { 0x06f2, 0 }, // 0x6f2
-    { 0x06f3, 0 }, // 0x6f3
-    { 0x06f4, 0 }, // 0x6f4
-    { 0x06f5, 0 }, // 0x6f5
-    { 0x06f6, 0 }, // 0x6f6
-    { 0x06f7, 0 }, // 0x6f7
-    { 0x06f8, 0 }, // 0x6f8
-    { 0x06f9, 0 }, // 0x6f9     Arabic indic digit 9
-    { 0x06fa, 0 }, // 0x6fa D   Sheen with dot below
-    { 0x06fb, 0 }, // 0x6fb D   dad with dot below
-    { 0x06fc, 0 }, // 0x6fc D   ghain with dot below
-    { 0x06fd, 0 }, // 0x6fd     Sindhi ampersand
-    { 0x06fe, 0 }, // 0x6fe     sindhi postposition
-    { 0x06ff, 0 }, // 0x6ff
-
-};
-
-// this is a bit tricky. Alef always binds to the right, so the second parameter descibing the shape
-// of the lam can be either initial of medial. So initial maps to the isolated form of the ligature,
-// medial to the final form
-static const ushort arabicUnicodeLamAlefMapping[6][4] = {
-    { 0xfffd, 0xfffd, 0xfef5, 0xfef6 }, // 0x622        R       Alef with Madda above
-    { 0xfffd, 0xfffd, 0xfef7, 0xfef8 }, // 0x623        R       Alef with Hamza above
-    { 0xfffd, 0xfffd, 0xfffd, 0xfffd }, // 0x624        R       Waw with Hamza above
-    { 0xfffd, 0xfffd, 0xfef9, 0xfefa }, // 0x625        R       Alef with Hamza below
-    { 0xfffd, 0xfffd, 0xfffd, 0xfffd }, // 0x626        D       Yeh with Hamza above
-    { 0xfffd, 0xfffd, 0xfefb, 0xfefc } // 0x627         R       Alef
-};
-
-QString QComplexText::shapedString(const QString& uc, int from, int len, QPainter::TextDirection dir )
-{
-    if( len < 0 )
-        len = uc.length() - from;
-    if( len == 0 ) {
-        return QString::null;
-    }
-
-    // we have to ignore NSMs at the beginning and add at the end.
-    int num = uc.length() - from - len;
-    const QChar *ch = uc.unicode() + from + len;
-    while ( num > 0 && ch->combiningClass() != 0 ) {
-	ch++;
-	num--;
-	len++;
-    }
-    ch = uc.unicode() + from;
-    while ( len > 0 && ch->combiningClass() != 0 ) {
-	ch++;
-	len--;
-	from++;
-    }
-    if ( len == 0 ) return QString::null;
-
-    if( !shapeBuffer || len > shapeBufSize ) {
-      if( shapeBuffer ) free( (void *) shapeBuffer );
-      shapeBuffer = (QChar *) malloc( len*sizeof( QChar ) );
-//        delete [] shapeBuffer;
-//        shapeBuffer = new QChar[ len + 1];
-        shapeBufSize = len;
-    }
-
-    int lenOut = 0;
-    QChar *data = shapeBuffer;
-    if ( dir == QPainter::RTL )
-	ch += len - 1;
-    for ( int i = 0; i < len; i++ ) {
-        uchar r = ch->row();
-        uchar c = ch->cell();
-        if ( r != 0x06 ) {
-            *data = *ch;
-	    data++;
-            lenOut++;
-        } else {
-	    int pos = i + from;
-	    if ( dir == QPainter::RTL )
-		pos = from + len - 1 - i;
-            int shape = glyphVariantLogical( uc, pos );
-            //qDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, arabicUnicodeMapping[ch->cell()][shape]);
-            // take care of lam-alef ligatures (lam right of alef)
-            ushort map;
-            switch ( c ) {
-                case 0x44: { // lam
-                    const QChar *pch = nextChar( uc, pos );
-                    if ( pch->row() == 0x06 ) {
-                        switch ( pch->cell() ) {
-                            case 0x22:
-                            case 0x23:
-                            case 0x25:
-                            case 0x27:
-                                //qDebug(" lam of lam-alef ligature");
-                                map = arabicUnicodeLamAlefMapping[pch->cell() - 0x22][shape];
-                                goto next;
-                            default:
-                                break;
-                        }
-                    }
-                    break;
-                }
-                case 0x22: // alef with madda
-                case 0x23: // alef with hamza above
-                case 0x25: // alef with hamza below
-                case 0x27: // alef
-                    if ( prevChar( uc, pos )->unicode() == 0x0644 ) {
-                        // have a lam alef ligature
-                        //qDebug(" alef of lam-alef ligature");
-                        goto skip;
-                    }
-                default:
-                    break;
-            }
-            map = arabicUnicodeMapping[c][0] + shape;
-        next:
-            *data = map;
-	    data++;
-            lenOut++;
-        }
-    skip:
-	if ( dir == QPainter::RTL )
-	    ch--;
-	else
-	    ch++;
-    }
-
-    if ( dir == QPainter::RTL ) {
-	// reverses the non spacing marks to be again after the base char
-	QChar *s = shapeBuffer;
-	int i = 0;
-	while ( i < lenOut ) {
-	    if ( s->combiningClass() != 0 ) {
-		// non spacing marks
-		int clen = 1;
-		QChar *ch = s;
-		do {
-		    ch++;
-		    clen++;
-		} while ( ch->combiningClass() != 0 );
-
-		int j = 0;
-		QChar *cp = s;
-		while ( j < clen/2 ) {
-		    QChar tmp = *cp;
-		    *cp = *ch;
-		    *ch = tmp;
-		    cp++;
-		    ch--;
-		    j++;
-		}
-		s += clen;
-		i += clen;
-	    } else {
-		s++;
-		i++;
-	    }
-	}
-    }
-
-    return QConstString( shapeBuffer, lenOut ).string();
-}
-
-QChar QComplexText::shapedCharacter( const QString &str, int pos )
-{
-    const QChar *ch = str.unicode() + pos;
-    if ( ch->row() != 0x06 )
-        return *ch;
-    else {
-        int shape = glyphVariantLogical( str, pos );
-        //qDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, arabicUnicodeMapping[ch->cell()][shape]);
-        // lam aleph ligatures
-        switch ( ch->cell() ) {
-            case 0x44: { // lam
-                const QChar *nch = nextChar( str, pos );
-                if ( nch->row() == 0x06 ) {
-                    switch ( nch->cell() ) {
-                        case 0x22:
-                        case 0x23:
-                        case 0x25:
-                        case 0x27:
-                            return QChar(arabicUnicodeLamAlefMapping[nch->cell() - 0x22][shape]);
-                        default:
-                            break;
-                    }
-                }
-                break;
-            }
-            case 0x22: // alef with madda
-            case 0x23: // alef with hamza above
-            case 0x25: // alef with hamza below
-            case 0x27: // alef
-                if ( prevChar( str, pos )->unicode() == 0x0644 )
-                    // have a lam alef ligature
-                    return QChar(0);
-            default:
-                break;
-        }
-        return QChar(arabicUnicodeMapping[ch->cell()][0] + shape);
-    }
-}
-
-QPointArray QComplexText::positionMarks( QFontPrivate *f, const QString &str, int pos, QRect *boundingRect )
-{
-    int len = str.length();
-    int nmarks = 0;
-    while ( pos + nmarks < len && str[pos+nmarks +1].combiningClass() > 0 )
-        nmarks++;
-
-    if ( !nmarks )
-        return QPointArray();
-
-    QChar baseChar = QComplexText::shapedCharacter( str, pos );
-    QRect baseRect = f->boundingRect( baseChar );
-    int baseOffset = f->textWidth( str, pos, 1 );
-
-    //qDebug( "base char: bounding rect at %d/%d (%d/%d)", baseRect.x(), baseRect.y(), baseRect.width(), baseRect.height() );
-    int offset = f->request.pixelSize / 10 + 1;
-    QPointArray pa( nmarks );
-    int i;
-    unsigned char lastCmb = 0;
-    QRect attachmentRect;
-    if ( boundingRect )
-	*boundingRect = baseRect;
-    for( i = 0; i < nmarks; i++ ) {
-        QChar mark = str[pos+i+1];
-        unsigned char cmb = mark.combiningClass();
-        // combining marks of different class don't interact. Reset the rectangle.
-        if ( cmb != lastCmb ) {
-            //qDebug( "resetting rect" );
-            attachmentRect = baseRect;
-        }
-
-        QPoint p;
-        QRect markRect = f->boundingRect( mark );
-        switch( cmb ) {
-        case QChar::Combining_DoubleBelow:
-                // ### wrong in rtl context!
-        case QChar::Combining_BelowLeft:
-            p += QPoint( 0, offset );
-        case QChar::Combining_BelowLeftAttached:
-            p += attachmentRect.bottomLeft() - markRect.topLeft();
-            break;
-        case QChar::Combining_Below:
-            p += QPoint( 0, offset );
-        case QChar::Combining_BelowAttached:
-            p += attachmentRect.bottomLeft() - markRect.topLeft();
-            p += QPoint( (attachmentRect.width() - markRect.width())/2 , 0 );
-            break;
-            case QChar::Combining_BelowRight:
-            p += QPoint( 0, offset );
-        case QChar::Combining_BelowRightAttached:
-            p += attachmentRect.bottomRight() - markRect.topRight();
-            break;
-            case QChar::Combining_Left:
-            p += QPoint( -offset, 0 );
-        case QChar::Combining_LeftAttached:
-            break;
-            case QChar::Combining_Right:
-            p += QPoint( offset, 0 );
-        case QChar::Combining_RightAttached:
-            break;
-        case QChar::Combining_DoubleAbove:
-            // ### wrong in RTL context!
-        case QChar::Combining_AboveLeft:
-            p += QPoint( 0, -offset );
-        case QChar::Combining_AboveLeftAttached:
-            p += attachmentRect.topLeft() - markRect.bottomLeft();
-            break;
-            case QChar::Combining_Above:
-            p += QPoint( 0, -offset );
-        case QChar::Combining_AboveAttached:
-            p += attachmentRect.topLeft() - markRect.bottomLeft();
-            p += QPoint( (attachmentRect.width() - markRect.width())/2 , 0 );
-            break;
-            case QChar::Combining_AboveRight:
-            p += QPoint( 0, -offset );
-        case QChar::Combining_AboveRightAttached:
-            p += attachmentRect.topRight() - markRect.bottomRight();
-            break;
-
-        case QChar::Combining_IotaSubscript:
-            default:
-                break;
-        }
-        //qDebug( "char=%x combiningClass = %d offset=%d/%d", mark.unicode(), cmb, p.x(), p.y() );
-        markRect.moveBy( p.x(), p.y() );
-        p += QPoint( -baseOffset, 0 );
-        attachmentRect |= markRect;
-	if ( boundingRect )
-	    *boundingRect |= markRect;
-        lastCmb = cmb;
-        pa.setPoint( i, p );
-    }
-    return pa;
-}
-
-//#define BIDI_DEBUG 2
-#ifdef BIDI_DEBUG
-#include <iostream>
-#endif
-
-
-// transforms one line of the paragraph to visual order
-// the caller is responisble to delete the returned list of QTextRuns.
-QList<QTextRun> *QComplexText::bidiReorderLine( QBidiControl *control, const QString &text, int start, int len )
-{
-    int last = start + len - 1;
-    //printf("doing BiDi reordering from %d to %d!\n", start, last);
-
-    QList<QTextRun> *runs = new QList<QTextRun>;
-    runs->setAutoDelete(TRUE);
-
-    QBidiContext *context = control->context;
-    if ( !context ) {
-	// first line
-	if( start != 0 )
-	    qDebug( "bidiReorderLine::internal error");
-	if( text.isRightToLeft() )
-	    context = new QBidiContext( 1, QChar::DirR );
-	else
-	    context = new QBidiContext( 0, QChar::DirL );
-    }
-
-    QBidiStatus status = control->status;
-    QChar::Direction dir = QChar::DirON;
-
-    int sor = start;
-    int eor = start;
-
-    int current = start;
-    while(current < last) {
-	QChar::Direction dirCurrent;
-	if(current == (int)text.length()) {
-	    QBidiContext *c = context;
-	    while ( c->parent )
-		c = c->parent;
-	    dirCurrent = c->dir;
-	} else
-	    dirCurrent = text.at(current).direction();
-
-
-#if BIDI_DEBUG > 1
-	cout << "directions: dir=" << dir << " current=" << dirCurrent << " last=" << status.last << " eor=" << status.eor << " lastStrong=" << status.lastStrong << " embedding=" << context->dir << " level =" << (int)context->level << endl;
-#endif
-
-	switch(dirCurrent) {
-
-	    // embedding and overrides (X1-X9 in the BiDi specs)
-	case QChar::DirRLE:
-	    {
-		uchar level = context->level;
-		if(level%2) // we have an odd level
-		    level += 2;
-		else
-		    level++;
-		if(level < 61) {
-		    runs->append( new QTextRun(sor, eor, context, dir) );
-		    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-		    context = new QBidiContext(level, QChar::DirR, context);
-		    status.last = QChar::DirR;
-		    status.lastStrong = QChar::DirR;
-		}
-		break;
-	    }
-	case QChar::DirLRE:
-	    {
-		uchar level = context->level;
-		if(level%2) // we have an odd level
-		    level++;
-		else
-		    level += 2;
-		if(level < 61) {
-		    runs->append( new QTextRun(sor, eor, context, dir) );
-		    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-		    context = new QBidiContext(level, QChar::DirL, context);
-		    status.last = QChar::DirL;
-		    status.lastStrong = QChar::DirL;
-		}
-		break;
-	    }
-	case QChar::DirRLO:
-	    {
-		uchar level = context->level;
-		if(level%2) // we have an odd level
-		    level += 2;
-		else
-		    level++;
-		if(level < 61) {
-		    runs->append( new QTextRun(sor, eor, context, dir) );
-		    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-		    context = new QBidiContext(level, QChar::DirR, context, TRUE);
-		    dir = QChar::DirR;
-		    status.last = QChar::DirR;
-		    status.lastStrong = QChar::DirR;
-		}
-		break;
-	    }
-	case QChar::DirLRO:
-	    {
-		uchar level = context->level;
-		if(level%2) // we have an odd level
-		    level++;
-		else
-		    level += 2;
-		if(level < 61) {
-		    runs->append( new QTextRun(sor, eor, context, dir) );
-		    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-		    context = new QBidiContext(level, QChar::DirL, context, TRUE);
-		    dir = QChar::DirL;
-		    status.last = QChar::DirL;
-		    status.lastStrong = QChar::DirL;
-		}
-		break;
-	    }
-	case QChar::DirPDF:
-	    {
-		QBidiContext *c = context->parent;
-		if(c) {
-		    runs->append( new QTextRun(sor, eor, context, dir) );
-		    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-		    status.last = context->dir;
-		    if( context->deref() ) delete context;
-		    context = c;
-		    if(context->override)
-			dir = context->dir;
-		    else
-			dir = QChar::DirON;
-		    status.lastStrong = context->dir;
-		}
-		break;
-	    }
-
-	    // strong types
-	case QChar::DirL:
-	    if(dir == QChar::DirON)
-		dir = QChar::DirL;
-	    switch(status.last)
-		{
-		case QChar::DirL:
-		    eor = current; status.eor = QChar::DirL; break;
-		case QChar::DirR:
-		case QChar::DirAL:
-		case QChar::DirEN:
-		case QChar::DirAN:
-		    runs->append( new QTextRun(sor, eor, context, dir) );
-		    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-		    break;
-		case QChar::DirES:
-		case QChar::DirET:
-		case QChar::DirCS:
-		case QChar::DirBN:
-		case QChar::DirB:
-		case QChar::DirS:
-		case QChar::DirWS:
-		case QChar::DirON:
-		    if(dir != QChar::DirL) {
-			//last stuff takes embedding dir
-			if( context->dir == QChar::DirR ) {
-			    if(status.eor != QChar::DirR) {
-				// AN or EN
-				runs->append( new QTextRun(sor, eor, context, dir) );
-				++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-				dir = QChar::DirR;
-			    }
-			    else
-				eor = current - 1;
-			    runs->append( new QTextRun(sor, eor, context, dir) );
-			    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-			} else {
-			    if(status.eor == QChar::DirR) {
-				runs->append( new QTextRun(sor, eor, context, dir) );
-				++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-				dir = QChar::DirL;
-			    } else {
-				eor = current; status.eor = QChar::DirL; break;
-			    }
-			}
-		    } else {
-			eor = current; status.eor = QChar::DirL;
-		    }
-		default:
-		    break;
-		}
-	    status.lastStrong = QChar::DirL;
-	    break;
-	case QChar::DirAL:
-	case QChar::DirR:
-	    if(dir == QChar::DirON) dir = QChar::DirR;
-	    switch(status.last)
-		{
-		case QChar::DirR:
-		case QChar::DirAL:
-		    eor = current; status.eor = QChar::DirR; break;
-		case QChar::DirL:
-		case QChar::DirEN:
-		case QChar::DirAN:
-		    runs->append( new QTextRun(sor, eor, context, dir) );
-		    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-		    break;
-		case QChar::DirES:
-		case QChar::DirET:
-		case QChar::DirCS:
-		case QChar::DirBN:
-		case QChar::DirB:
-		case QChar::DirS:
-		case QChar::DirWS:
-		case QChar::DirON:
-		    if( status.eor != QChar::DirR && status.eor != QChar::DirAL ) {
-			//last stuff takes embedding dir
-			if(context->dir == QChar::DirR || status.lastStrong == QChar::DirR) {
-			    runs->append( new QTextRun(sor, eor, context, dir) );
-			    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-			    dir = QChar::DirR;
-			    eor = current;
-			} else {
-			    eor = current - 1;
-			    runs->append( new QTextRun(sor, eor, context, dir) );
-			    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-			    dir = QChar::DirR;
-			}
-		    } else {
-			eor = current; status.eor = QChar::DirR;
-		    }
-		default:
-		    break;
-		}
-	    status.lastStrong = dirCurrent;
-	    break;
-
-	    // weak types:
-
-	case QChar::DirNSM:
-	    // ### if @sor, set dir to dirSor
-	    break;
-	case QChar::DirEN:
-	    if(status.lastStrong != QChar::DirAL) {
-		// if last strong was AL change EN to AL
-		if(dir == QChar::DirON) {
-		    if(status.lastStrong == QChar::DirL)
-			dir = QChar::DirL;
-		    else
-			dir = QChar::DirAN;
-		}
-		switch(status.last)
-		    {
-		    case QChar::DirET:
-			if ( status.lastStrong == QChar::DirR || status.lastStrong == QChar::DirAL ) {
-			    runs->append( new QTextRun(sor, eor, context, dir) );
-			    ++eor; sor = eor; status.eor = QChar::DirON;
-			    dir = QChar::DirAN;
-			}
-			// fall through
-		    case QChar::DirEN:
-		    case QChar::DirL:
-			eor = current;
-			status.eor = dirCurrent;
-			break;
-		    case QChar::DirR:
-		    case QChar::DirAL:
-		    case QChar::DirAN:
-			runs->append( new QTextRun(sor, eor, context, dir) );
-			++eor; sor = eor; status.eor = QChar::DirEN;
-			dir = QChar::DirAN; break;
-		    case QChar::DirES:
-		    case QChar::DirCS:
-			if(status.eor == QChar::DirEN) {
-			    eor = current; break;
-			}
-		    case QChar::DirBN:
-		    case QChar::DirB:
-		    case QChar::DirS:
-		    case QChar::DirWS:
-		    case QChar::DirON:
-			if(status.eor == QChar::DirR) {
-			    // neutrals go to R
-			    eor = current - 1;
-			    runs->append( new QTextRun(sor, eor, context, dir) );
-			    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirEN;
-			    dir = QChar::DirAN;
-			}
-			else if( status.eor == QChar::DirL ||
-				 (status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
-			    eor = current; status.eor = dirCurrent;
-			} else {
-			    // numbers on both sides, neutrals get right to left direction
-			    if(dir != QChar::DirL) {
-				runs->append( new QTextRun(sor, eor, context, dir) );
-				++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-				eor = current - 1;
-				dir = QChar::DirR;
-				runs->append( new QTextRun(sor, eor, context, dir) );
-				++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-				dir = QChar::DirAN;
-			    } else {
-				eor = current; status.eor = dirCurrent;
-			    }
-			}
-		    default:
-			break;
-		    }
-		break;
-	    }
-	case QChar::DirAN:
-	    dirCurrent = QChar::DirAN;
-	    if(dir == QChar::DirON) dir = QChar::DirAN;
-	    switch(status.last)
-		{
-		case QChar::DirL:
-		case QChar::DirAN:
-		    eor = current; status.eor = QChar::DirAN; break;
-		case QChar::DirR:
-		case QChar::DirAL:
-		case QChar::DirEN:
-		    runs->append( new QTextRun(sor, eor, context, dir) );
-		    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-		    break;
-		case QChar::DirCS:
-		    if(status.eor == QChar::DirAN) {
-			eor = current; status.eor = QChar::DirR; break;
-		    }
-		case QChar::DirES:
-		case QChar::DirET:
-		case QChar::DirBN:
-		case QChar::DirB:
-		case QChar::DirS:
-		case QChar::DirWS:
-		case QChar::DirON:
-		    if(status.eor == QChar::DirR) {
-			// neutrals go to R
-			eor = current - 1;
-			runs->append( new QTextRun(sor, eor, context, dir) );
-			++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-			dir = QChar::DirAN;
-		    } else if( status.eor == QChar::DirL ||
-			       (status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
-			eor = current; status.eor = dirCurrent;
-		    } else {
-			// numbers on both sides, neutrals get right to left direction
-			if(dir != QChar::DirL) {
-			    runs->append( new QTextRun(sor, eor, context, dir) );
-			    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-			    eor = current - 1;
-			    dir = QChar::DirR;
-			    runs->append( new QTextRun(sor, eor, context, dir) );
-			    ++eor; sor = eor; dir = QChar::DirON; status.eor = QChar::DirON;
-			    dir = QChar::DirAN;
-			} else {
-			    eor = current; status.eor = dirCurrent;
-			}
-		    }
-		default:
-		    break;
-		}
-	    break;
-	case QChar::DirES:
-	case QChar::DirCS:
-	    break;
-	case QChar::DirET:
-	    if(status.last == QChar::DirEN) {
-		dirCurrent = QChar::DirEN;
-		eor = current; status.eor = dirCurrent;
-		break;
-	    }
-	    break;
-
-	    // boundary neutrals should be ignored
-	case QChar::DirBN:
-	    break;
-	    // neutrals
-	case QChar::DirB:
-	    // ### what do we do with newline and paragraph separators that come to here?
-	    break;
-	case QChar::DirS:
-	    // ### implement rule L1
-	    break;
-	case QChar::DirWS:
-	case QChar::DirON:
-	    break;
-	default:
-	    break;
-	}
-
-	//cout << "     after: dir=" << //        dir << " current=" << dirCurrent << " last=" << status.last << " eor=" << status.eor << " lastStrong=" << status.lastStrong << " embedding=" << context->dir << endl;
-
-	if(current >= (int)text.length()) break;
-
-	// set status.last as needed.
-	switch(dirCurrent)
-	    {
-	    case QChar::DirET:
-	    case QChar::DirES:
-	    case QChar::DirCS:
-	    case QChar::DirS:
-	    case QChar::DirWS:
-	    case QChar::DirON:
-		switch(status.last)
-		    {
-		    case QChar::DirL:
-		    case QChar::DirR:
-		    case QChar::DirAL:
-		    case QChar::DirEN:
-		    case QChar::DirAN:
-			status.last = dirCurrent;
-			break;
-		    default:
-			status.last = QChar::DirON;
-		    }
-		break;
-	    case QChar::DirNSM:
-	    case QChar::DirBN:
-		// ignore these
-		break;
-	    default:
-		status.last = dirCurrent;
-	    }
-
-	++current;
-    }
-
-#ifdef BIDI_DEBUG
-    cout << "reached end of line current=" << current << ", eor=" << eor << endl;
-#endif
-    eor = current;
-
-    runs->append( new QTextRun(sor, eor, context, dir) );
-
-    // reorder line according to run structure...
-
-    // first find highest and lowest levels
-    uchar levelLow = 128;
-    uchar levelHigh = 0;
-    QTextRun *r = runs->first();
-    while ( r ) {
-	//printf("level = %d\n", r->level);
-	if ( r->level > levelHigh )
-	    levelHigh = r->level;
-	if ( r->level < levelLow )
-	    levelLow = r->level;
-	r = runs->next();
-    }
-
-    // implements reordering of the line (L2 according to BiDi spec):
-    // L2. From the highest level found in the text to the lowest odd level on each line,
-    // reverse any contiguous sequence of characters that are at that level or higher.
-
-    // reversing is only done up to the lowest odd level
-    if(!(levelLow%2)) levelLow++;
-
-#ifdef BIDI_DEBUG
-    cout << "reorderLine: lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl;
-    cout << "logical order is:" << endl;
-    QListIterator<QTextRun> it2(*runs);
-    QTextRun *r2;
-    for ( ; (r2 = it2.current()); ++it2 )
-	cout << "    " << r2 << "  start=" << r2->start << "  stop=" << r2->stop << "  level=" << (uint)r2->level << endl;
-#endif
-
-    int count = runs->count() - 1;
-
-    while(levelHigh >= levelLow)
-    {
-	int i = 0;
-	while ( i < count )
-	{
-	    while(i < count && runs->at(i)->level < levelHigh) i++;
-	    int start = i;
-	    while(i <= count && runs->at(i)->level >= levelHigh) i++;
-	    int end = i-1;
-
-	    if(start != end)
-	    {
-		//cout << "reversing from " << start << " to " << end << endl;
-		for(int j = 0; j < (end-start+1)/2; j++)
-		{
-		    QTextRun *first = runs->take(start+j);
-		    QTextRun *last = runs->take(end-j-1);
-		    runs->insert(start+j, last);
-		    runs->insert(end-j, first);
-		}
-	    }
-	    i++;
-	    if(i >= count) break;
-	}
-	levelHigh--;
-    }
-
-#ifdef BIDI_DEBUG
-    cout << "visual order is:" << endl;
-    QListIterator<QTextRun> it3(*runs);
-    QTextRun *r3;
-    for ( ; (r3 = it3.current()); ++it3 )
-    {
-	cout << "    " << r3 << endl;
-    }
-#endif
-
-    control->setContext( context );
-    control->status = status;
-
-    return runs;
-}
-
-
-QString QComplexText::bidiReorderString( const QString &str, QChar::Direction /*basicDir*/ )
-{
-    // ### fix basic direction
-    QBidiControl *control = new QBidiControl();
-    int lineStart = 0;
-    int lineEnd = 0;
-    int len = str.length();
-    QString visual;
-    visual.setUnicode( 0, len );
-    QChar *vch = (QChar *)visual.unicode();
-    const QChar *ch = str.unicode();
-    while( lineStart < len ) {
-	lineEnd = lineStart;
-	while( *ch != '\n' && lineEnd < len ) {
-	    ch++;
-	    lineEnd++;
-	}
-	QList<QTextRun> *runs = bidiReorderLine( control, str, lineStart, lineEnd - lineStart );
-
-	// reorder the content of the line, and output to visual
-	QTextRun *r = runs->first();
-	while ( r ) {
-	    if(r->level %2) {
-		// odd level, need to reverse the string
-		int pos = r->stop;
-		while(pos >= r->start) {
-		    *vch = str[pos];
-		    vch++;
-		    pos--;
-		}
-	    } else {
-		int pos = r->start;
-		while(pos <= r->stop) {
-		    *vch = str[pos];
-		    vch++;
-		    pos++;
-		}
-	    }
-	    r = runs->next();
-	}
-	if ( *ch == '\n' ) {
-	    *vch = *ch;
-	    vch++;
-	    ch++;
-	    lineEnd++;
-	}
-	lineStart = lineEnd;
-    }
-    return visual;
-}
-#endif
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qcomplextext_p.h b/bibletime/frontend/thirdparty/qt3stuff/qcomplextext_p.h
deleted file mode 100644
index 0111a1a..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qcomplextext_p.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef QCOMPLEXTEXT_H
-#define QCOMPLEXTEXT_H
-
-#ifndef QT_H
-#include <qstring.h>
-#include <qpointarray.h>
-#include <qfont.h>
-#include <qpainter.h>
-#include <qlist.h>
-#include <qshared.h>
-#endif // QT_H
-
-class QFontPrivate;
-
-namespace Qt3 {
-
-// bidi helper classes. Internal to Qt
-struct Q_EXPORT QBidiStatus {
-    QBidiStatus() {
-	eor = QChar::DirON;
-	lastStrong = QChar::DirON;
-	last = QChar:: DirON;
-    }
-    QChar::Direction eor 		: 5;
-    QChar::Direction lastStrong 	: 5;
-    QChar::Direction last		: 5;
-};
-
-struct Q_EXPORT QBidiContext : public QShared {
-    // ### ref and deref parent?
-    QBidiContext( uchar level, QChar::Direction embedding, QBidiContext *parent = 0, bool override = FALSE );
-    ~QBidiContext();
-
-    unsigned char level;
-    bool override : 1;
-    QChar::Direction dir : 5;
-
-    QBidiContext *parent;
-};
-
-struct Q_EXPORT QBidiControl {
-    QBidiControl() { context = 0; }
-    QBidiControl( QBidiContext *c, QBidiStatus s)
-    { context = c; if( context ) context->ref(); status = s; }
-    ~QBidiControl() { if ( context && context->deref() ) delete context; }
-    void setContext( QBidiContext *c ) { if ( context == c ) return; if ( context && context->deref() ) delete context; context = c; context->ref(); }
-    QBidiContext *context;
-    QBidiStatus status;
-};
-
-struct Q_EXPORT QTextRun {
-    QTextRun(int _start, int _stop, QBidiContext *context, QChar::Direction dir) {
-	start = _start;
-	stop = _stop;
-	if(dir == QChar::DirON) dir = context->dir;
-
-	level = context->level;
-
-	// add level of run (cases I1 & I2)
-	if( level % 2 ) {
-	    if(dir == QChar::DirL || dir == QChar::DirAN)
-		level++;
-	} else {
-	    if( dir == QChar::DirR )
-		level++;
-	    else if( dir == QChar::DirAN )
-		level += 2;
-	}
-	//printf("new run: level = %d\n", level);
-    }
-
-    int start;
-    int stop;
-    // explicit + implicit levels here
-    uchar level;
-};
-
-class Q_EXPORT QComplexText {
-public:
-    enum Shape {
-        XIsolated,
-        XFinal,
-        XInitial,
-        XMedial
-    };
-    static Shape glyphVariant( const QString &str, int pos);
-    static Shape glyphVariantLogical( const QString &str, int pos);
-
-    //QT2HACK
-    //static QString shapedString( const QString &str, int from = 0, int len = -1, QPainter::TextDirection dir = QPainter::Auto);
-    static QChar shapedCharacter(const QString &str, int pos);
-
-    // positions non spacing marks relative to the base character at position pos.
-    static QPointArray positionMarks( QFontPrivate *f, const QString &str, int pos, QRect *boundingRect = 0 );
-
-    static QList<QTextRun> *bidiReorderLine( QBidiControl *control, const QString &str, int start, int len );
-    static QString bidiReorderString( const QString &str, QChar::Direction basicDir = QChar::DirON );
-};
-
-}; // namespace
-
-#endif
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qrichtext.cpp b/bibletime/frontend/thirdparty/qt3stuff/qrichtext.cpp
deleted file mode 100644
index 98b8eef..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qrichtext.cpp
+++ /dev/null
@@ -1,7124 +0,0 @@
-/****************************************************************************
-** Implementation of the internal Qt classes dealing with rich text
-**
-** Created : 990101
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the kernel module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include "qrichtext_p.h"
-#include "qstringlist.h"
-#include "qfont.h"
-#include "qtextstream.h"
-#include "qfile.h"
-#include "qregexp.h"
-#include "qapplication.h"
-#include "qclipboard.h"
-#include "qmap.h"
-#include "qfileinfo.h"
-#include "qstylesheet.h"
-#include "qmime.h"
-#include "qregexp.h"
-#include "qimage.h"
-#include "qdragobject.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qcursor.h"
-#include "qstack.h"
-#include "qcomplextext_p.h"
-
-#include <stdlib.h>
-
-using namespace Qt3;
-
-//#define PARSER_DEBUG
-//#define DEBUG_COLLECTION
-//#define DEBUG_TABLE_RENDERING
-
-static QTextFormatCollection *qFormatCollection = 0;
-
-//ANY_CHARSET_BEGIN
-QMap<QString, QFont::CharSet>* m_charsetMap = 0;
-//ANY_CHARSET_END
-
-#if defined(PARSER_DEBUG)
-static QString debug_indent;
-#endif
-
-static double scale_factor( double v )
-{
-    return v/QPaintDevice::x11AppDpiY();
-}
-
-static bool is_printer( QPainter *p )
-{
-    //if ( !p || !p->device() )
-	return FALSE;
-    //return p->device()->devType() == QInternal::Printer;
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-void QTextCommandHistory::addCommand( QTextCommand *cmd )
-{
-    if ( current < (int)history.count() - 1 ) {
-	QPtrList<QTextCommand> commands;
-	commands.setAutoDelete( FALSE );
-
-	for( int i = 0; i <= current; ++i ) {
-	    commands.insert( i, history.at( 0 ) );
-	    history.take( 0 );
-	}
-
-	commands.append( cmd );
-	history.clear();
-	history = commands;
-	history.setAutoDelete( TRUE );
-    } else {
-	history.append( cmd );
-    }
-
-    if ( (int)history.count() > steps )
-	history.removeFirst();
-    else
-	++current;
-}
-
-QTextCursor *QTextCommandHistory::undo( QTextCursor *c )
-{
-    if ( current > -1 ) {
-	QTextCursor *c2 = history.at( current )->unexecute( c );
-	--current;
-	return c2;
-    }
-    return 0;
-}
-
-QTextCursor *QTextCommandHistory::redo( QTextCursor *c )
-{
-    if ( current > -1 ) {
-	if ( current < (int)history.count() - 1 ) {
-	    ++current;
-	    return history.at( current )->execute( c );
-	}
-    } else {
-	if ( history.count() > 0 ) {
-	    ++current;
-	    return history.at( current )->execute( c );
-	}
-    }
-    return 0;
-}
-
-bool QTextCommandHistory::isUndoAvailable()
-{
-    return current > -1;
-}
-
-bool QTextCommandHistory::isRedoAvailable()
-{
-   return current > -1 || history.count() > 0;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextDeleteCommand::QTextDeleteCommand( QTextDocument *d, int i, int idx, const QMemArray<QTextStringChar> &str,
-					const QValueList< QPtrVector<QStyleSheetItem> > &os,
-					const QValueList<QStyleSheetItem::ListStyle> &ols,
-					const QMemArray<int> &oas)
-    : QTextCommand( d ), id( i ), index( idx ), parag( 0 ), text( str ), oldStyles( os ), oldListStyles( ols ), oldAligns( oas )
-{
-    for ( int j = 0; j < (int)text.size(); ++j ) {
-	if ( text[ j ].format() )
-	    text[ j ].format()->addRef();
-    }
-}
-
-QTextDeleteCommand::QTextDeleteCommand( QTextParag *p, int idx, const QMemArray<QTextStringChar> &str )
-    : QTextCommand( 0 ), id( -1 ), index( idx ), parag( p ), text( str )
-{
-    for ( int i = 0; i < (int)text.size(); ++i ) {
-	if ( text[ i ].format() )
-	    text[ i ].format()->addRef();
-    }
-}
-
-QTextDeleteCommand::~QTextDeleteCommand()
-{
-    for ( int i = 0; i < (int)text.size(); ++i ) {
-	if ( text[ i ].format() )
-	    text[ i ].format()->removeRef();
-    }
-    text.resize( 0 );
-}
-
-QTextCursor *QTextDeleteCommand::execute( QTextCursor *c )
-{
-    QTextParag *s = doc ? doc->paragAt( id ) : parag;
-    if ( !s ) {
-//	qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParag()->paragId() );
-	return 0;
-    }
-
-    cursor.setParag( s );
-    cursor.setIndex( index );
-    int len = text.size();
-    if ( c )
-	*c = cursor;
-    if ( doc ) {
-	doc->setSelectionStart( QTextDocument::Temp, &cursor );
-	for ( int i = 0; i < len; ++i )
-	    cursor.gotoRight();
-	doc->setSelectionEnd( QTextDocument::Temp, &cursor );
-	doc->removeSelectedText( QTextDocument::Temp, &cursor );
-	if ( c )
-	    *c = cursor;
-    } else {
-	s->remove( index, len );
-    }
-
-    return c;
-}
-
-QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c )
-{
-    QTextParag *s = doc ? doc->paragAt( id ) : parag;
-    if ( !s ) {
-//	qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParag()->paragId() );
-	return 0;
-    }
-
-    cursor.setParag( s );
-    cursor.setIndex( index );
-    QString str = QTextString::toString( text );
-    cursor.insert( str, TRUE, &text );
-    cursor.setParag( s );
-    cursor.setIndex( index );
-    if ( c ) {
-	c->setParag( s );
-	c->setIndex( index );
-	for ( int i = 0; i < (int)text.size(); ++i )
-	    c->gotoRight();
-    }
-
-    QValueList< QPtrVector<QStyleSheetItem> >::Iterator it = oldStyles.begin();
-    QValueList<QStyleSheetItem::ListStyle>::Iterator lit = oldListStyles.begin();
-    int i = 0;
-    QTextParag *p = s;
-    bool end = FALSE;
-    while ( p ) {
-	if ( it != oldStyles.end() )
-	    p->setStyleSheetItems( *it );
-	else
-	    end = TRUE;
-	if ( lit != oldListStyles.end() )
-	    p->setListStyle( *lit );
-	else
-	    end = TRUE;
-	if ( i < (int)oldAligns.size() )
-	    p->setAlignment( oldAligns.at( i ) );
-	else
-	    end = TRUE;
-	if ( end )
-	    break;
-	p = p->next();
-	++it;
-	++lit;
-	++i;
-    }
-
-    s = cursor.parag();
-    while ( s ) {
-	s->format();
-	s->setChanged( TRUE );
-	if ( s == c->parag() )
-	    break;
-	s = s->next();
-    }
-
-    return &cursor;
-}
-
-QTextFormatCommand::QTextFormatCommand( QTextDocument *d, int sid, int sidx, int eid, int eidx,
-					const QMemArray<QTextStringChar> &old, QTextFormat *f, int fl )
-    : QTextCommand( d ), startId( sid ), startIndex( sidx ), endId( eid ), endIndex( eidx ), format( f ), oldFormats( old ), flags( fl )
-{
-    format = d->formatCollection()->format( f );
-    for ( int j = 0; j < (int)oldFormats.size(); ++j ) {
-	if ( oldFormats[ j ].format() )
-	    oldFormats[ j ].format()->addRef();
-    }
-}
-
-QTextFormatCommand::~QTextFormatCommand()
-{
-    format->removeRef();
-    for ( int j = 0; j < (int)oldFormats.size(); ++j ) {
-	if ( oldFormats[ j ].format() )
-	    oldFormats[ j ].format()->removeRef();
-    }
-}
-
-QTextCursor *QTextFormatCommand::execute( QTextCursor *c )
-{
-    QTextParag *sp = doc->paragAt( startId );
-    QTextParag *ep = doc->paragAt( endId );
-    if ( !sp || !ep )
-	return c;
-
-    QTextCursor start( doc );
-    start.setParag( sp );
-    start.setIndex( startIndex );
-    QTextCursor end( doc );
-    end.setParag( ep );
-    end.setIndex( endIndex );
-
-    doc->setSelectionStart( QTextDocument::Temp, &start );
-    doc->setSelectionEnd( QTextDocument::Temp, &end );
-    doc->setFormat( QTextDocument::Temp, format, flags );
-    doc->removeSelection( QTextDocument::Temp );
-    *c = end;
-    return c;
-}
-
-QTextCursor *QTextFormatCommand::unexecute( QTextCursor *c )
-{
-    QTextParag *sp = doc->paragAt( startId );
-    QTextParag *ep = doc->paragAt( endId );
-    if ( !sp || !ep )
-	return 0;
-
-    int idx = startIndex;
-    int fIndex = 0;
-    while ( TRUE ) {
-	if ( oldFormats.at( fIndex ).c == '\n' ) {
-	    if ( idx > 0 ) {
-		if ( idx < sp->length() && fIndex > 0 )
-		    sp->setFormat( idx, 1, oldFormats.at( fIndex - 1 ).format() );
-		if ( sp == ep )
-		    break;
-		sp = sp->next();
-		idx = 0;
-	    }
-	    fIndex++;
-	}
-	if ( oldFormats.at( fIndex ).format() )
-	    sp->setFormat( idx, 1, oldFormats.at( fIndex ).format() );
-	idx++;
-	fIndex++;
-	if ( fIndex >= (int)oldFormats.size() )
-	    break;
-	if ( idx >= sp->length() ) {
-	    if ( sp == ep )
-		break;
-	    sp = sp->next();
-	    idx = 0;
-	}
-    }
-
-    QTextCursor end( doc );
-    end.setParag( ep );
-    end.setIndex( endIndex );
-    *c = end;
-    return c;
-}
-
-QTextAlignmentCommand::QTextAlignmentCommand( QTextDocument *d, int fParag, int lParag, int na, const QMemArray<int> &oa )
-    : QTextCommand( d ), firstParag( fParag ), lastParag( lParag ), newAlign( na ), oldAligns( oa )
-{
-}
-
-QTextCursor *QTextAlignmentCommand::execute( QTextCursor *c )
-{
-    QTextParag *p = doc->paragAt( firstParag );
-    if ( !p )
-	return c;
-    while ( p ) {
-	p->setAlignment( newAlign );
-	if ( p->paragId() == lastParag )
-	    break;
-	p = p->next();
-    }
-    return c;
-}
-
-QTextCursor *QTextAlignmentCommand::unexecute( QTextCursor *c )
-{
-    QTextParag *p = doc->paragAt( firstParag );
-    if ( !p )
-	return c;
-    int i = 0;
-    while ( p ) {
-	if ( i < (int)oldAligns.size() )
-	    p->setAlignment( oldAligns.at( i ) );
-	if ( p->paragId() == lastParag )
-	    break;
-	p = p->next();
-	++i;
-    }
-    return c;
-}
-
-QTextParagTypeCommand::QTextParagTypeCommand( QTextDocument *d, int fParag, int lParag, bool l,
-					      QStyleSheetItem::ListStyle s, const QValueList< QPtrVector<QStyleSheetItem> > &os,
-					      const QValueList<QStyleSheetItem::ListStyle> &ols )
-    : QTextCommand( d ), firstParag( fParag ), lastParag( lParag ), list( l ), listStyle( s ), oldStyles( os ), oldListStyles( ols )
-{
-}
-
-QTextCursor *QTextParagTypeCommand::execute( QTextCursor *c )
-{
-    QTextParag *p = doc->paragAt( firstParag );
-    if ( !p )
-	return c;
-    while ( p ) {
-	p->setList( list, (int)listStyle );
-	if ( p->paragId() == lastParag )
-	    break;
-	p = p->next();
-    }
-    return c;
-}
-
-QTextCursor *QTextParagTypeCommand::unexecute( QTextCursor *c )
-{
-    QTextParag *p = doc->paragAt( firstParag );
-    if ( !p )
-	return c;
-    QValueList< QPtrVector<QStyleSheetItem> >::Iterator it = oldStyles.begin();
-    QValueList<QStyleSheetItem::ListStyle>::Iterator lit = oldListStyles.begin();
-    while ( p ) {
-	if ( it != oldStyles.end() )
-	    p->setStyleSheetItems( *it );
-	if ( lit != oldListStyles.end() )
-	    p->setListStyle( *lit );
-	if ( p->paragId() == lastParag )
-	    break;
-	p = p->next();
-	++it;
-	++lit;
-    }
-    return c;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextCursor::QTextCursor( QTextDocument *d )
-    : doc( d ), ox( 0 ), oy( 0 )
-{
-    nested = FALSE;
-    idx = 0;
-    string = doc ? doc->firstParag() : 0;
-    tmpIndex = -1;
-}
-
-QTextCursor::QTextCursor()
-{
-}
-
-QTextCursor::QTextCursor( const QTextCursor &c )
-{
-    doc = c.doc;
-    ox = c.ox;
-    oy = c.oy;
-    nested = c.nested;
-    idx = c.idx;
-    string = c.string;
-    tmpIndex = c.tmpIndex;
-    indices = c.indices;
-    parags = c.parags;
-    xOffsets = c.xOffsets;
-    yOffsets = c.yOffsets;
-}
-
-QTextCursor &QTextCursor::operator=( const QTextCursor &c )
-{
-    doc = c.doc;
-    ox = c.ox;
-    oy = c.oy;
-    nested = c.nested;
-    idx = c.idx;
-    string = c.string;
-    tmpIndex = c.tmpIndex;
-    indices = c.indices;
-    parags = c.parags;
-    xOffsets = c.xOffsets;
-    yOffsets = c.yOffsets;
-
-    return *this;
-}
-
-bool QTextCursor::operator==( const QTextCursor &c ) const
-{
-    return doc == c.doc && string == c.string && idx == c.idx;
-}
-
-int QTextCursor::totalOffsetX() const
-{
-    if ( !nested )
-	return 0;
-    QValueStack<int>::ConstIterator xit = xOffsets.begin();
-    int xoff = ox;
-    for ( ; xit != xOffsets.end(); ++xit )
-	xoff += *xit;
-    return xoff;
-}
-
-int QTextCursor::totalOffsetY() const
-{
-    if ( !nested )
-	return 0;
-    QValueStack<int>::ConstIterator yit = yOffsets.begin();
-    int yoff = oy;
-    for ( ; yit != yOffsets.end(); ++yit )
-	yoff += *yit;
-    return yoff;
-}
-
-void QTextCursor::gotoIntoNested( const QPoint &globalPos )
-{
-    if ( !doc )
-	return;
-    push();
-    ox = 0;
-    int bl, y;
-    string->lineHeightOfChar( idx, &bl, &y );
-    oy = y + string->rect().y();
-    nested = TRUE;
-    QPoint p( globalPos.x() - offsetX(), globalPos.y() - offsetY() );
-    Q_ASSERT( string->at( idx )->isCustom() );
-    string->at( idx )->customItem()->enterAt( this, doc, string, idx, ox, oy, p );
-}
-
-void QTextCursor::invalidateNested()
-{
-    if ( nested ) {
-	QValueStack<QTextParag*>::Iterator it = parags.begin();
-	QValueStack<int>::Iterator it2 = indices.begin();
-	for ( ; it != parags.end(); ++it, ++it2 ) {
-	    if ( *it == string )
-		continue;
-	    (*it)->invalidate( 0 );
-	    if ( (*it)->at( *it2 )->isCustom() )
-		(*it)->at( *it2 )->customItem()->invalidate();
-	}
-    }
-}
-
-void QTextCursor::insert( const QString &str, bool checkNewLine, QMemArray<QTextStringChar> *formatting )
-{
-    tmpIndex = -1;
-    bool justInsert = TRUE;
-    QString s( str );
-#if defined(Q_WS_WIN)
-    if ( checkNewLine )
-	s = s.replace( QRegExp( "\\r" ), "" );
-#endif
-    if ( checkNewLine )
-	justInsert = s.find( '\n' ) == -1;
-    if ( justInsert ) {
-	string->insert( idx, s );
-	if ( formatting ) {
-	    for ( int i = 0; i < (int)s.length(); ++i ) {
-		if ( formatting->at( i ).format() ) {
-		    formatting->at( i ).format()->addRef();
-		    string->string()->setFormat( idx + i, formatting->at( i ).format(), TRUE );
-		}
-	    }
-	}
-	idx += s.length();
-    } else {
-	QStringList lst = QStringList::split( '\n', s, TRUE );
-	QStringList::Iterator it = lst.begin();
-	int y = string->rect().y() + string->rect().height();
-	int lastIndex = 0;
-	for ( ; it != lst.end(); ++it ) {
-	    if ( it != lst.begin() ) {
-		splitAndInsertEmptyParag( FALSE, TRUE );
-		string->setEndState( -1 );
-		string->prev()->format( -1, FALSE );
-	    }
-	    QString s = *it;
-	    if ( s.isEmpty() )
-		continue;
-	    string->insert( idx, s );
-	    if ( formatting ) {
-		int len = s.length();
-		if ( it != --lst.end() )
-		    len++;
-		for ( int i = 0; i < len; ++i ) {
-		    if ( formatting->at( i + lastIndex ).format() ) {
-			formatting->at( i + lastIndex ).format()->addRef();
-			string->string()->setFormat( i + idx, formatting->at( i + lastIndex ).format(), TRUE );
-		    }
-		}
-		lastIndex += len;
-	    }
-
-	    idx += s.length();
-	}
-	string->format( -1, FALSE );
-	int dy = string->rect().y() + string->rect().height() - y;
-	QTextParag *p = string;
-	p->setParagId( p->prev()->paragId() + 1 );
-	p = p->next();
-	while ( p ) {
-	    p->setParagId( p->prev()->paragId() + 1 );
-	    p->move( dy );
-	    p->invalidate( 0 );
-	    p->setEndState( -1 );
-	    p = p->next();
-	}
-    }
-
-    int h = string->rect().height();
-    string->format( -1, TRUE );
-    if ( h != string->rect().height() )
-	invalidateNested();
-    else if ( doc && doc->parent() )
-	doc->nextDoubleBuffered = TRUE;
-}
-
-void QTextCursor::gotoLeft()
-{
-    tmpIndex = -1;
-
-    if ( idx > 0 ) {
-	idx--;
-    } else if ( string->prev() ) {
-	string = string->prev();
-	while ( !string->isVisible() )
-	    string = string->prev();
-	idx = string->length() - 1;
-    } else {
-	if ( nested ) {
-	    pop();
-	    processNesting( Prev );
-	    if ( idx == -1 ) {
-		pop();
-		if ( idx > 0 ) {
-		    idx--;
-		} else if ( string->prev() ) {
-		    string = string->prev();
-		    idx = string->length() - 1;
-		}
-	    }
-	}
-    }
-
-    if ( string->at( idx )->isCustom() &&
-	 string->at( idx )->customItem()->isNested() ) {
-	processNesting( EnterEnd );
-    }
-}
-
-void QTextCursor::push()
-{
-    indices.push( idx );
-    parags.push( string );
-    xOffsets.push( ox );
-    yOffsets.push( oy );
-    nestedStack.push( nested );
-}
-
-void QTextCursor::pop()
-{
-    if ( !doc )
-	return;
-    idx = indices.pop();
-    string = parags.pop();
-    ox = xOffsets.pop();
-    oy = yOffsets.pop();
-    if ( doc->parent() )
-	doc = doc->parent();
-    nested = nestedStack.pop();
-}
-
-void QTextCursor::restoreState()
-{
-    while ( !indices.isEmpty() )
-	pop();
-}
-
-bool QTextCursor::place( const QPoint &p, QTextParag *s )
-{
-    QPoint pos( p );
-    QRect r;
-    if ( pos.y() < s->rect().y() )
-	pos.setY( s->rect().y() );
-    while ( s ) {
-	r = s->rect();
-	r.setWidth( doc ? doc->width() : QWIDGETSIZE_MAX );
-	if ( !s->next() || ( pos.y() >= r.y() && pos.y() < s->next()->rect().y() ) )
-	    break;
-	s = s->next();
-    }
-
-    if ( !s )
-	return FALSE;
-
-    setParag( s, FALSE );
-    int y = s->rect().y();
-    int lines = s->lines();
-    QTextStringChar *chr = 0;
-    int index = 0;
-    int i = 0;
-    int cy = 0;
-    //int ch = 0;
-    for ( ; i < lines; ++i ) {
-	chr = s->lineStartOfLine( i, &index );
-	cy = s->lineY( i );
-	//ch = s->lineHeight( i );
-	if ( !chr )
-	    return FALSE;
-	if ( i < lines - 1 && pos.y() >= y + cy && pos.y() <= y + s->lineY( i+1 ) )
-	    break;
-    }
-    int nextLine;
-    if ( i < lines - 1 )
-	s->lineStartOfLine( i+1, &nextLine );
-    else
-	nextLine = s->length();
-    i = index;
-    int x = s->rect().x();
-    if ( pos.x() < x )
-	pos.setX( x + 1 );
-    int cw;
-    int curpos = s->length()-1;
-    int dist = 10000000;
-    bool inCustom = FALSE;
-    while ( i < nextLine ) {
-	chr = s->at(i);
-	int cpos = x + chr->x;
-	cw = s->string()->width( i );
-	if ( chr->isCustom() && chr->customItem()->isNested() ) {
-	    if ( pos.x() >= cpos && pos.x() <= cpos + cw &&
-		 pos.y() >= y + cy && pos.y() <= y + cy + chr->height() ) {
-		inCustom = TRUE;
-		curpos = i;
-		break;
-	    }
-	} else {
-	    if( chr->rightToLeft )
-		cpos += cw;
-	    int d = cpos - pos.x();
-	    bool dm = d < 0 ? !chr->rightToLeft : chr->rightToLeft;
-	    if ( QABS( d ) < dist || (dist == d && dm == TRUE ) ) {
-		dist = QABS( d );
-		curpos = i;
-	    }
-	}
-	i++;
-    }
-    setIndex( curpos, FALSE );
-
-    if ( inCustom && doc && parag()->at( curpos )->isCustom() && parag()->at( curpos )->customItem()->isNested() ) {
-	gotoIntoNested( pos );
-	QPoint p( pos.x() - offsetX(), pos.y() - offsetY() );
-	if ( !place( p, document()->firstParag() ) )
-	    pop();
-    }
-    return TRUE;
-}
-
-void QTextCursor::processNesting( Operation op )
-{
-    if ( !doc )
-	return;
-    push();
-    ox = 0;
-    int bl, y;
-    string->lineHeightOfChar( idx, &bl, &y );
-    oy = y + string->rect().y();
-    nested = TRUE;
-
-    switch ( op ) {
-    case EnterBegin:
-	string->at( idx )->customItem()->enter( this, doc, string, idx, ox, oy );
-	break;
-    case EnterEnd:
-	string->at( idx )->customItem()->enter( this, doc, string, idx, ox, oy, TRUE );
-	break;
-    case Next:
-	string->at( idx )->customItem()->next( this, doc, string, idx, ox, oy );
-	break;
-    case Prev:
-	string->at( idx )->customItem()->prev( this, doc, string, idx, ox, oy );
-	break;
-    case Down:
-	string->at( idx )->customItem()->down( this, doc, string, idx, ox, oy );
-	break;
-    case Up:
-	string->at( idx )->customItem()->up( this, doc, string, idx, ox, oy );
-	break;
-    }
-}
-
-void QTextCursor::gotoRight()
-{
-    tmpIndex = -1;
-
-    if ( string->at( idx )->isCustom() &&
-	 string->at( idx )->customItem()->isNested() ) {
-	processNesting( EnterBegin );
-	return;
-    }
-
-    if ( idx < string->length() - 1 ) {
-	idx++;
-    } else if ( string->next() ) {
-	string = string->next();
-	while ( !string->isVisible() )
-	    string = string->next();
-	idx = 0;
-    } else {
-	if ( nested ) {
-	    pop();
-	    processNesting( Next );
-	    if ( idx == -1 ) {
-		pop();
-		if ( idx < string->length() - 1 ) {
-		    idx++;
-		} else if ( string->next() ) {
-		    string = string->next();
-		    idx = 0;
-		}
-	    }
-	}
-    }
-}
-
-void QTextCursor::gotoUp()
-{
-    int indexOfLineStart;
-    int line;
-    QTextStringChar *c = string->lineStartOfChar( idx, &indexOfLineStart, &line );
-    if ( !c )
-	return;
-
-    tmpIndex = QMAX( tmpIndex, idx - indexOfLineStart );
-    if ( indexOfLineStart == 0 ) {
-	if ( !string->prev() ) {
-	    if ( !nested )
-		return;
-	    pop();
-	    processNesting( Up );
-	    if ( idx == -1 ) {
-		pop();
-		if ( !string->prev() )
-		    return;
-		idx = tmpIndex = 0;
-	    } else {
-		tmpIndex = -1;
-		return;
-	    }
-	}
-	string = string->prev();
-	while ( !string->isVisible() )
-	    string = string->prev();
-	int lastLine = string->lines() - 1;
-	if ( !string->lineStartOfLine( lastLine, &indexOfLineStart ) )
-	    return;
-	if ( indexOfLineStart + tmpIndex < string->length() )
-	    idx = indexOfLineStart + tmpIndex;
-	else
-	    idx = string->length() - 1;
-    } else {
-	--line;
-	int oldIndexOfLineStart = indexOfLineStart;
-	if ( !string->lineStartOfLine( line, &indexOfLineStart ) )
-	    return;
-	if ( indexOfLineStart + tmpIndex < oldIndexOfLineStart )
-	    idx = indexOfLineStart + tmpIndex;
-	else
-	    idx = oldIndexOfLineStart - 1;
-    }
-}
-
-void QTextCursor::gotoDown()
-{
-    int indexOfLineStart;
-    int line;
-    QTextStringChar *c = string->lineStartOfChar( idx, &indexOfLineStart, &line );
-    if ( !c )
-	return;
-
-    tmpIndex = QMAX( tmpIndex, idx - indexOfLineStart );
-    if ( line == string->lines() - 1 ) {
-	if ( !string->next() ) {
-	    if ( !nested )
-		return;
-	    pop();
-	    processNesting( Down );
-	    if ( idx == -1 ) {
-		pop();
-		if ( !string->next() )
-		    return;
-		idx = tmpIndex = 0;
-	    } else {
-		tmpIndex = -1;
-		return;
-	    }
-	}
-	string = string->next();
-	while ( !string->isVisible() )
-	    string = string->next();
-	if ( !string->lineStartOfLine( 0, &indexOfLineStart ) )
-	    return;
-	int end;
-	if ( string->lines() == 1 )
-	    end = string->length();
-	else
-	    string->lineStartOfLine( 1, &end );
-	if ( indexOfLineStart + tmpIndex < end )
-	    idx = indexOfLineStart + tmpIndex;
-	else
-	    idx = end - 1;
-    } else {
-	++line;
-	int end;
-	if ( line == string->lines() - 1 )
-	    end = string->length();
-	else
-	    string->lineStartOfLine( line + 1, &end );
-	if ( !string->lineStartOfLine( line, &indexOfLineStart ) )
-	    return;
-	if ( indexOfLineStart + tmpIndex < end )
-	    idx = indexOfLineStart + tmpIndex;
-	else
-	    idx = end - 1;
-    }
-}
-
-void QTextCursor::gotoLineEnd()
-{
-    tmpIndex = -1;
-    int indexOfLineStart;
-    int line;
-    QTextStringChar *c = string->lineStartOfChar( idx, &indexOfLineStart, &line );
-    if ( !c )
-	return;
-
-    if ( line == string->lines() - 1 ) {
-	idx = string->length() - 1;
-    } else {
-	c = string->lineStartOfLine( ++line, &indexOfLineStart );
-	indexOfLineStart--;
-	idx = indexOfLineStart;
-    }
-}
-
-void QTextCursor::gotoLineStart()
-{
-    tmpIndex = -1;
-    int indexOfLineStart;
-    int line;
-    QTextStringChar *c = string->lineStartOfChar( idx, &indexOfLineStart, &line );
-    if ( !c )
-	return;
-
-    idx = indexOfLineStart;
-}
-
-void QTextCursor::gotoHome()
-{
-    tmpIndex = -1;
-    if ( doc )
-	string = doc->firstParag();
-    idx = 0;
-}
-
-void QTextCursor::gotoEnd()
-{
-    if ( doc && !doc->lastParag()->isValid() )
-    {
-        qDebug("Last parag, %d, is invalid - aborting gotoEnd() !",doc->lastParag()->paragId());
-	return;
-    }
-
-    tmpIndex = -1;
-    if ( doc )
-	string = doc->lastParag();
-    idx = string->length() - 1;
-    qDebug("gotoEnd: going to parag %d, index %d",string->paragId(),idx);
-}
-
-void QTextCursor::gotoPageUp( int visibleHeight )
-{
-    tmpIndex = -1;
-    QTextParag *s = string;
-    int h = visibleHeight;
-    int y = s->rect().y();
-    while ( s ) {
-	if ( y - s->rect().y() >= h )
-	    break;
-	s = s->prev();
-    }
-
-    if ( !s && doc )
-	s = doc->firstParag();
-
-    string = s;
-    idx = 0;
-}
-
-void QTextCursor::gotoPageDown( int visibleHeight )
-{
-    tmpIndex = -1;
-    QTextParag *s = string;
-    int h = visibleHeight;
-    int y = s->rect().y();
-    while ( s ) {
-	if ( s->rect().y() - y >= h )
-	    break;
-	s = s->next();
-    }
-
-    if ( !s && doc ) {
-	s = doc->lastParag();
-	string = s;
-	idx = string->length() - 1;
-	return;
-    }
-
-    if ( !s->isValid() )
-	return;
-
-    string = s;
-    idx = 0;
-}
-
-void QTextCursor::gotoWordLeft()
-{
-    gotoLeft();
-    tmpIndex = -1;
-    QTextString *s = string->string();
-    bool allowSame = FALSE;
-    for ( int i = idx - 1; i >= 0; --i ) {
-	if ( s->at( i ).c.isSpace() || s->at( i ).c == '\t' ) {
-	    if ( !allowSame && s->at( i ).c == s->at( idx ).c )
-		continue;
-	    idx = i + 1;
-	    return;
-	}
-	if ( !allowSame && s->at( i ).c != s->at( idx ).c )
-	    allowSame = TRUE;
-    }
-
-    idx = 0;
-}
-
-void QTextCursor::gotoWordRight()
-{
-    tmpIndex = -1;
-    QTextString *s = string->string();
-    bool allowSame = FALSE;
-    for ( int i = idx + 1; i < (int)s->length(); ++i ) {
-	if ( s->at( i ).c.isSpace() || s->at( i ).c == '\t' ) {
-	    if ( !allowSame &&  s->at( i ).c == s->at( idx ).c )
-		continue;
-	    idx = i;
-	    return;
-	}
-	if ( !allowSame && s->at( i ).c != s->at( idx ).c )
-	    allowSame = TRUE;
-    }
-
-    if ( string->next() ) {
-	string = string->next();
-	while ( !string->isVisible() )
-	    string = string->next();
-	idx = 0;
-    } else {
-	gotoLineEnd();
-    }
-}
-
-bool QTextCursor::atParagStart()
-{
-    return idx == 0;
-}
-
-bool QTextCursor::atParagEnd()
-{
-    return idx == string->length() - 1;
-}
-
-void QTextCursor::splitAndInsertEmptyParag( bool ind, bool updateIds )
-{
-    if ( !doc )
-	return;
-    tmpIndex = -1;
-    QTextFormat *f = 0;
-    if ( doc->useFormatCollection() ) {
-	f = string->at( idx )->format();
-	if ( idx == string->length() - 1 && idx > 0 )
-	    f = string->at( idx - 1 )->format();
-	if ( f->isMisspelled() ) {
-	    f->removeRef();
-	    f = doc->formatCollection()->format( f->font(), f->color() );
-	}
-    }
-
-    if ( atParagStart() ) {
-	QTextParag *p = string->prev();
-	QTextParag *s = doc->createParag( doc, p, string, updateIds );
-	if ( f )
-	    s->setFormat( 0, 1, f, TRUE );
-	s->copyParagData( string );
-	if ( ind ) {
-	    s->indent();
-	    s->format();
-	    indent();
-	    string->format();
-	}
-    } else if ( atParagEnd() ) {
-	QTextParag *n = string->next();
-	QTextParag *s = doc->createParag( doc, string, n, updateIds );
-	if ( f )
-	    s->setFormat( 0, 1, f, TRUE );
-	s->copyParagData( string );
-	if ( ind ) {
-	    int oi, ni;
-	    s->indent( &oi, &ni );
-	    string = s;
-	    idx = ni;
-	} else {
-	    string = s;
-	    idx = 0;
-	}
-    } else {
-	QString str = string->string()->toString().mid( idx, 0xFFFFFF );
-	QTextParag *n = string->next();
-	QTextParag *s = doc->createParag( doc, string, n, updateIds );
-	s->copyParagData( string );
-	s->remove( 0, 1 );
-	s->append( str, TRUE );
-	for ( uint i = 0; i < str.length(); ++i ) {
-	    s->setFormat( i, 1, string->at( idx + i )->format(), TRUE );
-	    if ( string->at( idx + i )->isCustom() ) {
-		QTextCustomItem * item = string->at( idx + i )->customItem();
-		s->at( i )->setCustomItem( item );
-		string->at( idx + i )->loseCustomItem();
-#if 0
-		s->addCustomItem();
-		string->removeCustomItem();
-#endif
-		doc->unregisterCustomItem( item, string );
-		doc->registerCustomItem( item, s );
-	    }
-	}
-	string->truncate( idx );
-	if ( ind ) {
-	    int oi, ni;
-	    s->indent( &oi, &ni );
-	    string = s;
-	    idx = ni;
-	} else {
-	    string = s;
-	    idx = 0;
-	}
-    }
-
-    invalidateNested();
-}
-
-bool QTextCursor::remove()
-{
-    tmpIndex = -1;
-    if ( !atParagEnd() ) {
-	string->remove( idx, 1 );
-	int h = string->rect().height();
-	string->format( -1, TRUE );
-	if ( h != string->rect().height() )
-	    invalidateNested();
-	else if ( doc && doc->parent() )
-	    doc->nextDoubleBuffered = TRUE;
-	return FALSE;
-    } else if ( string->next() ) {
-
-	if ( string->length() == 1 ) {
-	    string->next()->setPrev( string->prev() );
-	    if ( string->prev() )
-		string->prev()->setNext( string->next() );
-	    QTextParag *p = string->next();
-	    delete string;
-	    string = p;
-	    string->invalidate( 0 );
-	    QTextParag *s = string;
-	    while ( s ) {
-		s->id = s->p ? s->p->id + 1 : 0;
-		s->state = -1;
-		s->needPreProcess = TRUE;
-		s->changed = TRUE;
-		s = s->n;
-	    }
-	    string->format();
-	} else {
-	    string->join( string->next() );
-	}
-	invalidateNested();
-	return TRUE;
-    }
-    return FALSE;
-}
-
-void QTextCursor::killLine()
-{
-    if ( atParagEnd() )
-	return;
-    string->remove( idx, string->length() - idx - 1 );
-    int h = string->rect().height();
-    string->format( -1, TRUE );
-    if ( h != string->rect().height() )
-	invalidateNested();
-    else if ( doc && doc->parent() )
-	doc->nextDoubleBuffered = TRUE;
-}
-
-void QTextCursor::indent()
-{
-    int oi = 0, ni = 0;
-    string->indent( &oi, &ni );
-    if ( oi == ni )
-	return;
-
-    if ( idx >= oi )
-	idx += ni - oi;
-    else
-	idx = ni;
-}
-
-void QTextCursor::setDocument( QTextDocument *d )
-{
-    doc = d;
-    string = d->firstParag();
-    idx = 0;
-    nested = FALSE;
-    restoreState();
-    tmpIndex = -1;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextDocument::QTextDocument( QTextDocument *p )
-    : par( p ), parParag( 0 ), tc( 0 ), tArray( 0 ), tStopWidth( 0 )
-{
-    fCollection = new QTextFormatCollection;
-    init();
-}
-
-QTextDocument::QTextDocument( QTextDocument *p, QTextFormatCollection *f )
-    : par( p ), parParag( 0 ), tc( 0 ), tArray( 0 ), tStopWidth( 0 )
-{
-    fCollection = f;
-    init();
-}
-
-void QTextDocument::init()
-{
-//ANY_CHARSET_BEGIN
-	m_assignedFontMap = false;	
-	charsetMap = new QMap<QString, QFont::CharSet>;	
-//	ASSERT(m_charsetMap);
-	
-	if (!m_charsetMap) {
-		m_assignedFontMap = true;
-		m_charsetMap = charsetMap;
-	}
-//ANY_CHARSET_END
-
-#if defined(PARSER_DEBUG)
-    qDebug( "new QTextDocument (%p)", this );
-#endif
-    if ( par )
-	par->insertChild( this );
-    pProcessor = 0;
-    useFC = TRUE;
-    pFormatter = 0;
-    indenter = 0;
-    fParag = 0;
-    txtFormat = Qt::AutoText;
-    preferRichText = FALSE;
-    pages = FALSE;
-    focusIndicator.parag = 0;
-    minw = 0;
-    minwParag = 0;
-    align = Qt3::AlignAuto;
-    nSelections = 1;
-    addMargs = FALSE;
-
-    sheet_ = QStyleSheet::defaultSheet();
-    factory_ = QMimeSourceFactory::defaultFactory();
-    contxt = QString::null;
-    fCollection->setStyleSheet( sheet_ );
-
-    linkC = Qt::blue;
-    underlLinks = TRUE;
-    backBrush = 0;
-    buf_pixmap = 0;
-    nextDoubleBuffered = FALSE;
-
-    if ( par )
-	withoutDoubleBuffer = par->withoutDoubleBuffer;
-    else
-	withoutDoubleBuffer = FALSE;
-
-    lParag = fParag = createParag( this, 0, 0 );
-    tmpCursor = 0;
-
-    cx = 0;
-    cy = 2;
-    if ( par )
-	cx = cy = 0;
-    cw = 600;
-    vw = 0;
-    flow_ = new QTextFlow;
-    flow_->setWidth( cw );
-
-    selectionColors[ Standard ] = QApplication::palette().color( QPalette::Active, QColorGroup::Highlight );
-    selectionText[ Standard ] = TRUE;
-    commandHistory = new QTextCommandHistory( 100 );
-    tStopWidth = formatCollection()->defaultFormat()->width( 'x' ) * 8;
-}
-
-QTextDocument::~QTextDocument()
-{
-    if ( par )
-	par->removeChild( this );
-    clear();
-    delete commandHistory;
-    delete flow_;
-    if ( !par )
-	delete pFormatter;
-    delete fCollection;
-    delete pProcessor;
-    delete buf_pixmap;
-    delete indenter;
-    delete backBrush;
-    if ( tArray )
-	delete [] tArray;
-//ANY_CHARSET_BEGIN    
-    if (charsetMap) {
-	delete charsetMap;
-	charsetMap = 0;
-	if (m_assignedFontMap)
-		m_charsetMap = 0;
-	m_assignedFontMap = false;
-    }
-//ANY_CHARSET_END
-}
-
-void QTextDocument::clear( bool createEmptyParag )
-{
-    if ( flow_ )
-	flow_->clear();
-    while ( fParag ) {
-	QTextParag *p = fParag->next();
-	delete fParag;
-	fParag = p;
-    }
-    fParag = lParag = 0;
-    if ( createEmptyParag )
-	fParag = lParag = createParag( this );
-    selections.clear();
-}
-
-int QTextDocument::widthUsed() const
-{
-    QTextParag *p = fParag;
-    int w = 0;
-    while ( p ) {
-	int a = p->alignment();
-	p->setAlignment( Qt::AlignLeft );
-	p->invalidate( 0 );
-	p->format();
-	w = QMAX( w, p->rect().width() );
-	p->setAlignment( a );
-	p->invalidate( 0 );
-	p = p->next();
-    }
-    return w;
-}
-
-QTextParag *QTextDocument::createParag( QTextDocument *d, QTextParag *pr, QTextParag *nx, bool updateIds )
-{
-    return new QTextParag( d, pr, nx, updateIds );
-}
-
-bool QTextDocument::setMinimumWidth( int w, QTextParag *p )
-{
-    if ( w == -1 ) {
-	minw = 0;
-	p = 0;
-    }
-    if ( p == minwParag ) {
-	minw = w;
-	emit minimumWidthChanged( minw );
-    } else if ( w > minw ) {
-	minw = w;
-	minwParag = p;
-	emit minimumWidthChanged( minw );
-    }
-    cw = QMAX( minw, cw );
-    return TRUE;
-}
-
-void QTextDocument::setPlainText( const QString &text )
-{
-    clear();
-    preferRichText = FALSE;
-
-    QString s;
-    lParag = 0;
-    QStringList lst = QStringList::split( '\n', text, TRUE );
-    for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
-	lParag = createParag( this, lParag, 0 );
-	if ( !fParag )
-	    fParag = lParag;
-	s = *it;
-	if ( !s.isEmpty() ) {
-	    if ( s[ (int)s.length() - 1 ] == '\r' )
-		s.remove( s.length() - 1, 1 );
-	    lParag->append( s );
-	}
-    }
-
-    if ( !lParag )
-	lParag = fParag = createParag( this, 0, 0 );
-}
-
-struct Q_EXPORT Tag {
-    Tag(){}
-    Tag( const QString&n, const QStyleSheetItem* s ):name(n),style(s) {
-	wsm = QStyleSheetItem::WhiteSpaceNormal;
-    }
-    QString name;
-    const QStyleSheetItem* style;
-    QStyleSheetItem::WhiteSpaceMode wsm;
-    QTextFormat format;
-
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
-    bool operator==( const Tag& ) const { return FALSE; }
-#endif
-};
-
-#define NEWPAR       if ( !curpar || ( curtag.name != "table" && curtag.name != "li" ) || curpar->length() > 1 ) { if ( !hasNewPar ) curpar = createParag( this, curpar ); \
-		    hasNewPar = TRUE;  \
-		    QPtrVector<QStyleSheetItem> vec( tags.count() ); \
-		    int i = 0; \
-		    for ( QValueStack<Tag>::Iterator it = tags.begin(); it != tags.end(); ++it ) \
-			vec.insert( i++, (*it).style );	\
-		    curpar->setStyleSheetItems( vec ); }while(FALSE)
-#define NEWPAROPEN(nstyle)       if ( !curpar || ( curtag.name != "table" && curtag.name != "li" ) || curpar->length() > 1 )  { if ( !hasNewPar ) curpar = createParag( this, curpar ); \
-		    hasNewPar = TRUE;  \
-		    QPtrVector<QStyleSheetItem> vec( tags.count()+1 ); \
-		    int i = 0; \
-		    for ( QValueStack<Tag>::Iterator it = tags.begin(); it != tags.end(); ++it ) \
-			vec.insert( i++, (*it).style );	\
-		    vec.insert( i, nstyle ); \
-		    curpar->setStyleSheetItems( vec ); }while(FALSE)
-
-
-void QTextDocument::setRichText( const QString &text, const QString &context )
-{
-    setTextFormat( Qt::RichText );
-    if ( !context.isEmpty() )
-	setContext( context );
-    clear();
-    fParag = lParag = createParag( this );
-    setRichTextInternal( text );
-}
-
-void QTextDocument::setRichTextInternal( const QString &text )
-{
-    QTextParag* curpar = lParag;
-    int pos = 0;
-    QValueStack<Tag> tags;
-    Tag curtag( "", sheet_->item("") );
-    curtag.format = *formatCollection()->defaultFormat();
-    bool space = FALSE;
-
-    QString doc = text;
-    int depth = 0;
-    bool hasNewPar = TRUE;
-    QStyleSheetItem::ListStyle curListStyle;
-    while ( pos < int( doc.length() ) ) {
-	if (hasPrefix(doc, pos, '<' ) ){
-	    if (!hasPrefix(doc, pos+1, QChar('/'))) {
-		// open tag
-		QMap<QString, QString> attr;
-		bool emptyTag = FALSE;
-		QString tagname = parseOpenTag(doc, pos, attr, emptyTag);
-		if ( tagname.isEmpty() )
-		    continue; // nothing we could do with this, probably parse error
-		while ( eat( doc, pos, '\n' ) )
-		    ; // eliminate newlines right after openings
-
-		const QStyleSheetItem* nstyle = sheet_->item(tagname);
-		if ( nstyle ) {
-		    // we might have to close some 'forgotten' tags
-		    while ( !nstyle->allowedInContext( curtag.style ) ) {
-			QString msg;
-			msg.sprintf( "QText Warning: Document not valid ( '%s' not allowed in '%s' #%d)",
-				     tagname.ascii(), curtag.style->name().ascii(), pos);
-			sheet_->error( msg );
-			if ( tags.isEmpty() )
-			    break;
-			curtag = tags.pop();
-			depth--;
-		    }
-		    if ( nstyle->name() == "ol" ) {
-			curListStyle = nstyle->listStyle();
-			QMap<QString, QString>::Iterator it = attr.find( "type" );
-			if ( it != attr.end() ) {
-			    QString sl = *it;
-			    if ( sl == "1" ) {
-				curListStyle = QStyleSheetItem::ListDecimal;
-			    } else if ( sl == "a" ) {
-				curListStyle =  QStyleSheetItem::ListLowerAlpha;
-			    } else if ( sl == "A" ) {
-				curListStyle = QStyleSheetItem::ListUpperAlpha;
-			    } else {
-				sl = sl.lower();
-				if ( sl == "square" )
-				    curListStyle = QStyleSheetItem::ListSquare;
-				else if ( sl == "disc" )
-				curListStyle = QStyleSheetItem::ListDisc;
-				else if ( sl == "circle" )
-				    curListStyle = QStyleSheetItem::ListCircle;
-			    }
-			}
-		    }
-		}
-
-		QTextCustomItem* custom =  0;
-		// some well-known empty tags
-		if ( tagname == "br" ) {
-		    emptyTag = TRUE;
-		    NEWPAR;
-		}  else if ( tagname == "hr" ) {
-		    emptyTag = TRUE;
-		    custom = sheet_->tag( tagname, attr, contxt, *factory_ , emptyTag, this );
-		    NEWPAR;
-		} else if ( tagname == "table" ) {
-		    QTextFormat format = curtag.format.makeTextFormat(  nstyle, attr );
-		    custom = parseTable( attr, format, doc, pos, curpar );
-		    (void ) eatSpace( doc, pos );
-		    emptyTag = TRUE;
-		} else {
-		    custom = sheet_->tag( tagname, attr, contxt, *factory_ , emptyTag, this );
-		}
-
-		if ( !nstyle && !custom ) // we have no clue what this tag could be, ignore it
-		    continue;
-
-		if ( custom ) {
-		    QTextFormat format = curtag.format.makeTextFormat(  nstyle, attr );
-		    int index = curpar->length() - 1;
-		    if ( index < 0 )
-			index = 0;
-		    curpar->append( QChar('b') );
-		    curpar->setFormat( index, 1, &format );
-		    curpar->at( index )->setCustomItem( custom );
-		    curpar->addCustomItem();
-		    registerCustomItem( custom, curpar );
-		    hasNewPar = FALSE;
-		} else if ( !emptyTag ) {
-		    tags += curtag;
-		    if ( nstyle ) {
-			// ignore whitespace for inline elements if there was already one
-			if ( nstyle->whiteSpaceMode() == QStyleSheetItem::WhiteSpaceNormal
-			     && ( space || nstyle->displayMode() != QStyleSheetItem::DisplayInline ) )
-			    eatSpace( doc, pos );
-
-			// some styles are not self nesting
-			if ( nstyle == curtag.style && !nstyle->selfNesting() )
-			    (void) tags.pop();
-
-			if ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem )
-			    hasNewPar = FALSE; // we want empty paragraphs in this case
-			if ( nstyle->displayMode() != QStyleSheetItem::DisplayInline )
-			    NEWPAROPEN(nstyle);
-			if ( nstyle->displayMode() == QStyleSheetItem::DisplayListItem )
-			    curpar->setListStyle( curListStyle );
-			curtag.style = nstyle;
-			curtag.wsm = nstyle->whiteSpaceMode();
-			curtag.format = curtag.format.makeTextFormat( nstyle, attr );
-			if ( nstyle->displayMode() != QStyleSheetItem::DisplayInline )
-			    curpar->setFormat( &curtag.format );
-			if ( nstyle->name() == "li" ) {
-			    if ( attr.find( "value" ) != attr.end() )
-				curpar->setListValue( (*attr.find( "value" )).toInt() );
-			}
-		    }
-		    curtag.name = tagname;
-		    if ( curtag.name == "a" && attr.find( "name" ) != attr.end() && doc[ pos] == '<' )	// hack to be sure
-			doc.insert( pos, " " );						// <a name=".."></a> formats or inserted
-		    if ( attr.find( "align" ) != attr.end() &&
-			 ( curtag.name == "p" || curtag.name == "li" || curtag.name[ 0 ] == 'h' ) ) {
-			if ( *attr.find( "align" ) == "center" )
-			    curpar->setAlignment( Qt::AlignCenter );
-			else if ( *attr.find( "align" ) == "right" )
-			    curpar->setAlignment( Qt::AlignRight );
-			else if ( *attr.find( "align" ) == "justify" )
-			    curpar->setAlignment( Qt3::AlignJustify );
-		    }
-		    depth++;
-		}
-	    } else {
-		// close tag
-		QString tagname = parseCloseTag( doc, pos );
-		if ( tagname.isEmpty() )
-		    continue; // nothing we could do with this, probably parse error
-		while ( eat( doc, pos, '\n' ) )
-		    ; // eliminate newlines right after closings
-		if ( !sheet_->item( tagname ) ) // ignore unknown tags
-		    continue;
-		depth--;
-		while ( curtag.name != tagname ) {
-		    QString msg;
-		    msg.sprintf( "QText Warning: Document not valid ( '%s' not closed before '%s' #%d)",
-				 curtag.name.ascii(), tagname.ascii(), pos);
-		    sheet_->error( msg );
-		    if ( !hasNewPar && curtag.style->displayMode() != QStyleSheetItem::DisplayInline
-			 && curtag.wsm == QStyleSheetItem::WhiteSpaceNormal ) {
-			eatSpace( doc, pos );
-			NEWPAR;
-		    }
-		    if ( tags.isEmpty() )
-			break;
-		    curtag = tags.pop();
-		    depth--;
-		}
-
-		if ( !hasNewPar && curtag.style->displayMode() != QStyleSheetItem::DisplayInline
-		     && curtag.wsm == QStyleSheetItem::WhiteSpaceNormal ) {
-		    eatSpace( doc, pos );
-		    NEWPAR;
-		}
-		if ( !tags.isEmpty() )
-		    curtag = tags.pop();
-	    }
-	} else {
-	    // normal contents
-	    QString s;
-	    QChar c;
-	    bool hadNonSpace = !curpar->string()->toString().simplifyWhiteSpace().isEmpty();
-	    while ( pos < int( doc.length() ) && !hasPrefix(doc, pos, '<' ) ){
-		c = parseChar( doc, pos, curtag.wsm );
-		space = c.isSpace();
-		hadNonSpace = hadNonSpace || !space;
-		if ( c == '\n' ) // happens in WhiteSpacePre mode
-		    break;
-		if ( !hadNonSpace && space && curtag.wsm == QStyleSheetItem::WhiteSpaceNormal )
-		    continue;
-		if ( c == '\r' )
-		    continue;
-		s += c;
-	    }
-	    if ( !s.isEmpty() && curtag.style->displayMode() != QStyleSheetItem::DisplayNone ) {
-		hasNewPar = FALSE;
-		int index = curpar->length() - 1;
-		if ( index < 0 )
-		    index = 0;
-		curpar->append( s );
-		curpar->setFormat( index, s.length(), &curtag.format );
-	    }
-	    if ( c == '\n' )
-		NEWPAR;
-
-	}
-    }
-}
-
-void QTextDocument::setText( const QString &text, const QString &context )
-{
-    oText = text;
-    focusIndicator.parag = 0;
-    selections.clear();
-    if ( txtFormat == Qt::AutoText && QStyleSheet::mightBeRichText( text ) ||
-	 txtFormat == Qt::RichText )
-	setRichText( text, context );
-    else
-	setPlainText( text );
-}
-
-QString QTextDocument::plainText( QTextParag *p ) const
-{
-    if ( !p ) {
-	QString buffer;
-	QString s;
-	QTextParag *p = fParag;
-	while ( p ) {
-	    s = p->string()->toString();
-	    s.remove( s.length() - 1, 1 );
-	    if ( p->next() )
-		s += "\n";
-	    buffer += s;
-	    p = p->next();
-	}
-	return buffer;
-    } else {
-	return p->string()->toString();
-    }
-}
-
-static QString align_to_string( const QString &tag, int a )
-{
-    if ( tag == "p" || tag == "li" || tag[ 0 ] == 'h' ) {
-	if ( a & Qt::AlignRight )
-	    return " align=right ";
-	if ( a & Qt::AlignCenter )
-	    return " align=center ";
-	if ( a & Qt3::AlignJustify )
-	    return " align=justify ";
-    }
-    return "";
-}
-
-QString QTextDocument::richText( QTextParag *p ) const
-{
-    QString s;
-    if ( !p ) {
-	p = fParag;
-	QPtrVector<QStyleSheetItem> lastItems, items;
-	while ( p ) {
-	    items = p->styleSheetItems();
-	    if ( items.size() ) {
-		QStyleSheetItem *item = items[ items.size() - 1 ];
-		items.resize( items.size() - 1 );
-		if ( items.size() > lastItems.size() ) {
-		    for ( int i = lastItems.size(); i < (int)items.size(); ++i ) {
-			if ( items[ i ]->name().isEmpty() )
-			    continue;
-			if ( items[ i ]->name() == "li" && p->listValue() != -1 )
-			    s += "<li value=\"" + QString::number( p->listValue() ) + "\">";
-			else
-			    s += "<" + items[ i ]->name() + align_to_string( items[ i ]->name(), p->alignment() ) + ">";
-		    }
-		} else {
-		    QString end;
-		    for ( int i = items.size(); i < (int)lastItems.size(); ++i ) {
-			if ( lastItems[ i ]->name().isEmpty() )
-			    continue;
-			end.prepend( "</" + lastItems[ i ]->name() + ">" );
-		    }
-		    s += end;
-		}
-		lastItems = items;
-		if ( item->name() == "li" && p->listValue() != -1 )
-		    s += "<li value=\"" + QString::number( p->listValue() ) + "\">";
-		else
-		    s += "<" + item->name() + align_to_string( item->name(), p->alignment() ) + ">" +
-		     p->richText() + "</" + item->name() + ">\n";
-	    } else {
-		QString end;
-		for ( int i = 0; i < (int)lastItems.size(); ++i ) {
-		    if ( lastItems[ i ]->name().isEmpty() )
-			continue;
-		    end.prepend( "</" + lastItems[ i ]->name() + ">" );
-		}
-		s += end;
-		s += "<p" + align_to_string( "p", p->alignment() ) + ">" + p->richText() + "</p>\n";
-		lastItems = items;
-	    }
-	    p = p->next();
-	}
-    } else {
-	s = p->richText();
-    }
-
-    return s;
-}
-
-QString QTextDocument::text() const
-{
-    if ( plainText().simplifyWhiteSpace().isEmpty() )
-	return QString::null;
-    if ( txtFormat == Qt::AutoText && preferRichText || txtFormat == Qt::RichText )
-	return richText();
-    return plainText( 0 );
-}
-
-QString QTextDocument::text( int parag ) const
-{
-    QTextParag *p = paragAt( parag );
-    if ( !p )
-	return QString::null;
-
-    if ( txtFormat == Qt::AutoText && preferRichText || txtFormat == Qt::RichText )
-	return richText( p );
-    else
-	return plainText( p );
-}
-
-void QTextDocument::invalidate()
-{
-    QTextParag *s = fParag;
-    while ( s ) {
-	s->invalidate( 0 );
-	s = s->next();
-    }
-}
-
-void QTextDocument::selectionStart( int id, int &paragId, int &index )
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return;
-    QTextDocumentSelection &sel = *it;
-    paragId = !sel.swapped ? sel.startCursor.parag()->paragId() : sel.endCursor.parag()->paragId();
-    index = !sel.swapped ? sel.startCursor.index() : sel.endCursor.index();
-}
-
-QTextCursor QTextDocument::selectionStartCursor( int id)
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return QTextCursor( this );
-    QTextDocumentSelection &sel = *it;
-    if ( sel.swapped )
-	return sel.endCursor;
-    return sel.startCursor;
-}
-
-QTextCursor QTextDocument::selectionEndCursor( int id)
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return QTextCursor( this );
-    QTextDocumentSelection &sel = *it;
-    if ( !sel.swapped )
-	return sel.endCursor;
-    return sel.startCursor;
-}
-
-void QTextDocument::selectionEnd( int id, int &paragId, int &index )
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return;
-    QTextDocumentSelection &sel = *it;
-    paragId = sel.swapped ? sel.startCursor.parag()->paragId() : sel.endCursor.parag()->paragId();
-    index = sel.swapped ? sel.startCursor.index() : sel.endCursor.index();
-}
-
-QTextParag *QTextDocument::selectionStart( int id )
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return 0;
-    QTextDocumentSelection &sel = *it;
-    if ( sel.startCursor.parag()->paragId() <  sel.endCursor.parag()->paragId() )
-	return sel.startCursor.parag();
-    return sel.endCursor.parag();
-}
-
-QTextParag *QTextDocument::selectionEnd( int id )
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return 0;
-    QTextDocumentSelection &sel = *it;
-    if ( sel.startCursor.parag()->paragId() >  sel.endCursor.parag()->paragId() )
-	return sel.startCursor.parag();
-    return sel.endCursor.parag();
-}
-
-void QTextDocument::addSelection( int id )
-{
-    nSelections = QMAX( nSelections, id + 1 );
-}
-
-bool QTextDocument::setSelectionEnd( int id, QTextCursor *cursor )
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return FALSE;
-
-    QTextDocumentSelection &sel = *it;
-
-    QTextCursor start = sel.startCursor;
-    QTextCursor end = *cursor;
-
-    if ( sel.endCursor.parag() == end.parag() ) {
-	QTextCursor c1 = start;
-	QTextCursor c2 = end;
-	if ( sel.swapped ) {
-	    c1 = end;
-	    c2 = start;
-	}
-
-	c1.parag()->removeSelection( id );
-	c2.parag()->removeSelection( id );
-	if ( c1.parag() != c2.parag() ) {
-	    c1.parag()->setSelection( id, c1.index(), c1.parag()->length() - 1 );
-	    c2.parag()->setSelection( id, 0, c2.index() );
-	} else {
-	    c1.parag()->setSelection( id, QMIN( c1.index(), c2.index() ), QMAX( c1.index(), c2.index() ) );
-	}
-
-	sel.startCursor = start;
-	sel.endCursor = end;
-	if ( sel.startCursor.parag() == sel.endCursor.parag() )
-	    sel.swapped = sel.startCursor.index() > sel.endCursor.index();
-
-	return TRUE;
-    }
-
-    bool inSelection = FALSE;
-    QTextCursor c( this );
-    QTextCursor tmp = sel.startCursor;
-    if ( sel.swapped )
-	tmp = sel.endCursor;
-    tmp.restoreState();
-    QTextCursor tmp2 = *cursor;
-    tmp2.restoreState();
-    c.setParag( tmp.parag()->paragId() < tmp2.parag()->paragId() ? tmp.parag() : tmp2.parag() );
-    QTextCursor old;
-    bool hadStart = FALSE;
-    bool hadEnd = FALSE;
-    bool hadStartParag = FALSE;
-    bool hadEndParag = FALSE;
-    bool hadOldStart = FALSE;
-    bool hadOldEnd = FALSE;
-    bool leftSelection = FALSE;
-    sel.swapped = FALSE;
-    while ( TRUE ) {
-	if ( c == start )
-	    hadStart = TRUE;
-	if ( c == end )
-	    hadEnd = TRUE;
-	if ( c.parag() == start.parag() )
-	    hadStartParag = TRUE;
-	if ( c.parag() == end.parag() )
-	    hadEndParag = TRUE;
-	if ( c == sel.startCursor )
-	    hadOldStart = TRUE;
-	if ( c == sel.endCursor )
-	    hadOldEnd = TRUE;
-
-	if ( !sel.swapped &&
-	     ( hadEnd && !hadStart ||
-	       hadEnd && hadStart && start.parag() == end.parag() && start.index() > end.index() ) )
-	    sel.swapped = TRUE;
-
-	if ( c == end && hadStartParag ||
-	     c == start && hadEndParag ) {
-	    QTextCursor tmp = c;
-	    tmp.restoreState();
-	    if ( tmp.parag() != c.parag() ) {
-		int sstart = tmp.parag()->selectionStart( id );
-		tmp.parag()->removeSelection( id );
-		tmp.parag()->setSelection( id, sstart, tmp.index() );
-	    }
-	}
-
-	if ( inSelection &&
-	     ( c == end && hadStart || c == start && hadEnd ) )
-	     leftSelection = TRUE;
-	else if ( !leftSelection && !inSelection && ( hadStart || hadEnd ) )
-	    inSelection = TRUE;
-
-	bool noSelectionAnymore = hadOldStart && hadOldEnd && leftSelection && !inSelection && !c.parag()->hasSelection( id ) && c.atParagEnd();
-	if ( !c.parag()->hasChanged() ) {
-	    c.parag()->removeSelection( id );
-	    if ( inSelection ) {
-		if ( c.parag() == start.parag() && start.parag() == end.parag() ) {
-		    c.parag()->setSelection( id, QMIN( start.index(), end.index() ), QMAX( start.index(), end.index() ) );
-		} else if ( c.parag() == start.parag() && !hadEndParag ) {
-		    c.parag()->setSelection( id, start.index(), c.parag()->length() - 1 );
-		} else if ( c.parag() == end.parag() && !hadStartParag ) {
-		    c.parag()->setSelection( id, end.index(), c.parag()->length() - 1 );
-		} else if ( c.parag() == end.parag() && hadEndParag ) {
-		    c.parag()->setSelection( id, 0, end.index() );
-		} else if ( c.parag() == start.parag() && hadStartParag ) {
-		    c.parag()->setSelection( id, 0, start.index() );
-		} else {
-		    c.parag()->setSelection( id, 0, c.parag()->length() - 1 );
-		}
-	    }
-	}
-
-	if ( leftSelection )
-	    inSelection = FALSE;
-
-	old = c;
-	c.gotoRight();
-	if ( old == c || noSelectionAnymore )
-	    break;
-    }
-
-    if ( !sel.swapped )
-	sel.startCursor.parag()->setSelection( id, sel.startCursor.index(), sel.startCursor.parag()->length() - 1 );
-
-    sel.startCursor = start;
-    sel.endCursor = end;
-    if ( sel.startCursor.parag() == sel.endCursor.parag() )
-	sel.swapped = sel.startCursor.index() > sel.endCursor.index();
-
-    return TRUE;
-}
-
-void QTextDocument::selectAll( int id )
-{
-    removeSelection( id );
-
-    QTextDocumentSelection sel;
-    sel.swapped = FALSE;
-    QTextCursor c( this );
-
-    c.setParag( fParag );
-    c.setIndex( 0 );
-    sel.startCursor = c;
-
-    c.setParag( lParag );
-    c.setIndex( lParag->length() - 1 );
-    sel.endCursor = c;
-
-    QTextParag *p = fParag;
-    while ( p ) {
-	p->setSelection( id, 0, p->length() - 1 );
-	p = p->next();
-    }
-
-    selections.insert( id, sel );
-}
-
-bool QTextDocument::removeSelection( int id )
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return FALSE;
-
-    QTextDocumentSelection &sel = *it;
-
-    QTextCursor c( this );
-    QTextCursor tmp = sel.startCursor;
-    if ( sel.swapped )
-	tmp = sel.endCursor;
-    tmp.restoreState();
-    c.setParag( tmp.parag() );
-    QTextCursor old;
-    bool hadStart = FALSE;
-    bool hadEnd = FALSE;
-    QTextParag *lastParag = 0;
-    bool leftSelection = FALSE;
-    bool inSelection = FALSE;
-    sel.swapped = FALSE;
-    while ( TRUE ) {
-	if ( c.parag() == sel.startCursor.parag() )
-	    hadStart = TRUE;
-	if ( c.parag() == sel.endCursor.parag() )
-	    hadEnd = TRUE;
-
-	if ( inSelection &&
-	     ( c == sel.endCursor && hadStart || c == sel.startCursor && hadEnd ) )
-	     leftSelection = TRUE;
-	else if ( !leftSelection && !inSelection && ( c.parag() == sel.startCursor.parag() || c.parag() == sel.endCursor.parag() ) )
-	    inSelection = TRUE;
-
-	bool noSelectionAnymore = leftSelection && !inSelection && !c.parag()->hasSelection( id ) && c.atParagEnd();
-
-	if ( lastParag != c.parag() )
-	    c.parag()->removeSelection( id );
-
-	old = c;
-	lastParag = c.parag();
-	c.gotoRight();
-	if ( old == c || noSelectionAnymore )
-	    break;
-    }
-
-    selections.remove( id );
-    return TRUE;
-}
-
-QString QTextDocument::selectedText( int id ) const
-{
-    // ######## TODO: look at textFormat() and return rich text or plain text (like the text() method!)
-    QMap<int, QTextDocumentSelection>::ConstIterator it = selections.find( id );
-    if ( it == selections.end() )
-	return QString::null;
-
-    QTextDocumentSelection sel = *it;
-
-    QTextCursor c1 = sel.startCursor;
-    QTextCursor c2 = sel.endCursor;
-    if ( sel.swapped ) {
-	c2 = sel.startCursor;
-	c1 = sel.endCursor;
-    }
-
-    c2.restoreState();
-    c1.restoreState();
-
-    if ( c1.parag() == c2.parag() )
-	return c1.parag()->string()->toString().mid( c1.index(), c2.index() - c1.index() );
-
-    QString s;
-    s += c1.parag()->string()->toString().mid( c1.index() ) + "\n";
-    QTextParag *p = c1.parag()->next();
-    while ( p && p != c2.parag() ) {
-	s += p->string()->toString() + "\n";
-	p = p->next();
-    }
-    s += c2.parag()->string()->toString().left( c2.index() );
-    return s;
-}
-
-void QTextDocument::setFormat( int id, QTextFormat *f, int flags )
-{
-    QMap<int, QTextDocumentSelection>::ConstIterator it = selections.find( id );
-    if ( it == selections.end() )
-	return;
-
-    QTextDocumentSelection sel = *it;
-
-    QTextCursor c1 = sel.startCursor;
-    QTextCursor c2 = sel.endCursor;
-    if ( sel.swapped ) {
-	c2 = sel.startCursor;
-	c1 = sel.endCursor;
-    }
-
-    c2.restoreState();
-    c1.restoreState();
-
-    if ( c1.parag() == c2.parag() ) {
-	c1.parag()->setFormat( c1.index(), c2.index() - c1.index(), f, TRUE, flags );
-	return;
-    }
-
-    c1.parag()->setFormat( c1.index(), c1.parag()->length() - c1.index(), f, TRUE, flags );
-    QTextParag *p = c1.parag()->next();
-    while ( p && p != c2.parag() ) {
-	p->setFormat( 0, p->length() /*- 1 removed, bug #26064*/, f, TRUE, flags );
-	p = p->next();
-    }
-    c2.parag()->setFormat( 0, c2.index(), f, TRUE, flags );
-}
-
-void QTextDocument::copySelectedText( int id )
-{
-#ifndef QT_NO_CLIPBOARD
-    if ( !hasSelection( id ) )
-	return;
-
-    QApplication::clipboard()->setText( selectedText( id ) );
-#endif
-}
-
-void QTextDocument::removeSelectedText( int id, QTextCursor *cursor )
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return;
-
-    QTextDocumentSelection sel = *it;
-
-    QTextCursor c1 = sel.startCursor;
-    QTextCursor c2 = sel.endCursor;
-    if ( sel.swapped ) {
-	c2 = sel.startCursor;
-	c1 = sel.endCursor;
-    }
-
-    // ### no support for editing tables yet
-    if ( c1.nestedDepth() || c2.nestedDepth() )
-	return;
-
-    c2.restoreState();
-    c1.restoreState();
-
-    *cursor = c1;
-    removeSelection( id );
-
-    if ( c1.parag() == c2.parag() ) {
-	c1.parag()->remove( c1.index(), c2.index() - c1.index() );
-	return;
-    }
-
-    if (  c1.index() == 0 )
-	cursor->gotoLeft();
-
-    c1.parag()->remove( c1.index(), c1.parag()->length() - c1.index() );
-    QTextParag *p = c1.parag()->next();
-    int dy = 0;
-    QTextParag *tmp;
-    while ( p && p != c2.parag() ) {
-	tmp = p->next();
-	dy -= p->rect().height();
-	delete p;
-	p = tmp;
-    }
-    c2.parag()->remove( 0, c2.index() );
-    while ( p ) {
-	p->move( dy );
-	p->invalidate( 0 );
-	p->setEndState( -1 );
-	p = p->next();
-    }
-
-    c1.parag()->join( c2.parag() );
-}
-
-void QTextDocument::indentSelection( int id )
-{
-    QMap<int, QTextDocumentSelection>::Iterator it = selections.find( id );
-    if ( it == selections.end() )
-	return;
-
-    QTextDocumentSelection sel = *it;
-    QTextParag *startParag = sel.startCursor.parag();
-    QTextParag *endParag = sel.endCursor.parag();
-    if ( sel.endCursor.parag()->paragId() < sel.startCursor.parag()->paragId() ) {
-	endParag = sel.startCursor.parag();
-	startParag = sel.endCursor.parag();
-    }
-
-    QTextParag *p = startParag;
-    while ( p && p != endParag ) {
-	p->indent();
-	p = p->next();
-    }
-}
-
-void QTextDocument::addCommand( QTextCommand *cmd )
-{
-    commandHistory->addCommand( cmd );
-}
-
-QTextCursor *QTextDocument::undo( QTextCursor *c )
-{
-    return commandHistory->undo( c );
-}
-
-QTextCursor *QTextDocument::redo( QTextCursor *c )
-{
-    return commandHistory->redo( c );
-}
-
-bool QTextDocument::find( const QString &expr, bool cs, bool wo, bool forward,
-			      int *parag, int *index, QTextCursor *cursor )
-{
-    QTextParag *p = forward ? fParag : lParag;
-    if ( parag )
-	p = paragAt( *parag );
-    else if ( cursor )
-	p = cursor->parag();
-    bool first = TRUE;
-
-    while ( p ) {
-	QString s = p->string()->toString();
-	s.remove( s.length() - 1, 1 ); // get rid of trailing space
-	int start = forward ? 0 : s.length() - 1;
-	if ( first && index )
-	    start = *index;
-	else if ( first )
-	    start = cursor->index();
-	first = FALSE;
-	int res = forward ? s.find( expr, start, cs ) : s.findRev( expr, start, cs );
-	if ( res != -1 ) {
-	    bool ok = TRUE;
-	    if ( wo ) {
-		int end = res + expr.length();
-		if ( ( res == 0 || s[ res ].isSpace() || s[ res ].isPunct() ) &&
-		     ( end == (int)s.length() - 1 || s[ end ].isSpace() || s[ end ].isPunct() ) )
-		    ok = TRUE;
-		else
-		    ok = FALSE;
-	    }
-	    if ( ok ) {
-		cursor->setParag( p );
-		cursor->setIndex( res );
-		setSelectionStart( Standard, cursor );
-		cursor->setIndex( res + expr.length() );
-		setSelectionEnd( Standard, cursor );
-		if ( parag )
-		    *parag = p->paragId();
-		if ( index )
-		    *index = res;
-		return TRUE;
-	    }
-	}
-	p = forward ? p->next() : p->prev();
-    }
-
-    return FALSE;
-}
-
-void QTextDocument::setTextFormat( Qt::TextFormat f )
-{
-    txtFormat = f;
-}
-
-Qt::TextFormat QTextDocument::textFormat() const
-{
-    return txtFormat;
-}
-
-bool QTextDocument::inSelection( int selId, const QPoint &pos ) const
-{
-    QMap<int, QTextDocumentSelection>::ConstIterator it = selections.find( selId );
-    if ( it == selections.end() )
-	return FALSE;
-
-    QTextDocumentSelection sel = *it;
-    QTextParag *startParag = sel.startCursor.parag();
-    QTextParag *endParag = sel.endCursor.parag();
-    if ( sel.startCursor.parag() == sel.endCursor.parag() &&
-	 sel.startCursor.parag()->selectionStart( selId ) == sel.endCursor.parag()->selectionEnd( selId ) )
-	return FALSE;
-    if ( sel.endCursor.parag()->paragId() < sel.startCursor.parag()->paragId() ) {
-	endParag = sel.startCursor.parag();
-	startParag = sel.endCursor.parag();
-    }
-
-    QTextParag *p = startParag;
-    while ( p ) {
-	if ( p->rect().contains( pos ) ) {
-	    bool inSel = FALSE;
-	    int selStart = p->selectionStart( selId );
-	    int selEnd = p->selectionEnd( selId );
-	    int y = 0;
-	    int h = 0;
-	    for ( int i = 0; i < p->length(); ++i ) {
-		if ( i == selStart )
-		    inSel = TRUE;
-		if ( i == selEnd )
-		    break;
-		if ( p->at( i )->lineStart ) {
-		    y = (*p->lineStarts.find( i ))->y;
-		    h = (*p->lineStarts.find( i ))->h;
-		}
-		if ( pos.y() - p->rect().y() >= y && pos.y() - p->rect().y() <= y + h ) {
-		    if ( inSel && pos.x() >= p->at( i )->x &&
-			 pos.x() <= p->at( i )->x + p->at( i )->format()->width( p->at( i )->c ) )
-			return TRUE;
-		}
-	    }
-	}
-	if ( pos.y() < p->rect().y() )
-	    break;
-	if ( p == endParag )
-	    break;
-	p = p->next();
-    }
-
-    return FALSE;
-}
-
-void QTextDocument::doLayout( QPainter *p, int w )
-{
-    withoutDoubleBuffer = ( p != 0 );
-    flow_->setWidth( w );
-    cw = w;
-    vw = w;
-    if ( !par && is_printer( p ) )
-	fCollection->setPainter( p );
-    QTextParag *parag = fParag;
-    while ( parag ) {
-	parag->invalidate( 0 );
-	if ( is_printer( p ) )
-	    parag->setPainter( p );
-	parag->format();
-	parag = parag->next();
-    }
-    if ( !par && is_printer( p ) ) {
-	fCollection->setPainter( 0 );
-	parag = fParag;
-	while ( parag ) {
-	    parag->setPainter( 0 );
-	    parag = parag->next();
-	}
-    }
-}
-
-QPixmap *QTextDocument::bufferPixmap( const QSize &s )
-{
-    if ( !buf_pixmap ) {
-	buf_pixmap = new QPixmap( s );
-    } else {
-	if ( buf_pixmap->width() < s.width() ||
-	     buf_pixmap->height() < s.height() ) {
-	    buf_pixmap->resize( QMAX( s.width(), buf_pixmap->width() ),
-				QMAX( s.height(), buf_pixmap->height() ) );
-	}
-    }
-
-    return buf_pixmap;
-}
-
-void QTextDocument::draw( QPainter *p, const QRegion &reg, const QColorGroup &cg, const QBrush *paper )
-{
-    if ( !firstParag() )
-	return;
-
-    if ( paper ) {
-//QT2HACK
-//	p->setBrushOrigin( -(int)p->translationX(),
-//			   -(int)p->translationY() );
-	p->setBrushOrigin( -(int)p->worldMatrix().dx(),
-			   -(int)p->worldMatrix().dy() );
-	p->fillRect( reg.boundingRect(), *paper );
-    }
-
-    QTextParag *parag = firstParag();
-    QRect cr;
-    if ( !reg.isNull() )
-	cr = reg.boundingRect();
-    while ( parag ) {
-	if ( !parag->isValid() )
-	    parag->format();
-	int y = parag->rect().y();
-	QRect pr( parag->rect() );
-	pr.setX( 0 );
-	pr.setWidth( QWIDGETSIZE_MAX );
-	if ( !reg.isNull() && !cr.isNull() && !cr.intersects( pr ) ) {
-	    parag = parag->next();
-	    continue;
-	}
-	p->translate( 0, y );
-	parag->paint( *p, cg, 0, FALSE );
-	p->translate( 0, -y );
-	parag = parag->next();
-    }
-}
-
-void QTextDocument::drawParag( QPainter *p, QTextParag *parag, int cx, int cy, int cw, int ch,
-			       QPixmap *&doubleBuffer, const QColorGroup &cg,
-			       bool drawCursor, QTextCursor *cursor, bool resetChanged )
-{
-    QPainter *painter = 0;
-    if ( resetChanged )
-	parag->setChanged( FALSE );
-    QRect ir( parag->rect() );
-    bool useDoubleBuffer = !parag->document()->parent();
-    if ( !useDoubleBuffer && parag->document()->nextDoubleBuffered )
-	useDoubleBuffer = TRUE;
-    if ( p->device()->devType() == QInternal::Printer )
-	useDoubleBuffer = FALSE;
-
-    if ( useDoubleBuffer  ) {
-	painter = new QPainter;
-	if ( cx >= 0 && cy >= 0 )
-	    ir = ir.intersect( QRect( cx, cy, cw, ch ) );
-	if ( !doubleBuffer ||
-	     ir.width() > doubleBuffer->width() ||
-	     ir.height() > doubleBuffer->height() ) {
-	    doubleBuffer = bufferPixmap( ir.size() );
-	    painter->begin( doubleBuffer );
-	} else {
-	    painter->begin( doubleBuffer );
-	}
-    } else {
-	painter = p;
-	painter->translate( ir.x(), ir.y() );
-    }
-
-    painter->setBrushOrigin( -ir.x(), -ir.y() );
-
-    if ( useDoubleBuffer ) {
-        painter->fillRect( QRect( 0, 0, ir.width(), ir.height() ),
-                           cg.brush( QColorGroup::Base ) );
-    } else {
-	if ( cursor && cursor->parag() == parag ) {
-	    painter->fillRect( QRect( parag->at( cursor->index() )->x, 0, 2, ir.height() ),
-			       cg.brush( QColorGroup::Base ) );
-	}
-    }
-
-    painter->translate( -( ir.x() - parag->rect().x() ),
-		       -( ir.y() - parag->rect().y() ) );
-    parag->paint( *painter, cg, drawCursor ? cursor : 0, TRUE, cx, cy, cw, ch );
-    if ( !flow()->isEmpty() ) {
-	painter->translate( 0, -parag->rect().y() );
-	QRect cr( cx, cy, cw, ch );
-	cr = cr.intersect( QRect( 0, parag->rect().y(), parag->rect().width(), parag->rect().height() ) );
-	flow()->drawFloatingItems( painter, cr.x(), cr.y(), cr.width(), cr.height(), cg, FALSE );
-	painter->translate( 0, +parag->rect().y() );
-    }
-
-    if ( useDoubleBuffer ) {
-	delete painter;
-	painter = 0;
-	p->drawPixmap( ir.topLeft(), *doubleBuffer, QRect( QPoint( 0, 0 ), ir.size() ) );
-    } else {
-	painter->translate( -ir.x(), -ir.y() );
-    }
-
-    if ( parag->rect().x() + parag->rect().width() < parag->document()->x() + parag->document()->width() ) {
-	p->fillRect( parag->rect().x() + parag->rect().width(), parag->rect().y(),
-		     ( parag->document()->x() + parag->document()->width() ) -
-		     ( parag->rect().x() + parag->rect().width() ),
-		     parag->rect().height(), cg.brush( QColorGroup::Base ) );
-    }
-
-    if ( verticalBreak() && parag->lastInFrame && parag->document()->flow() )
-	parag->document()->flow()->eraseAfter( parag, p, cg );
-
-    parag->document()->nextDoubleBuffered = FALSE;
-}
-
-QTextParag *QTextDocument::draw( QPainter *p, int cx, int cy, int cw, int ch, const QColorGroup &cg,
-				 bool onlyChanged, bool drawCursor, QTextCursor *cursor, bool resetChanged )
-{
-    if ( withoutDoubleBuffer || par && par->withoutDoubleBuffer ) {
-	withoutDoubleBuffer = TRUE;
-	QRegion rg;
-	draw( p, rg, cg );
-	return 0;
-    }
-    withoutDoubleBuffer = FALSE;
-
-    if ( !firstParag() )
-	return 0;
-
-    if ( drawCursor && cursor )
-	tmpCursor = cursor;
-    if ( cx < 0 && cy < 0 ) {
-	cx = 0;
-	cy = 0;
-	cw = width();
-	ch = height();
-    }
-
-    QTextParag *lastFormatted = 0;
-    QTextParag *parag = firstParag();
-
-    QPixmap *doubleBuffer = 0;
-    QPainter painter;
-
-    while ( parag ) {
-	lastFormatted = parag;
-	if ( !parag->isValid() )
-	    parag->format();
-
-	if ( !parag->rect().intersects( QRect( cx, cy, cw, ch ) ) ) {
-	    QRect pr( parag->rect() );
-	    pr.setWidth( parag->document()->width() );
-	    if ( pr.intersects( QRect( cx, cy, cw, ch ) ) )
-                p->fillRect( pr.intersect( QRect( cx, cy, cw, ch ) ), cg.brush( QColorGroup::Base ) );
-	    if ( parag->rect().y() > cy + ch ) {
-		tmpCursor = 0;
-		if ( buf_pixmap && buf_pixmap->height() > 300 ) {
-		    delete buf_pixmap;
-		    buf_pixmap = 0;
-		}
-		if ( verticalBreak() && flow() )
-		    flow()->draw( p, cx, cy, cw, ch );
-
-		return lastFormatted;
-	    }
-	    parag = parag->next();
-	    continue;
-	}
-
-	if ( !parag->hasChanged() && onlyChanged ) {
-	    parag = parag->next();
-	    continue;
-	}
-
-	drawParag( p, parag, cx, cy, cw, ch, doubleBuffer, cg, drawCursor, cursor, resetChanged );
-	parag = parag->next();
-    }
-
-    parag = lastParag();
-    if ( parag->rect().y() + parag->rect().height() < parag->document()->height() ) {
-	p->fillRect( 0, parag->rect().y() + parag->rect().height(), parag->document()->width(),
-		     parag->document()->height() - ( parag->rect().y() + parag->rect().height() ),
-		     cg.brush( QColorGroup::Base ) );
-	if ( !flow()->isEmpty() ) {
-	    QRect cr( cx, cy, cw, ch );
-	    cr = cr.intersect( QRect( 0, parag->rect().y() + parag->rect().height(), parag->document()->width(),
-				      parag->document()->height() - ( parag->rect().y() + parag->rect().height() ) ) );
-	    flow()->drawFloatingItems( p, cr.x(), cr.y(), cr.width(), cr.height(), cg, FALSE );
-	}
-    }
-
-    if ( buf_pixmap && buf_pixmap->height() > 300 ) {
-	delete buf_pixmap;
-	buf_pixmap = 0;
-    }
-
-    if ( verticalBreak() && flow() )
-	flow()->draw( p, cx, cy, cw, ch );
-
-    tmpCursor = 0;
-    return lastFormatted;
-}
-
-void QTextDocument::setDefaultFont( const QFont &f )
-{
-    updateFontSizes( f.pointSize() );
-}
-
-void QTextDocument::registerCustomItem( QTextCustomItem *i, QTextParag *p )
-{
-    if ( i && i->placement() != QTextCustomItem::PlaceInline ) {
-	flow_->registerFloatingItem( i, i->placement() == QTextCustomItem::PlaceRight );
-	p->registerFloatingItem( i );
-    }
-    i->setParagraph( p );
-    customItems.append( i );
-}
-
-void QTextDocument::unregisterCustomItem( QTextCustomItem *i, QTextParag *p )
-{
-    flow_->unregisterFloatingItem( i );
-    p->unregisterFloatingItem( i );
-    customItems.removeRef( i );
-    i->setParagraph( 0L );
-}
-
-bool QTextDocument::focusNextPrevChild( bool next )
-{
-    if ( !focusIndicator.parag ) {
-	if ( next ) {
-	    focusIndicator.parag = fParag;
-	    focusIndicator.start = 0;
-	    focusIndicator.len = 0;
-	} else {
-	    focusIndicator.parag = lParag;
-	    focusIndicator.start = lParag->length();
-	    focusIndicator.len = 0;
-	}
-    } else {
-	focusIndicator.parag->setChanged( TRUE );
-    }
-    focusIndicator.href = QString::null;
-
-    if ( next ) {
-	QTextParag *p = focusIndicator.parag;
-	int index = focusIndicator.start + focusIndicator.len;
-	while ( p ) {
-	    for ( int i = index; i < p->length(); ++i ) {
-		if ( p->at( i )->format()->isAnchor() ) {
-		    p->setChanged( TRUE );
-		    focusIndicator.parag = p;
-		    focusIndicator.start = i;
-		    focusIndicator.len = 0;
-		    focusIndicator.href = p->at( i )->format()->anchorHref();
-		    while ( i < p->length() ) {
-			if ( !p->at( i )->format()->isAnchor() )
-			    return TRUE;
-			focusIndicator.len++;
-			i++;
-		    }
-		}
-	    }
-	    index = 0;
-	    p = p->next();
-	}
-    } else {
-	QTextParag *p = focusIndicator.parag;
-	int index = focusIndicator.start - 1;
-	while ( p ) {
-	    for ( int i = index; i >= 0; --i ) {
-		if ( p->at( i )->format()->isAnchor() ) {
-		    p->setChanged( TRUE );
-		    focusIndicator.parag = p;
-		    focusIndicator.start = i;
-		    focusIndicator.len = 0;
-		    focusIndicator.href = p->at( i )->format()->anchorHref();
-		    while ( i >= -1 ) {
-			if ( i < 0 || !p->at( i )->format()->isAnchor() ) {
-			    focusIndicator.start++;
-			    return TRUE;
-			}
-			if ( i < 0 )
-			    break;
-			focusIndicator.len++;
-			focusIndicator.start--;
-			i--;
-		    }
-		}
-	    }
-	    p = p->prev();
-	    if ( p )
-		index = p->length() - 1;
-	}
-    }
-
-    return FALSE;
-}
-
-int QTextDocument::length() const
-{
-    int l = 0;
-    QTextParag *p = fParag;
-    while ( p ) {
-	l += p->length();
-	p = p->next();
-    }
-    return l;
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-int QTextFormat::width( const QChar &c ) const
-{
-    if ( c.unicode() == 0xad ) // soft hyphen
-	return 0;
-    if ( !painter || !painter->isActive() ) {
-	if ( c == '\t' )
-	    return fm.width( 'x' ) * 8;
-	if ( ha == AlignNormal ) {
-	    int w;
-	    if ( c.row() )
-		w = fm.width( c );
-	    else
-		w = widths[ c.unicode() ];
-	    if ( w == 0 && !c.row() ) {
-		w = fm.width( c );
-		( (QTextFormat*)this )->widths[ c.unicode() ] = w;
-	    }
-	    return w;
-	} else {
-	    QFont f( fn );
-	    f.setPointSize( ( f.pointSize() * 2 ) / 3 );
-	    QFontMetrics fm_( f );
-	    return fm_.width( c );
-	}
-    }
-
-    QFont f( fn );
-    if ( ha != AlignNormal )
-	f.setPointSize( ( f.pointSize() * 2 ) / 3 );
-    painter->setFont( f );
-
-    return painter->fontMetrics().width( c );
-}
-
-int QTextFormat::width( const QString &str, int pos ) const
-{
-    int w;
-    if ( str[ pos ].unicode() == 0xad )
-	return 0;
-    if ( !painter || !painter->isActive() ) {
-	if ( ha == AlignNormal ) {
-//          w = fm.charWidth( str, pos );
-            w = fm.width( str[pos] );
-	} else {
-	    QFont f( fn );
-	    f.setPointSize( ( f.pointSize() * 2 ) / 3 );
-	    QFontMetrics fm_( f );
-            w = fm_.width( str[pos] );
-//	    w = fm_.charWidth( str, pos );
-	}
-    } else {
-	QFont f( fn );
-	if ( ha != AlignNormal )
-	    f.setPointSize( ( f.pointSize() * 2 ) / 3 );
-	painter->setFont( f );
-	w = painter->fontMetrics().width( str[pos] );
-//	w = painter->fontMetrics().charWidth( str, pos );
-    }
-    return w;
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextString::QTextString()
-{
-    textChanged = FALSE;
-    bidi = FALSE;
-    rightToLeft = FALSE;
-}
-
-QTextString::QTextString( const QTextString &s )
-{
-    textChanged = s.textChanged;
-    bidi = s.bidi;
-    rightToLeft = s.rightToLeft;
-    data = s.subString();
-}
-
-void QTextString::insert( int index, const QString &s, QTextFormat *f )
-{
-    int os = data.size();
-    data.resize( data.size() + s.length() );
-    if ( index < os ) {
-	memmove( data.data() + index + s.length(), data.data() + index,
-		 sizeof( QTextStringChar ) * ( os - index ) );
-    }
-    for ( int i = 0; i < (int)s.length(); ++i ) {
-	data[ (int)index + i ].x = 0;
-	data[ (int)index + i ].lineStart = 0;
-	data[ (int)index + i ].d.format = 0;
-	data[ (int)index + i ].type = QTextStringChar::Regular;
-	data[ (int)index + i ].rightToLeft = 0;
-	data[ (int)index + i ].startOfRun = 0;
-#if defined(Q_WS_X11)
-	//### workaround for broken courier fonts on X11
-	if ( s[ i ] == QChar( 0x00a0U ) )
-	    data[ (int)index + i ].c = ' ';
-	else
-	    data[ (int)index + i ].c = s[ i ];
-#else
-	data[ (int)index + i ].c = s[ i ];
-#endif
-#ifdef DEBUG_COLLECTION
-	qDebug("QTextString::insert setting format %p to character %d",f,(int)index+i);
-#endif
-	data[ (int)index + i ].setFormat( f );
-    }
-    textChanged = TRUE;
-}
-
-QTextString::~QTextString()
-{
-    clear();
-}
-
-void QTextString::insert( int index, QTextStringChar *c )
-{
-    int os = data.size();
-    data.resize( data.size() + 1 );
-    if ( index < os ) {
-	memmove( data.data() + index + 1, data.data() + index,
-		 sizeof( QTextStringChar ) * ( os - index ) );
-    }
-    data[ (int)index ].c = c->c;
-    data[ (int)index ].x = 0;
-    data[ (int)index ].lineStart = 0;
-    data[ (int)index ].rightToLeft = 0;
-    data[ (int)index ].d.format = 0;
-    data[ (int)index ].type = QTextStringChar::Regular;
-    data[ (int)index ].setFormat( c->format() );
-    textChanged = TRUE;
-}
-
-void QTextString::truncate( int index )
-{
-    index = QMAX( index, 0 );
-    index = QMIN( index, (int)data.size() - 1 );
-    if ( index < (int)data.size() ) {
-	for ( int i = index + 1; i < (int)data.size(); ++i ) {
-	    if ( data[ i ].isCustom() ) {
-		delete data[ i ].customItem();
-		if ( data[ i ].d.custom->format )
-		    data[ i ].d.custom->format->removeRef();
-		data[ i ].d.custom = 0;
-	    } else if ( data[ i ].format() ) {
-		data[ i ].format()->removeRef();
-	    }
-	}
-    }
-    data.truncate( index );
-    textChanged = TRUE;
-}
-
-void QTextString::remove( int index, int len )
-{
-    for ( int i = index; i < (int)data.size() && i - index < len; ++i ) {
-	if ( data[ i ].isCustom() ) {
-	    delete data[ i ].customItem();
-	    if ( data[ i ].d.custom->format )
-		data[ i ].d.custom->format->removeRef();
-	    data[ i ].d.custom = 0;
-	} else if ( data[ i ].format() ) {
-	    data[ i ].format()->removeRef();
-	}
-    }
-    memmove( data.data() + index, data.data() + index + len,
-	     sizeof( QTextStringChar ) * ( data.size() - index - len ) );
-    data.resize( data.size() - len );
-    textChanged = TRUE;
-}
-
-void QTextString::clear()
-{
-    for ( int i = 0; i < (int)data.count(); ++i ) {
-	if ( data[ i ].isCustom() ) {
-	    delete data[ i ].customItem();
-	    if ( data[ i ].d.custom->format )
-		data[ i ].d.custom->format->removeRef();
-	    delete data[ i ].d.custom;
-	    data[ i ].d.custom = 0;
-	} else if ( data[ i ].format() ) {
-	    data[ i ].format()->removeRef();
-	}
-    }
-    data.resize( 0 );
-}
-
-void QTextString::setFormat( int index, QTextFormat *f, bool useCollection )
-{
-//    qDebug("QTextString::setFormat index=%d f=%p",index,f);
-    if ( useCollection && data[ index ].format() )
-    {
-        //qDebug("QTextString::setFormat removing ref on old format %p",data[ index ].format());
-	data[ index ].format()->removeRef();
-    }
-    data[ index ].setFormat( f );
-}
-
-void QTextString::checkBidi() const
-{
-    int len = data.size();
-    const QTextStringChar *c = data.data();
-    ((QTextString *)this)->bidi = FALSE;
-    ((QTextString *)this)->rightToLeft = FALSE;
-    while( len ) {
-	uchar row = c->c.row();
-	if( (row > 0x04 && row < 0x09) || row > 0xfa ) {
-	    ((QTextString *)this)->bidi = TRUE;
-	    basicDirection();
-	    return;
-	}
-	len--;
-	++c;
-    }
-}
-
-void QTextString::basicDirection() const
-{
-    int pos = 0;
-    ((QTextString *)this)->rightToLeft = FALSE;
-    while( pos < length() ) {
-	switch( at(pos).c.direction() )
-	{
-	case QChar::DirL:
-	case QChar::DirLRO:
-	case QChar::DirLRE:
-	    return;
-	case QChar::DirR:
-	case QChar::DirAL:
-	case QChar::DirRLO:
-	case QChar::DirRLE:
-	    ((QTextString *)this)->rightToLeft = TRUE;
-	    return;
-	default:
-	    break;
-	}
-	++pos;
-    }
-    return;
-}
-
-
-void QTextDocument::setStyleSheet( QStyleSheet *s )
-{
-    if ( !s )
-	return;
-    sheet_ = s;
-    fCollection->setStyleSheet( s );
-    updateStyles();
-}
-
-void QTextDocument::updateStyles()
-{
-    invalidate();
-    fCollection->updateStyles();
-    for ( QTextDocument *d = childList.first(); d; d = childList.next() )
-	d->updateStyles();
-}
-
-void QTextDocument::updateFontSizes( int base )
-{
-    for ( QTextDocument *d = childList.first(); d; d = childList.next() )
-	d->updateFontSizes( base );
-    invalidate();
-    fCollection->updateFontSizes( base );
-}
-
-void QTextDocument::updateFontAttributes( const QFont &f, const QFont &old )
-{
-    for ( QTextDocument *d = childList.first(); d; d = childList.next() )
-	d->updateFontAttributes( f, old );
-    invalidate();
-    fCollection->updateFontAttributes( f, old );
-}
-
-void QTextStringChar::setFormat( QTextFormat *f )
-{
-    if ( type == Regular ) {
-	d.format = f;
-    } else {
-	if ( !d.custom ) {
-	    d.custom = new CustomData;
-	    d.custom->custom = 0;
-	}
-	d.custom->format = f;
-    }
-}
-
-void QTextStringChar::setCustomItem( QTextCustomItem *i )
-{
-    if ( !isCustom() ) {
-	QTextFormat *f = format();
-	d.custom = new CustomData;
-	d.custom->format = f;
-	type = Custom;
-    } else {
-	delete d.custom->custom;
-    }
-    d.custom->custom = i;
-}
-
-void QTextStringChar::loseCustomItem() // setRegular() might be a better name
-{
-    if ( isCustom() ) {
-	QTextFormat *f = d.custom->format;
-	d.custom->custom = 0;
-	delete d.custom;
-	type = Regular;
-	d.format = f;
-    }
-}
-
-int QTextString::width(int idx) const
-{
-     int w = 0;
-     QTextStringChar *c = &at( idx );
-     if ( c->c.unicode() == 0xad )
-	 return 0;
-     if( c->isCustom() ) {
-	 if( c->customItem()->placement() == QTextCustomItem::PlaceInline )
-	     w = c->customItem()->width;
-     } else if ( c->type == QTextStringChar::Mark ) {
-	 return 0;
-     } else {
-	 int r = c->c.row();
-	 if( r < 0x06 || r > 0x1f )
-	     w = c->format()->width( c->c );
-	 else {
-	     // complex text. We need some hacks to get the right metric here
-	     QString str;
-	     int pos = 0;
-	     if( idx > 3 )
-		 pos = idx - 3;
-	     int off = idx - pos;
-	     int end = QMIN( length(), idx + 3 );
-	     while ( pos < end ) {
-		 str += at(pos).c;
-		 pos++;
-	     }
-	     w = c->format()->width( str, off );
-	 }
-     }
-     return w;
-}
-
-QMemArray<QTextStringChar> QTextString::subString( int start, int len ) const
-{
-    if ( len == 0xFFFFFF )
-	len = data.size();
-    QMemArray<QTextStringChar> a;
-    a.resize( len );
-    for ( int i = 0; i < len; ++i ) {
-	QTextStringChar *c = &data[ i + start ];
-	a[ i ].c = c->c;
-	a[ i ].x = 0;
-	a[ i ].lineStart = 0;
-	a[ i ].rightToLeft = 0;
-	a[ i ].d.format = 0;
-	a[ i ].type = QTextStringChar::Regular;
-	a[ i ].setFormat( c->format() );
-	if ( c->format() )
-	    c->format()->addRef();
-    }
-    return a;
-}
-
-QTextStringChar *QTextStringChar::clone() const
-{
-    QTextStringChar *chr = new QTextStringChar;
-    chr->c = c;
-    chr->x = 0;
-    chr->lineStart = 0;
-    chr->rightToLeft = 0;
-    chr->d.format = 0;
-    chr->type = QTextStringChar::Regular;
-    chr->setFormat( format() );
-    if ( chr->format() )
-	chr->format()->addRef();
-    return chr;
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextParag::QTextParag( QTextDocument *d, QTextParag *pr, QTextParag *nx, bool updateIds )
-    : invalid( 0 ), p( pr ), n( nx ), doc( d ), align( -1 ), numSubParag( -1 ),
-      tm( -1 ), bm( -1 ), lm( -1 ), rm( -1 ), flm( -1 ), tc( 0 ),
-      numCustomItems( 0 ), pFormatter( 0 ),
-      tArray( 0 ), tabStopWidth( 0 ), eData( 0 ), pntr( 0 )
-{
-    visible = TRUE;
-    list_val = -1;
-    newLinesAllowed = FALSE;
-    lastInFrame = FALSE;
-    movedDown = FALSE;
-    defFormat = formatCollection()->defaultFormat();
-    if ( !doc ) {
-	tabStopWidth = defFormat->width( 'x' ) * 8;
-	commandHistory = new QTextCommandHistory( 100 );
-    }
-#if defined(PARSER_DEBUG)
-    qDebug( "new QTextParag" );
-#endif
-    fullWidth = TRUE;
-
-    if ( p ) {
-	p->n = this;
-	if ( p->tc )
-	    tc = p->tc;
-    }
-    if ( n ) {
-	n->p = this;
-	if ( n->tc )
-	    tc = n->tc;
-    }
-
-    if ( !tc && d && d->tableCell() )
-	tc = d->tableCell();
-
-    if ( !p && doc )
-	doc->setFirstParag( this );
-    if ( !n && doc )
-	doc->setLastParag( this );
-
-    changed = FALSE;
-    firstFormat = TRUE;
-    state = -1;
-    needPreProcess = FALSE;
-
-    if ( p )
-	id = p->id + 1;
-    else
-	id = 0;
-    if ( n && updateIds ) {
-	QTextParag *s = n;
-	while ( s ) {
-	    s->id = s->p->id + 1;
-	    s->numSubParag = -1;
-	    s->lm = s->rm = s->tm = s->bm = -1, s->flm = -1;
-	    s = s->n;
-	}
-    }
-    firstPProcess = TRUE;
-
-    str = new QTextString();
-    str->insert( 0, " ", formatCollection()->defaultFormat() );
-}
-
-QTextParag::~QTextParag()
-{
-    //qDebug("QTextParag::~QTextParag %p id=%d",this,paragId());
-    delete str;
-    if ( doc && p == doc->minwParag ) {
-	doc->minwParag = 0;
-	doc->minw = 0;
-    }
-    if ( !doc ) {
-	delete pFormatter;
-	delete commandHistory;
-    }
-    if ( tArray )
-	delete [] tArray;
-    delete eData;
-    QMap<int, QTextParagLineStart*>::Iterator it = lineStarts.begin();
-    for ( ; it != lineStarts.end(); ++it )
-	delete *it;
-}
-
-void QTextParag::setNext( QTextParag *s )
-{
-    n = s;
-    if ( !n && doc )
-	doc->setLastParag( this );
-}
-
-void QTextParag::setPrev( QTextParag *s )
-{
-    p = s;
-    if ( !p && doc )
-	doc->setFirstParag( this );
-}
-
-void QTextParag::invalidate( int chr )
-{
-    if ( invalid < 0 )
-	invalid = chr;
-    else
-	invalid = QMIN( invalid, chr );
-    for ( QTextCustomItem *i = floatingItems.first(); i; i = floatingItems.next() )
-	i->move( 0, -1 );
-    lm = rm = bm = tm = flm = -1;
-}
-
-void QTextParag::insert( int index, const QString &s )
-{
-    if ( doc && !doc->useFormatCollection() && doc->preProcessor() )
-	str->insert( index, s,
-		     doc->preProcessor()->format( QTextPreProcessor::Standard ) );
-    else
-	str->insert( index, s, formatCollection()->defaultFormat() );
-    invalidate( index );
-    needPreProcess = TRUE;
-}
-
-void QTextParag::truncate( int index )
-{
-    str->truncate( index );
-    insert( length(), " " );
-    needPreProcess = TRUE;
-}
-
-void QTextParag::remove( int index, int len )
-{
-    if ( index + len - str->length() > 0 )
-	return;
-    for ( int i = index; i < len; ++i ) {
-	QTextStringChar *c = at( i );
-	if ( doc && c->isCustom() ) {
-	    doc->unregisterCustomItem( c->customItem(), this );
-	    removeCustomItem();
-	}
-    }
-    str->remove( index, len );
-    invalidate( 0 );
-    needPreProcess = TRUE;
-}
-
-void QTextParag::join( QTextParag *s )
-{
-    //qDebug("QTextParag::join this=%d (length %d) with %d (length %d)",paragId(),length(),s->paragId(),s->length());
-    int oh = r.height() + s->r.height();
-    n = s->n;
-    if ( n )
-	n->p = this;
-    else if ( doc )
-	doc->setLastParag( this );
-
-    int start = str->length();
-    if ( length() > 0 && at( length() - 1 )->c == ' ' ) {
-	remove( length() - 1, 1 );
-	--start;
-    }
-    append( s->str->toString(), TRUE );
-
-    for ( int i = 0; i < s->length(); ++i ) {
-	if ( !doc || doc->useFormatCollection() ) {
-	    s->str->at( i ).format()->addRef();
-	    str->setFormat( i + start, s->str->at( i ).format(), TRUE );
-	}
-	if ( s->str->at( i ).isCustom() ) {
-	    QTextCustomItem * item = s->str->at( i ).customItem();
-	    str->at( i + start ).setCustomItem( item );
-	    s->str->at( i ).loseCustomItem();
-	    doc->unregisterCustomItem( item, s );
-	    doc->registerCustomItem( item, this );
-	}
-    }
-    ASSERT(str->at(str->length()-1).c == ' ');
-
-    if ( !extraData() && s->extraData() ) {
-	setExtraData( s->extraData() );
-	s->setExtraData( 0 );
-    } else if ( extraData() && s->extraData() ) {
-	extraData()->join( s->extraData() );
-    }
-    delete s;
-    invalidate( 0 );
-    r.setHeight( oh );
-    needPreProcess = TRUE;
-    if ( n ) {
-	QTextParag *s = n;
-	while ( s ) {
-	    s->id = s->p->id + 1;
-	    s->state = -1;
-	    s->needPreProcess = TRUE;
-	    s->changed = TRUE;
-	    s = s->n;
-	}
-    }
-    format();
-    state = -1;
-}
-
-void QTextParag::move( int &dy )
-{
-    //qDebug("QTextParag::move paragId=%d dy=%d",paragId(),dy);
-    if ( dy == 0 )
-	return;
-    changed = TRUE;
-    r.moveBy( 0, dy );
-    for ( QTextCustomItem *i = floatingItems.first(); i; i = floatingItems.next() )
-	i->move( i->x(), i->y() + dy );
-    if ( p )
-	p->lastInFrame = FALSE;
-    movedDown = FALSE;
-    if ( doc && doc->verticalBreak() ) {
-	const int oy = r.y();
-	int y = oy;
-	doc->flow()->adjustFlow( y, r.width(), r.height(), this, TRUE );
-	if ( oy != y ) {
-	    if ( p ) {
-		p->lastInFrame = TRUE;
-		p->setChanged( TRUE );
-	    }
-	    movedDown = TRUE;
-	    int oh = r.height();
-	    r.setY( y );
-	    r.setHeight( oh );
-	    dy += y - oy;
-            //qDebug("QTextParag::move done. paragId=%d dy=%d lastInFrame=true",paragId(),dy);
-	}
-    }
-}
-
-void QTextParag::format( int start, bool doMove )
-{
-    if ( str->length() == 0 || !formatter() )
-	return;
-
-    if ( doc &&
-	 doc->preProcessor() &&
-	 ( needPreProcess || state == -1 ) )
-	doc->preProcessor()->process( doc, this, invalid <= 0 ? 0 : invalid );
-    needPreProcess = FALSE;
-
-    if ( invalid == -1 )
-	return;
-
-    //qDebug("QTextParag::format id=%d invalid, formatting (moving after previous parag)",paragId());
-    r.moveTopLeft( QPoint( documentX(), p ? p->r.y() + p->r.height() : documentY() ) );
-    r.setWidth( documentWidth() );
-    if ( p )
-	p->lastInFrame = FALSE;
-    movedDown = FALSE;
- formatAgain:
-    if ( doc ) {
-	for ( QTextCustomItem *i = floatingItems.first(); i; i = floatingItems.next() ) {
-	    if ( i->placement() == QTextCustomItem::PlaceRight )
-                i->move( r.x() + r.width() - i->width, r.y() );
-            else
-		i->move( 0, r.y() );
-	    doc->flow()->updateHeight( i );
-	}
-    }
-    QMap<int, QTextParagLineStart*> oldLineStarts = lineStarts;
-    lineStarts.clear();
-    int y = formatter()->format( doc, this, start, oldLineStarts );
-    r.setWidth( QMAX( r.width(), minimumWidth() ) );
-    QMap<int, QTextParagLineStart*>::Iterator it = oldLineStarts.begin();
-    for ( ; it != oldLineStarts.end(); ++it )
-	delete *it;
-
-    QTextStringChar *c = 0;
-    if ( lineStarts.count() == 1 && ( !doc || doc->flow()->isEmpty() ) && !string()->isBidi() ) {
-	c = &str->at( str->length() - 1 );
-	r.setWidth( c->x + str->width( str->length() - 1 ) );
-    }
-
-    if ( newLinesAllowed ) {
-	it = lineStarts.begin();
-	int usedw = 0;
-	for ( ; it != lineStarts.end(); ++it )
-	    usedw = QMAX( usedw, (*it)->w );
-	r.setWidth( QMIN( usedw, r.width() ) );
-    }
-
-    if ( y != r.height() )
-	r.setHeight( y );
-
-    if ( !visible )
-	r.setHeight( 0 );
-
-    if ( doc && doc->verticalBreak() ) {
-	const int oy = r.y();
-	int y = oy;
-	doc->flow()->adjustFlow( y, r.width(), r.height(), this, TRUE );
-	if ( oy != y ) {
-	    if ( p ) {
-		p->lastInFrame = TRUE;
-		p->setChanged( TRUE );
-	    }
-	    movedDown = TRUE;
-	    int oh = r.height();
-	    r.setY( y );
-	    r.setHeight( oh );
-	    goto formatAgain;
-	}
-
-    }
-
-    if ( n && doMove && n->invalid == -1 && r.y() + r.height() != n->r.y() ) {
-	int dy = ( r.y() + r.height() ) - n->r.y();
-	QTextParag *s = n;
-        bool makeInvalid = p && p->lastInFrame;
-        //qDebug("moving. previous's lastInFrame (=makeInvalid): %d",makeInvalid);
-	while ( s && dy ) {
-	    if ( !s->isFullWidth() || s->movedDown )
-		makeInvalid = TRUE;
-	    if ( makeInvalid )
-		s->invalidate( 0 );
-	    s->move( dy );
-	    if ( s->lastInFrame )
-		makeInvalid = TRUE;
-	    s = s->n;
-	}
-    }
-
-    firstFormat = FALSE;
-    changed = TRUE;
-    invalid = -1;
-    string()->setTextChanged( FALSE );
-}
-
-int QTextParag::lineHeightOfChar( int i, int *bl, int *y ) const
-{
-    if ( !isValid() )
-	( (QTextParag*)this )->format();
-
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.end();
-    --it;
-    for ( ;; ) {
-	if ( i >= it.key() ) {
-	    if ( bl )
-		*bl = ( *it )->baseLine;
-	    if ( y )
-		*y = ( *it )->y;
-	    return ( *it )->h;
-	}
-	if ( it == lineStarts.begin() )
-	    break;
-	--it;
-    }
-
-//    qWarning( "QTextParag::lineHeightOfChar: couldn't find lh for %d", i );
-    return 15;
-}
-
-QTextStringChar *QTextParag::lineStartOfChar( int i, int *index, int *line ) const
-{
-    if ( !isValid() )
-	( (QTextParag*)this )->format();
-
-    int l = lineStarts.count() - 1;
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.end();
-    --it;
-    for ( ;; ) {
-	if ( i >= it.key() ) {
-	    if ( index )
-		*index = it.key();
-	    if ( line )
-		*line = l;
-	    return &str->at( it.key() );
-	}
-	if ( it == lineStarts.begin() )
-	    break;
-	--it;
-	--l;
-    }
-
-//    qWarning( "QTextParag::lineStartOfChar: couldn't find %d", i );
-    return 0;
-}
-
-int QTextParag::lines() const
-{
-    if ( !isValid() )
-	( (QTextParag*)this )->format();
-
-    return lineStarts.count();
-}
-
-QTextStringChar *QTextParag::lineStartOfLine( int line, int *index ) const
-{
-    if ( !isValid() )
-	( (QTextParag*)this )->format();
-
-    if ( line >= 0 && line < (int)lineStarts.count() ) {
-	QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
-	while ( line-- > 0 )
-	    ++it;
-	int i = it.key();
-	if ( index )
-	    *index = i;
-	return &str->at( i );
-    }
-
-//    qWarning( "QTextParag::lineStartOfLine: couldn't find %d", line );
-    return 0;
-}
-
-void QTextParag::setFormat( int index, int len, QTextFormat *f, bool useCollection, int flags )
-{
-    if ( index < 0 )
-	index = 0;
-    if ( index > str->length() - 1 )
-	index = str->length() - 1;
-    if ( index + len >= str->length() )
-	len = str->length() - index;
-
-    QTextFormatCollection *fc = 0;
-    if ( useCollection )
-	fc = formatCollection();
-    QTextFormat *of;
-    for ( int i = 0; i < len; ++i ) {
-	of = str->at( i + index ).format();
-	if ( !changed && f->key() != of->key() )
-	    changed = TRUE;
-	if ( invalid == -1 &&
-	     ( f->font().family() != of->font().family() ||
-	       f->font().pointSize() != of->font().pointSize() ||
-	       f->font().weight() != of->font().weight() ||
-	       f->font().italic() != of->font().italic() ||
-	       f->vAlign() != of->vAlign() ) ) {
-	    invalidate( 0 );
-	}
-	if ( flags == -1 || flags == QTextFormat::Format || !fc ) {
-#ifdef DEBUG_COLLECTION
-	    qDebug(" QTextParag::setFormat, will use format(f) %p %s", f, f->key().latin1());
-#endif
-	    if ( fc )
-		f = fc->format( f );
-	    str->setFormat( i + index, f, useCollection );
-	} else {
-#ifdef DEBUG_COLLECTION
-	    qDebug(" QTextParag::setFormat, will use format(of,f,flags) of=%p %s, f=%p %s", of, of->key().latin1(), f, f->key().latin1() );
-#endif
-	    QTextFormat *fm = fc->format( of, f, flags );
-#ifdef DEBUG_COLLECTION
-	    qDebug(" QTextParag::setFormat, format(of,f,flags) returned %p %s ", fm,fm->key().latin1());
-#endif
-	    str->setFormat( i + index, fm, useCollection );
-	}
-    }
-}
-
-void QTextParag::indent( int *oldIndent, int *newIndent )
-{
-    if ( !doc || !doc->indent() || style() && style()->displayMode() != QStyleSheetItem::DisplayBlock ) {
-	if ( oldIndent )
-	    *oldIndent = 0;
-	if ( newIndent )
-	    *newIndent = 0;
-	if ( oldIndent && newIndent )
-	    *newIndent = *oldIndent;
-	return;
-    }
-    doc->indent()->indent( doc, this, oldIndent, newIndent );
-}
-
-void QTextParag::paint( QPainter &painter, const QColorGroup &cg, QTextCursor *cursor, bool drawSelections,
-			int clipx, int clipy, int clipw, int cliph )
-{
-    if ( !visible )
-	return;
-    QTextStringChar *chr = at( 0 );
-    ASSERT( chr );
-    if (!chr) { qDebug("paragraph %p %d, can't paint, EMPTY !", this, paragId()); return; }
-    int i = 0;
-    int h = 0;
-    int baseLine = 0, lastBaseLine = 0;
-    QTextFormat *lastFormat = 0;
-    int lastY = -1;
-    int startX = 0;
-    int bw = 0;
-    int cy = 0;
-    int curx = -1, cury = 0, curh = 0, curline = 0;
-    bool lastDirection = chr->rightToLeft;
-    QTextStringChar::Type lastType = chr->type;
-    int tw = 0;
-
-    QString qstr = str->toString();
-
-    const int nSels = doc ? doc->numSelections() : 1;
-    QMemArray<int> selectionStarts( nSels );
-    QMemArray<int> selectionEnds( nSels );
-    if ( drawSelections ) {
-	bool hasASelection = FALSE;
-	for ( i = 0; i < nSels; ++i ) {
-	    if ( !hasSelection( i ) ) {
-		selectionStarts[ i ] = -1;
-		selectionEnds[ i ] = -1;
-	    } else {
-		hasASelection = TRUE;
-		selectionStarts[ i ] = selectionStart( i );
-		int end = selectionEnd( i );
-		if ( end == length() - 1 && n && n->hasSelection( i ) )
-		    end++;
-		selectionEnds[ i ] = end;
-	    }
-	}
-	if ( !hasASelection )
-	    drawSelections = FALSE;
-    }
-
-    int line = -1;
-    int cw;
-    bool didListLabel = FALSE;
-    int paintStart = 0;
-    int paintEnd = -1;
-    int lasth = 0;
-    for ( i = 0; i < length(); i++ ) {
-	chr = at( i );
-	if ( !str->isBidi() && is_printer( &painter ) ) { // ### fix our broken ps-printer
-	    if ( !chr->lineStart )
-		chr->x = QMAX( chr->x, tw );
-	    else
-		tw = 0;
-	}
-	cw = string()->width( i );
-	if ( chr->c == '\t' && i < length() - 1 )
-	    cw = at( i + 1 )->x - chr->x + 1;
-	if ( chr->c.unicode() == 0xad && i < length() - 1 )
-	    cw = 0;
-
-	// init a new line
-	if ( chr->lineStart ) {
-	    tw = 0;
-	    ++line;
-	    lineInfo( line, cy, h, baseLine );
-	    lasth = h;
-	    if ( clipy != -1 && cy > clipy - r.y() + cliph ) // outside clip area, leave
-		break;
-	    if ( lastBaseLine == 0 )
-		lastBaseLine = baseLine;
-	}
-
-	// draw bullet list items
-	if ( !didListLabel && line == 0 && style() && style()->displayMode() == QStyleSheetItem::DisplayListItem ) {
-	    didListLabel = TRUE;
-	    drawLabel( &painter, chr->x, cy, 0, 0, baseLine, cg );
-	}
-
-	// check for cursor mark
-	if ( cursor && this == cursor->parag() && i == cursor->index() ) {
-	    curx = chr->x;
-	    if ( chr->rightToLeft )
-		curx += cw;
-	    curh = h;
-	    cury = cy;
-            curline = line;
-	}
-
-	// first time - start again...
-	if ( !lastFormat || lastY == -1 ) {
-	    lastFormat = chr->format();
-	    lastY = cy;
-	    startX = chr->x;
-	    if ( !chr->isCustom() && chr->c != '\n' )
-		paintEnd = i;
-	    bw = cw;
-	    if ( !chr->isCustom() )
-		continue;
-	}
-
-	// check if selection state changed
-	bool selectionChange = FALSE;
-	if ( drawSelections ) {
-	    for ( int j = 0; j < nSels; ++j ) {
-		selectionChange = selectionStarts[ j ] == i || selectionEnds[ j ] == i;
-		if ( selectionChange )
-		    break;
-	    }
-	}
-
-	//if something (format, etc.) changed, draw what we have so far
-	if ( ( ( ( alignment() & Qt3::AlignJustify ) == Qt3::AlignJustify && at(paintEnd)->c.isSpace() ) ||
-	       lastDirection != (bool)chr->rightToLeft ||
-	       chr->startOfRun ||
-	       lastY != cy || chr->format() != lastFormat ||
-	       ( paintEnd != -1 && at( paintEnd )->c =='\t' ) || chr->c == '\t' ||
-	       ( paintEnd != -1 && at( paintEnd )->c.unicode() == 0xad ) || chr->c.unicode() == 0xad ||
-	       selectionChange || chr->isCustom() ) ) {
-	    if ( paintStart <= paintEnd ) {
-		// ### temporary hack until I get the new placement/shaping stuff working
-		int x = startX;
-		if ( lastType == QTextStringChar::Mark && i > 0 ) {
-		    if ( !lastDirection )
-			x += str->at(i - 1).d.mark->xoff;
-		    else if ( i > 1 )
-			x -= str->at(i - 1).d.mark->xoff + str->width( i - 2 );
-		}
-		drawParagString( painter, qstr, paintStart, paintEnd - paintStart + 1, x, lastY,
-				 lastBaseLine, bw, lasth, drawSelections,
-				 lastFormat, i, selectionStarts, selectionEnds, cg, lastDirection );
-	    }
-	    if ( !str->isBidi() && is_printer( &painter ) ) { // ### fix our broken ps-printer
-		if ( !chr->lineStart ) {
-		    // ### the next line doesn't look 100% correct for arabic
-		    tw = startX + painter.fontMetrics().width( qstr.mid(paintStart, paintEnd - paintStart +1) );
-		    chr->x = QMAX( chr->x, tw );
-		} else {
-		    tw = 0;
-		}
-	    }
-	    if ( !chr->isCustom() ) {
-		if ( chr->c != '\n' ) {
-		    paintStart = i;
-		    paintEnd = i;
-		} else {
-		    paintStart = i+1;
-		    paintEnd = -1;
-		}
-		lastFormat = chr->format();
-		lastY = cy;
-		startX = chr->x;
-		bw = cw;
-	    } else {
-		if ( chr->customItem()->placement() == QTextCustomItem::PlaceInline ) {
-		    chr->customItem()->draw( &painter, chr->x, cy, clipx - r.x(), clipy - r.y(), clipw, cliph, cg,
-					     nSels && selectionStarts[ 0 ] <= i && selectionEnds[ 0 ] >= i );
-		    paintStart = i+1;
-		    paintEnd = -1;
-		    lastFormat = chr->format();
-		    lastY = cy;
-		    startX = chr->x + string()->width( i );
-		    bw = 0;
-		} else {
-		    chr->customItem()->resize( pntr, chr->customItem()->width );
-		    paintStart = i+1;
-		    paintEnd = -1;
-		    lastFormat = chr->format();
-		    lastY = cy;
-		    startX = chr->x + string()->width( i );
-		    bw = 0;
-		}
-	    }
-	} else {
-	    if ( chr->c != '\n' ) {
-		if( chr->rightToLeft ) {
-		    startX = chr->x;
-		}
-		paintEnd = i;
-	    }
-	    bw += cw;
-	}
-	lastBaseLine = baseLine;
-	lasth = h;
-	lastDirection = chr->rightToLeft;
-	lastType = chr->type;
-    }
-
-    // if we are through the parag, but still have some stuff left to draw, draw it now
-    if ( paintStart <= paintEnd ) {
-	bool selectionChange = FALSE;
-	if ( drawSelections ) {
-	    for ( int j = 0; j < nSels; ++j ) {
-		selectionChange = selectionStarts[ j ] == i || selectionEnds[ j ] == i;
-		if ( selectionChange )
-		    break;
-	    }
-	}
-	// ### temporary hack until I get the new placement/shaping stuff working
-	int x = startX;
-	if ( lastType == QTextStringChar::Mark && i > 0 ) {
-	    if ( !lastDirection )
-		x += str->at(i - 1).d.mark->xoff;
-	    else if ( i > 1 )
-		x -= str->at(i - 1).d.mark->xoff + str->width( i - 2 );
-	}
-	drawParagString( painter, qstr, paintStart, paintEnd-paintStart+1, x, lastY,
-			 lastBaseLine, bw, h, drawSelections,
-			 lastFormat, i, selectionStarts, selectionEnds, cg, lastDirection );
-    }
-
-    // if we should draw a cursor, draw it now
-    if ( curx != -1 && cursor ) {
-	painter.fillRect( QRect( curx, cury, 1, curh - lineSpacing( curline ) ), cg.color( QColorGroup::Text ) );
-	painter.save();
-	if ( string()->isBidi() ) {
-	    const int d = 4;
-	    if ( at( cursor->index() )->rightToLeft ) {
-		painter.setPen( Qt::black );
-		painter.drawLine( curx, cury, curx - d / 2, cury + d / 2 );
-		painter.drawLine( curx, cury + d, curx - d / 2, cury + d / 2 );
-	    } else {
-		painter.setPen( Qt::black );
-		painter.drawLine( curx, cury, curx + d / 2, cury + d / 2 );
-		painter.drawLine( curx, cury + d, curx + d / 2, cury + d / 2 );
-	    }
-	}
-	painter.restore();
-    }
-}
-
-void QTextParag::drawParagString( QPainter &painter, const QString &s, int start, int len, int startX,
-				      int lastY, int baseLine, int bw, int h, bool drawSelections,
-				      QTextFormat *lastFormat, int i, const QMemArray<int> &selectionStarts,
-				      const QMemArray<int> &selectionEnds, const QColorGroup &cg, bool /*rightToLeft*/ )
-{
-    if ( start + len == length() )
-	len--;
-    QString str( s );
-    if ( str[ (int)str.length() - 1 ].unicode() == 0xad )
-	str.remove( str.length() - 1, 1 );
-    painter.setPen( QPen( lastFormat->color() ) );
-    painter.setFont( lastFormat->font() );
-
-    if ( doc && lastFormat->isAnchor() && !lastFormat->anchorHref().isEmpty() && lastFormat->useLinkColor() ) {
-	painter.setPen( QPen( Qt::blue /* cg.link() */ ) ); // QT2HACK
-	if ( doc->underlineLinks() ) {
-	    QFont fn = lastFormat->font();
-	    fn.setUnderline( TRUE );
-	    painter.setFont( fn );
-	}
-    }
-
-    if ( drawSelections ) {
-	const int nSels = doc ? doc->numSelections() : 1;
-	const int startSel = painter.device()->devType() != QInternal::Printer ? 0 : 1;
-	for ( int j = startSel; j < nSels; ++j ) {
-	    if ( i > selectionStarts[ j ] && i <= selectionEnds[ j ] ) {
-		if ( !doc || doc->invertSelectionText( j ) )
-		    painter.setPen( QPen( cg.color( QColorGroup::HighlightedText ) ) );
-		if ( j == QTextDocument::Standard )
-		    painter.fillRect( startX, lastY, bw, h, cg.color( QColorGroup::Highlight ) );
-		else
-		    painter.fillRect( startX, lastY, bw, h, doc ? doc->selectionColor( j ) : cg.color( QColorGroup::Highlight ) );
-	    }
-	}
-    }
-    //QT2HACK
-    //QPainter::TextDirection dir = QPainter::LTR;
-    //if ( rightToLeft )
-	//dir = QPainter::RTL;
-    if ( str[start] != '\t' && str[ start ].unicode() != 0xad ) {
-	if ( lastFormat->vAlign() == QTextFormat::AlignNormal ) {
-            //QT2HACK painter.drawText( startX, lastY + baseLine, str, start, len, dir );
-            painter.drawText( startX, lastY + baseLine, str.mid(start), len );
-	} else if ( lastFormat->vAlign() == QTextFormat::AlignSuperScript ) {
-	    QFont f( painter.font() );
-	    f.setPointSize( ( f.pointSize() * 2 ) / 3 );
-	    painter.setFont( f );
-	    //QT2HACK painter.drawText( startX, lastY + baseLine - ( h - painter.fontMetrics().height() ), str, start, len, dir );
-	    painter.drawText( startX, lastY + baseLine - ( h - painter.fontMetrics().height() ), str.mid(start), len );
-	} else if ( lastFormat->vAlign() == QTextFormat::AlignSubScript ) {
-	    QFont f( painter.font() );
-	    f.setPointSize( ( f.pointSize() * 2 ) / 3 );
-	    painter.setFont( f );
-	    //QT2HACK painter.drawText( startX, lastY + baseLine, str, start, len, dir );
-	    painter.drawText( startX, lastY + baseLine, str.mid(start), len );
-	}
-    }
-    if ( i + 1 < length() && at( i + 1 )->lineStart && at( i )->c.unicode() == 0xad ) {
-	painter.drawText( startX + bw, lastY + baseLine, "\xad" );
-    }
-    if ( lastFormat->isMisspelled() ) {
-	painter.save();
-	painter.setPen( QPen( Qt::red, 1, Qt::DotLine ) );
-	painter.drawLine( startX, lastY + baseLine + 1, startX + bw, lastY + baseLine + 1 );
-	painter.restore();
-    }
-
-    i -= len;
-    if ( doc && lastFormat->isAnchor() && !lastFormat->anchorHref().isEmpty() &&
-	 doc->focusIndicator.parag == this &&
-	 doc->focusIndicator.start >= i &&
-	 doc->focusIndicator.start + doc->focusIndicator.len <= i + len ) {
-	painter.drawWinFocusRect( QRect( startX, lastY, bw, h ) );
-    }
-
-}
-
-void QTextParag::drawLabel( QPainter* p, int x, int y, int w, int h, int base, const QColorGroup& cg )
-{
-    if ( !style() )
-	return;
-    QRect r ( x, y, w, h );
-    QStyleSheetItem::ListStyle s = listStyle();
-
-    QFont font = p->font();
-    p->setFont( defFormat->font() );
-    QFontMetrics fm( p->fontMetrics() );
-    int size = fm.lineSpacing() / 3;
-
-    switch ( s ) {
-    case QStyleSheetItem::ListDecimal:
-    case QStyleSheetItem::ListLowerAlpha:
-    case QStyleSheetItem::ListUpperAlpha:
-	{
-	    int n = numberOfSubParagraph();
-	    QString l;
-	    switch ( s ) {
-	    case QStyleSheetItem::ListLowerAlpha:
-		if ( n < 27 ) {
-		    l = QChar( ('a' + (char) (n-1)));
-		    break;
-		}
-	    case QStyleSheetItem::ListUpperAlpha:
-		if ( n < 27 ) {
-		    l = QChar( ('A' + (char) (n-1)));
-		    break;
-		}
-		break;
-	    default:  //QStyleSheetItem::ListDecimal:
-		l.setNum( n );
-		break;
-	    }
-	    l += QString::fromLatin1(". ");
-	    p->drawText( r.right() - fm.width( l ), r.top() + base, l );
-	}
-	break;
-    case QStyleSheetItem::ListSquare:
-	{
-	    QRect er( r.right() - size * 2, r.top() + base - fm.boundingRect( 'A' ).height() / 2 - size / 2 - 1, size, size );
-	    p->fillRect( er , cg.brush( QColorGroup::Foreground ) );
-	}
-	break;
-    case QStyleSheetItem::ListCircle:
-	{
-	    QRect er( r.right()-size*2, r.top() + base - fm.boundingRect('A').height()/2 - size/2 - 1, size, size);
-	    p->drawEllipse( er );
-	}
-	break;
-    case QStyleSheetItem::ListDisc:
-    default:
-	{
-	    p->setBrush( cg.brush( QColorGroup::Foreground ));
-	    QRect er( r.right()-size*2, r.top() + base - fm.boundingRect('A').height()/2 - size/2 - 1, size, size);
-	    p->drawEllipse( er );
-	    p->setBrush( Qt::NoBrush );
-	}
-	break;
-    }
-
-    p->setFont( font );
-}
-
-void QTextParag::setStyleSheetItems( const QPtrVector<QStyleSheetItem> &vec )
-{
-    styleSheetItemsVec = vec;
-    invalidate( 0 );
-    lm = rm = tm = bm = flm = -1;
-    numSubParag = -1;
-}
-
-void QTextParag::setList( bool b, int listStyle )
-{
-    if ( !doc )
-	return;
-
-    if ( !style() ) {
-	styleSheetItemsVec.resize( 2 );
-	styleSheetItemsVec.insert( 0, doc->styleSheet()->item( "html" ) );
-	styleSheetItemsVec.insert( 1, doc->styleSheet()->item( "p" ) );
-    }
-
-    if ( b ) {
-	if ( style()->displayMode() != QStyleSheetItem::DisplayListItem || this->listStyle() != listStyle ) {
-	    styleSheetItemsVec.remove( styleSheetItemsVec.size() - 1 );
-	    QStyleSheetItem *item = styleSheetItemsVec[ styleSheetItemsVec.size() - 2 ];
-	    if ( item )
-		styleSheetItemsVec.remove( styleSheetItemsVec.size() - 2 );
-	    styleSheetItemsVec.insert( styleSheetItemsVec.size() - 2,
-				       listStyle == QStyleSheetItem::ListDisc || listStyle == QStyleSheetItem::ListCircle
-				       || listStyle == QStyleSheetItem::ListSquare ?
-				       doc->styleSheet()->item( "ul" ) : doc->styleSheet()->item( "ol" ) );
-	    styleSheetItemsVec.insert( styleSheetItemsVec.size() - 1, doc->styleSheet()->item( "li" ) );
-	    setListStyle( (QStyleSheetItem::ListStyle)listStyle );
-	} else {
-	    return;
-	}
-    } else {
-	if ( style()->displayMode() != QStyleSheetItem::DisplayBlock ) {
-	    styleSheetItemsVec.remove( styleSheetItemsVec.size() - 1 );
-	    if ( styleSheetItemsVec.size() >= 2 ) {
-		styleSheetItemsVec.remove( styleSheetItemsVec.size() - 2 );
-		styleSheetItemsVec.resize( styleSheetItemsVec.size() - 2 );
-	    } else {
-		styleSheetItemsVec.resize( styleSheetItemsVec.size() - 1 );
-	    }
-	} else {
-	    return;
-	}
-    }
-    invalidate( 0 );
-    lm = rm = tm = bm = flm = -1;
-    numSubParag = -1;
-    if ( next() ) {
-	QTextParag *s = next();
-	while ( s ) {
-	    s->numSubParag = -1;
-	    s->lm = s->rm = s->tm = s->bm = flm = -1;
-	    s->numSubParag = -1;
-	    s->invalidate( 0 );
-	    s = s->next();
-	}
-    }
-}
-
-void QTextParag::incDepth()
-{
-    if ( !style() || !doc )
-	return;
-    if ( style()->displayMode() != QStyleSheetItem::DisplayListItem )
-	return;
-    styleSheetItemsVec.resize( styleSheetItemsVec.size() + 1 );
-    styleSheetItemsVec.insert( styleSheetItemsVec.size() - 1, styleSheetItemsVec[ styleSheetItemsVec.size() - 2 ] );
-    styleSheetItemsVec.insert( styleSheetItemsVec.size() - 2,
-			       listStyle() == QStyleSheetItem::ListDisc || listStyle() == QStyleSheetItem::ListCircle ||
-			       listStyle() == QStyleSheetItem::ListSquare ?
-			       doc->styleSheet()->item( "ul" ) : doc->styleSheet()->item( "ol" ) );
-    invalidate( 0 );
-    lm = -1;
-    flm = -1;
-}
-
-void QTextParag::decDepth()
-{
-    if ( !style() || !doc )
-	return;
-    if ( style()->displayMode() != QStyleSheetItem::DisplayListItem )
-	return;
-    int numLists = 0;
-    QStyleSheetItem *lastList = 0;
-    int lastIndex = 0;
-    int i;
-    for ( i = 0; i < (int)styleSheetItemsVec.size(); ++i ) {
-	QStyleSheetItem *item = styleSheetItemsVec[ i ];
-	if ( item->name() == "ol" || item->name() == "ul" ) {
-	    lastList = item;
-	    lastIndex = i;
-	    numLists++;
-	}
-    }
-
-    if ( !lastList )
-	return;
-    styleSheetItemsVec.remove( lastIndex );
-    for ( i = lastIndex; i < (int)styleSheetItemsVec.size() - 1; ++i )
-	styleSheetItemsVec.insert( i, styleSheetItemsVec[ i + 1 ] );
-    styleSheetItemsVec.resize( styleSheetItemsVec.size() - 1 );
-    if ( numLists == 1 )
-	setList( FALSE, -1 );
-    invalidate( 0 );
-    lm = -1;
-    flm = -1;
-}
-
-int QTextParag::nextTab( int, int x )
-{
-    int *ta = tArray;
-    if ( doc ) {
-	if ( !ta )
-	   ta = doc->tabArray();
-	tabStopWidth = doc->tabStopWidth();
-    }
-    if ( ta ) {
-	int i = 0;
-	while ( ta[ i ] ) {
-	    if ( ta[ i ] >= x )
-		return tArray[ i ];
-	    ++i;
-	}
-	return tArray[ 0 ];
-    } else {
-	int d;
-	if ( tabStopWidth != 0 )
-	    d = x / tabStopWidth;
-	else
-	    return x;
-	return tabStopWidth * ( d + 1 );
-    }
-}
-
-void QTextParag::setPainter( QPainter *p )
-{
-    pntr = p;
-    for ( int i = 0; i < length(); ++i ) {
-	if ( at( i )->isCustom() )
-	    at( i )->customItem()->adjustToPainter( p );
-    }
-}
-
-QTextFormatCollection *QTextParag::formatCollection() const
-{
-    if ( doc )
-	return doc->formatCollection();
-    if ( !qFormatCollection )
-	qFormatCollection = new QTextFormatCollection;
-    return qFormatCollection;
-}
-
-QString QTextParag::richText() const
-{
-    QString s;
-    QTextFormat *lastFormat = 0;
-    for ( int i = 0; i < length(); ++i ) {
-	QTextStringChar *c = &str->at( i );
-	if ( !lastFormat || ( lastFormat->key() != c->format()->key() && c->c != ' ' ) ) {
-	    s += c->format()->makeFormatChangeTags( lastFormat );
-	    lastFormat = c->format();
-	}
-	if ( c->c == '<' ) {
-	    s += "&lt;";
-	} else if ( c->c == '>' ) {
-	    s += "&gt;";
-	} else if ( c->isCustom() ) {
-	    s += c->customItem()->richText();
-	} else {
-	    s += c->c;
-	}
-    }
-    return s;
-}
-
-void QTextParag::addCommand( QTextCommand *cmd )
-{
-    if ( !doc )
-	commandHistory->addCommand( cmd );
-    else
-	doc->commands()->addCommand( cmd );
-}
-
-QTextCursor *QTextParag::undo( QTextCursor *c )
-{
-    if ( !doc )
-	return commandHistory->undo( c );
-    return doc->commands()->undo( c );
-}
-
-QTextCursor *QTextParag::redo( QTextCursor *c )
-{
-    if ( !doc )
-	return commandHistory->redo( c );
-    return doc->commands()->redo( c );
-}
-
-int QTextParag::topMargin() const
-{
-    if ( !p && ( !doc || !doc->addMargins() ) )
-	return 0;
-    if ( tm != -1 )
-	return tm;
-    QStyleSheetItem *item = style();
-    if ( !item ) {
-	( (QTextParag*)this )->tm = 0;
-	return 0;
-    }
-
-    int m = 0;
-    if ( item->margin( QStyleSheetItem::MarginTop ) != QStyleSheetItem::Undefined )
-	m = item->margin( QStyleSheetItem::MarginTop );
-    QStyleSheetItem *it = 0;
-    QStyleSheetItem *p = prev() ? prev()->style() : 0;
-    for ( int i = (int)styleSheetItemsVec.size() - 2 ; i >= 0; --i ) {
-	it = styleSheetItemsVec[ i ];
-	if ( it != p )
-	    break;
-	int mar = it->margin( QStyleSheetItem::MarginTop );
-	m += mar != QStyleSheetItem::Undefined ? mar : 0;
-	if ( it->displayMode() != QStyleSheetItem::DisplayInline )
-	    break;
-    }
-
-    if ( is_printer( painter() ) ) {
-	QPaintDeviceMetrics metrics( painter()->device() );
-	double yscale = scale_factor( metrics.logicalDpiY() );
-	m = (int)( (double)m * yscale );
-    }
-
-    ( (QTextParag*)this )->tm = m;
-    return tm;
-}
-
-int QTextParag::bottomMargin() const
-{
-    if ( bm != -1 )
-	return bm;
-    QStyleSheetItem *item = style();
-    if ( !item ) {
-	( (QTextParag*)this )->bm = 0;
-	return 0;
-    }
-
-    int m = 0;
-    if ( item->margin( QStyleSheetItem::MarginBottom ) != QStyleSheetItem::Undefined )
-	m = item->margin( QStyleSheetItem::MarginBottom );
-    QStyleSheetItem *it = 0;
-    QStyleSheetItem *n = next() ? next()->style() : 0;
-    for ( int i =(int)styleSheetItemsVec.size() - 2 ; i >= 0; --i ) {
-	it = styleSheetItemsVec[ i ];
-	if ( it != n )
-	    break;
-	int mar = it->margin( QStyleSheetItem::MarginBottom );
-	m += mar != QStyleSheetItem::Undefined ? mar : 0;
-	if ( it->displayMode() != QStyleSheetItem::DisplayInline )
-	    break;
-    }
-
-    if ( is_printer( painter() ) ) {
-	QPaintDeviceMetrics metrics( painter()->device() );
-	double yscale = scale_factor( metrics.logicalDpiY() );
-	m = (int)( (double)m * yscale );
-    }
-
-    ( (QTextParag*)this )->bm = m;
-    return bm;
-}
-
-int QTextParag::leftMargin() const
-{
-    if ( lm != -1 )
-	return lm;
-    QStyleSheetItem *item = style();
-    if ( !item ) {
-	( (QTextParag*)this )->lm = 0;
-	return 0;
-    }
-    int m = 0;
-    for ( int i = 0; i < (int)styleSheetItemsVec.size(); ++i ) {
-	item = styleSheetItemsVec[ i ];
-	int mar = item->margin( QStyleSheetItem::MarginLeft );
-	m += mar != QStyleSheetItem::Undefined ? mar : 0;
-	if ( item->name() == "ol" || item->name() == "ul" ) {
-	    m += defFormat->width( '1' ) +
-		 defFormat->width( '2' ) +
-		 defFormat->width( '3' ) +
-		 defFormat->width( '.' );
-	}
-    }
-
-    if ( is_printer( painter() ) ) {
-	QPaintDeviceMetrics metrics( painter()->device() );
-	double yscale = scale_factor( metrics.logicalDpiY() );
-	m = (int)( (double)m * yscale );
-    }
-
-    ( (QTextParag*)this )->lm = m;
-    return lm;
-}
-
-int QTextParag::firstLineMargin() const
-{
-    if ( flm != -1 )
-	return lm;
-    QStyleSheetItem *item = style();
-    if ( !item ) {
-	( (QTextParag*)this )->flm = 0;
-	return 0;
-    }
-    int m = 0;
-    for ( int i = 0; i < (int)styleSheetItemsVec.size(); ++i ) {
-	item = styleSheetItemsVec[ i ];
-	int mar = item->margin( QStyleSheetItem::MarginFirstLine );
-	m += mar != QStyleSheetItem::Undefined ? mar : 0;
-    }
-
-    if ( is_printer( painter() ) ) {
-	QPaintDeviceMetrics metrics( painter()->device() );
-	double yscale = scale_factor( metrics.logicalDpiY() );
-	m = (int)( (double)m * yscale );
-    }
-
-    ( (QTextParag*)this )->flm = m;
-    return flm;
-}
-
-int QTextParag::rightMargin() const
-{
-    if ( rm != -1 )
-	return rm;
-    QStyleSheetItem *item = style();
-    if ( !item ) {
-	( (QTextParag*)this )->rm = 0;
-	return 0;
-    }
-    int m = 0;
-    for ( int i = 0; i < (int)styleSheetItemsVec.size(); ++i ) {
-	item = styleSheetItemsVec[ i ];
-	int mar = item->margin( QStyleSheetItem::MarginRight );
-	m += mar != QStyleSheetItem::Undefined ? mar : 0;
-    }
-
-    if ( is_printer( painter() ) ) {
-	QPaintDeviceMetrics metrics( painter()->device() );
-	double yscale = scale_factor( metrics.logicalDpiY() );
-	m = (int)( (double)m * yscale );
-    }
-
-    ( (QTextParag*)this )->rm = m;
-    return rm;
-}
-
-int QTextParag::lineSpacing( int /*line*/ ) const
-{
-    QStyleSheetItem *item = style();
-    if ( !item )
-	return 0;
-
-    int ls = item->lineSpacing();
-    if ( ls == QStyleSheetItem::Undefined )
-	return 0;
-    if ( is_printer( painter() ) ) {
-	QPaintDeviceMetrics metrics( painter()->device() );
-	double yscale = scale_factor( metrics.logicalDpiY() );
-	ls = (int)( (double)ls * yscale );
-    }
-
-    return ls;
-}
-
-void QTextParag::copyParagData( QTextParag *parag )
-{
-    setStyleSheetItems( parag->styleSheetItems() );
-    setListStyle( parag->listStyle() );
-    setAlignment( parag->alignment() );
-}
-
-void QTextParag::show()
-{
-    if ( visible || !doc )
-	return;
-    visible = TRUE;
-}
-
-void QTextParag::hide()
-{
-    if ( !visible || !doc )
-	return;
-    visible = FALSE;
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-QTextPreProcessor::QTextPreProcessor()
-{
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextFormatter::QTextFormatter()
-    : wrapEnabled( TRUE ), wrapColumn( -1 ), biw( FALSE )
-{
-}
-
-/* only used for bidi or complex text reordering
- */
-QTextParagLineStart *QTextFormatter::formatLine( QTextParag * /*parag*/, QTextString *string, QTextParagLineStart *line,
-						   QTextStringChar *startChar, QTextStringChar *lastChar, int align, int space )
-{
-//QT2HACK
-#if 0
-    if( string->isBidi() )
-	return bidiReorderLine( parag, string, line, startChar, lastChar, align, space );
-#endif
-    space = QMAX( space, 0 ); // #### with nested tables this gets negative because of a bug I didn't find yet, so workaround for now. This also means non-left aligned nested tables do not work at the moment
-    int start = (startChar - &string->at(0));
-    int last = (lastChar - &string->at(0) );
-    // do alignment Auto == Left in this case
-    if ( align & Qt::AlignHCenter || align & Qt::AlignRight ) {
-	if ( align & Qt::AlignHCenter )
-	    space /= 2;
-	for ( int j = start; j <= last; ++j )
-	    string->at( j ).x += space;
-    } else if ( align & Qt3::AlignJustify ) {
-	int numSpaces = 0;
-	for ( int j = start; j < last; ++j ) {
-	    if( isBreakable( string, j ) ) {
-		numSpaces++;
-	    }
-	}
-	int toAdd = 0;
-	for ( int k = start + 1; k <= last; ++k ) {
-	    if( isBreakable( string, k ) && numSpaces ) {
-		int s = space / numSpaces;
-		toAdd += s;
-		space -= s;
-		numSpaces--;
-	    }
-	    string->at( k ).x += toAdd;
-	}
-    }
-
-    if ( last >= 0 && last < string->length() )
-	line->w = string->at( last ).x + string->width( last ); // #### Lars, I guess this breaks for Bidi
-    else
-	line->w = 0;
-
-    return new QTextParagLineStart();
-}
-
-//QT2HACK
-#if 0
-
-#ifdef BIDI_DEBUG
-#include <iostream>
-#endif
-
-// collects one line of the paragraph and transforms it to visual order
-QTextParagLineStart *QTextFormatter::bidiReorderLine( QTextParag *parag, QTextString *text, QTextParagLineStart *line,
-							QTextStringChar *startChar, QTextStringChar *lastChar, int align, int space )
-{
-    int start = (startChar - &text->at(0));
-    int last = (lastChar - &text->at(0) );
-    //printf("doing BiDi reordering from %d to %d!\n", start, last);
-
-    QBidiControl *control = new QBidiControl( line->context(), line->status );
-    QString str;
-    str.setUnicode( 0, last - start + 1 );
-    // fill string with logically ordered chars.
-    QTextStringChar *ch = startChar;
-    QChar *qch = (QChar *)str.unicode();
-    while( ch <= lastChar ) {
-	*qch = ch->c;
-	qch++;
-	ch++;
-    }
-
-    QPtrList<QTextRun> *runs;
-    runs = QComplexText::bidiReorderLine(control, str, 0, last - start + 1);
-
-    // now construct the reordered string out of the runs...
-
-    int left = parag->document() ? parag->leftMargin() + 4 : 4;
-    int x = left + ( parag->document() ? parag->firstLineMargin() : 0 );
-    if ( parag->document() )
-	x = parag->document()->flow()->adjustLMargin( parag->rect().y(), parag->rect().height(), left, 4 );
-    int numSpaces = 0;
-    // set the correct alignment. This is a bit messy....
-    if( align == Qt3::AlignAuto ) {
-	// align according to directionality of the paragraph...
-	if ( text->isRightToLeft() )
-	    align = Qt::AlignRight;
-    }
-
-    if ( align & Qt::AlignHCenter )
-	x += space/2;
-    else if ( align & Qt::AlignRight )
-	x += space;
-    else if ( align & Qt3::AlignJustify ) {
-	for ( int j = start; j < last; ++j ) {
-	    if( isBreakable( text, j ) ) {
-		numSpaces++;
-	    }
-	}
-    }
-    int toAdd = 0;
-
-    // in rtl text the leftmost character is usually a space
-    // this space should not take up visible space on the left side, to get alignment right.
-    // the following bool is used for that purpose
-    bool first = TRUE;
-    QTextRun *r = runs->first();
-    while ( r ) {
-	if(r->level %2) {
-	    // odd level, need to reverse the string
-	    int pos = r->stop + start;
-	    while(pos >= r->start + start) {
-		QTextStringChar *c = &text->at(pos);
-		if( numSpaces && !first && isBreakable( text, pos ) ) {
-		    int s = space / numSpaces;
-		    toAdd += s;
-		    space -= s;
-		    numSpaces--;
-		}
-		if ( first ) {
-		    first = FALSE;
-		    if ( c->c == ' ' )
-			x -= text->width( pos );
-		}
-		c->x = x + toAdd;
-		c->rightToLeft = TRUE;
-		c->startOfRun = FALSE;
-		int ww = 0;
-		if ( c->c.unicode() >= 32 || c->c == '\t' || c->isCustom() ) {
-		    ww = text->width( pos );
-		} else {
-		    ww = c->format()->width( ' ' );
-		}
-		//qDebug("setting char %d at pos %d width=%d", pos, x, ww);
-		x += ww;
-		pos--;
-	    }
-	} else {
-	    int pos = r->start + start;
-	    while(pos <= r->stop + start) {
-		QTextStringChar* c = &text->at(pos);
-		if( numSpaces && !first && isBreakable( text, pos ) ) {
-		    int s = space / numSpaces;
-		    toAdd += s;
-		    space -= s;
-		    numSpaces--;
-		}
-		if ( first ) {
-		    first = FALSE;
-		    if ( c->c == ' ' )
-			x -= text->width( pos );
-		}
-		c->x = x + toAdd;
-		c->rightToLeft = FALSE;
-		c->startOfRun = FALSE;
-		int ww = 0;
-		if ( c->c.unicode() >= 32 || c->c == '\t' || c->isCustom() ) {
-		    ww = text->width( pos );
-		} else {
-		    ww = c->format()->width( ' ' );
-		}
-		//qDebug("setting char %d at pos %d", pos, x);
-		x += ww;
-		pos++;
-	    }
-	}
-	text->at( r->start ).startOfRun = TRUE;
-	r = runs->next();
-    }
-    QTextParagLineStart *ls = new QTextParagLineStart( control->context, control->status );
-    delete control;
-    delete runs;
-    return ls;
-}
-#endif
-
-bool QTextFormatter::isBreakable( QTextString *string, int pos ) const
-{
-    const QChar &c = string->at( pos ).c;
-    char ch = c.latin1();
-    if ( c.isSpace() && ch != '\n' )
-	return TRUE;
-    if ( c.unicode() == 0xad ) // soft hyphen
-	return TRUE;
-    if ( !ch ) {
-	// not latin1, need to do more sophisticated checks for other scripts
-	uchar row = c.row();
-	if ( row == 0x0e ) {
-	    // 0e00 - 0e7f == Thai
-	    if ( c.cell() < 0x80 ) {
-#ifdef HAVE_THAI_BREAKS
-		// check for thai
-		if( string != cachedString ) {
-		    // build up string of thai chars
-		    QTextCodec *thaiCodec = QTextCodec::codecForMib(2259);
-		    if ( !thaiCache )
-			thaiCache = new QCString;
-		    if ( !thaiIt )
-			thaiIt = ThBreakIterator::createWordInstance();
-		    *thaiCache = thaiCodec->fromUnicode( s->string() );
-		}
-		thaiIt->setText(thaiCache->data());
-		for(int i = thaiIt->first(); i != thaiIt->DONE; i = thaiIt->next() ) {
-		    if( i == pos )
-			return TRUE;
-		    if( i > pos )
-			return FALSE;
-		}
-		return FALSE;
-#else
-		// if we don't have a thai line breaking lib, allow
-		// breaks everywhere except directly before punctuation.
-		return TRUE;
-#endif
-	    } else
-		return FALSE;
-	}
-	if ( row < 0x11 ) // no asian font
-	    return FALSE;
-	if ( row > 0x2d && row < 0xfb || row == 0x11 )
-	    // asian line breaking. Everywhere allowed except directly
-	    // in front of a punctuation character.
-	    return TRUE;
-    }
-    return FALSE;
-}
-
-void QTextFormatter::insertLineStart( QTextParag *parag, int index, QTextParagLineStart *ls )
-{
-    if ( index > 0 ) { // we can assume that only first line starts are insrted multiple times
-	parag->lineStartList().insert( index, ls );
-	return;
-    }
-    QMap<int, QTextParagLineStart*>::Iterator it;
-    if ( ( it = parag->lineStartList().find( index ) ) == parag->lineStartList().end() ) {
-	parag->lineStartList().insert( index, ls );
-    } else {
-	delete *it;
-	parag->lineStartList().remove( it );
-	parag->lineStartList().insert( index, ls );
-    }
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextFormatterBreakInWords::QTextFormatterBreakInWords()
-{
-}
-
-int QTextFormatterBreakInWords::format( QTextDocument *doc,QTextParag *parag,
-					int start, const QMap<int, QTextParagLineStart*> & )
-{
-    QTextStringChar *c = 0;
-    QTextStringChar *firstChar = 0;
-    int left = doc ? parag->leftMargin() + 4 : 4;
-    int x = left + ( doc ? parag->firstLineMargin() : 0 );
-    int dw = parag->documentVisibleWidth() - ( doc ? 8 : 0 );
-    int y = doc->addMargins() ? parag->topMargin() : 0;
-    int h = y;
-    int len = parag->length();
-    if ( doc )
-	x = doc->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), x, 4 );
-    int rm = parag->rightMargin();
-    int w = dw - ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), parag->rect().height(), rm, 4 ) : 0 );
-    bool fullWidth = TRUE;
-    int minw = 0;
-
-    start = 0;
-    if ( start == 0 )
-	c = &parag->string()->at( 0 );
-
-    int i = start;
-    QTextParagLineStart *lineStart = new QTextParagLineStart( y, y, 0 );
-    insertLineStart( parag, 0, lineStart );
-
-    int col = 0;
-    int ww = 0;
-    QChar lastChr;
-    for ( ; i < len; ++i, ++col ) {
-	if ( c )
-	    lastChr = c->c;
-	c = &parag->string()->at( i );
-	if ( i > 0 ) {
-	    c->lineStart = 0;
-	} else {
-	    c->lineStart = 1;
-	    firstChar = c;
-	}
-	if ( c->c.unicode() >= 32 || c->isCustom() ) {
-	    ww = parag->string()->width( i );
-	} else if ( c->c == '\t' ) {
-	    int nx = parag->nextTab( i, x );
-	    if ( nx < x )
-		ww = w - x;
-	    else
-		ww = nx - x + 1;
-	} else {
-	    ww = c->format()->width( ' ' );
-	}
-
-	if ( c->isCustom() && c->customItem()->ownLine() ) {
-	    if ( doc )
-		x = doc ? doc->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), left, 4 ) : left;
-	    w = dw - ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), parag->rect().height(), rm, 4 ) : 0 );
-	    c->customItem()->resize( parag->painter(), dw );
-	    if ( x != left || w != dw )
-		fullWidth = FALSE;
-	    w = dw;
-	    y += h;
-	    h = c->height();
-	    lineStart = new QTextParagLineStart( y, h, h );
-	    insertLineStart( parag, i, lineStart );
-	    c->lineStart = 1;
-	    firstChar = c;
-	    x = 0xffffff;
-	    continue;
-	}
-
-	if ( isWrapEnabled() &&
-	     ( wrapAtColumn() == -1 && x + ww > w ||
-	       wrapAtColumn() != -1 && col >= wrapAtColumn() ) ||
-	       parag->isNewLinesAllowed() && lastChr == '\n' ) {
-	    x = doc ? parag->document()->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), left, 4 ) : left;
-	    if ( x != left )
-		fullWidth = FALSE;
-	    w = dw;
-	    y += h;
-	    h = c->height();
-	    lineStart = formatLine( parag, parag->string(), lineStart, firstChar, c-1 );
-	    lineStart->y = y;
-	    insertLineStart( parag, i, lineStart );
-	    lineStart->baseLine = c->ascent();
-	    lineStart->h = c->height();
-	    c->lineStart = 1;
-	    firstChar = c;
-	    col = 0;
-	    if ( wrapAtColumn() != -1 )
-		minw = QMAX( minw, w );
-	} else if ( lineStart ) {
-	    lineStart->baseLine = QMAX( lineStart->baseLine, c->ascent() );
-	    h = QMAX( h, c->height() );
-	    lineStart->h = h;
-	}
-
-	c->x = x;
-	x += ww;
-    }
-
-    int m = parag->bottomMargin();
-    if ( parag->next() && !doc->addMargins() )
-	m = QMAX( m, parag->next()->topMargin() );
-    parag->setFullWidth( fullWidth );
-    if ( is_printer( parag->painter() ) ) {
-	QPaintDeviceMetrics metrics( parag->painter()->device() );
-	double yscale = scale_factor( metrics.logicalDpiY() );
-	m = (int)( (double)m * yscale );
-    }
-    y += h + m;
-    if ( !isWrapEnabled() )
-	minw = QMAX( minw, c->x + ww ); // #### Lars: Fix this for BiDi, please
-    if ( doc )
-	doc->setMinimumWidth( minw, parag );
-    return y;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextFormatterBreakWords::QTextFormatterBreakWords()
-{
-}
-
-int QTextFormatterBreakWords::format( QTextDocument *doc, QTextParag *parag,
-				      int start, const QMap<int, QTextParagLineStart*> & )
-{
-    QTextStringChar *c = 0;
-    start = 0;
-    if ( start == 0 )
-	c = &parag->string()->at( 0 );
-
-    QTextStringChar *firstChar = 0;
-    int firstCharIndex = 0;
-    QTextString *string = parag->string();
-    int left = doc ? parag->leftMargin() + 4 : 0;
-    int x = left + ( doc ? parag->firstLineMargin() : 0 );
-    int curLeft = left;
-    int y = doc && doc->addMargins() ? parag->topMargin() : 0;
-    int h = 0;
-    int len = parag->length();
-
-    int initialHeight = h + c->height(); // remember what adjustLMargin was called with
-    if ( doc )
-	x = doc->flow()->adjustLMargin( y + parag->rect().y(), h + c->height(), x, 4 );
-    int initialLMargin = x;              // and remember the resulting adjustement we got
-    int dw = parag->documentVisibleWidth() - ( doc ? ( left != x ? 0 : 8 ) : -4 );
-
-    curLeft = x;
-    int rm = parag->rightMargin();
-    int initialRMargin = doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), h + c->height(), rm, 4 ) : 0;
-    int w = dw - initialRMargin;
-    bool fullWidth = TRUE;
-    int marg = left + initialRMargin;
-    int minw = 0;
-    int tminw = marg;
-    int line = 0;
-
-    int i = start;
-    //qDebug( "Initial QTextParagLineStart at y=%d", y );
-    QTextParagLineStart *lineStart = new QTextParagLineStart( y, 0, 0 );
-    insertLineStart( parag, 0, lineStart );
-    int lastBreak = -1;
-    int tmpBaseLine = 0, tmph = 0;
-    bool lastWasNonInlineCustom = FALSE;
-
-    int align = parag->alignment();
-    if ( align == Qt3::AlignAuto && doc && doc->alignment() != Qt3::AlignAuto )
- 	align = doc->alignment();
-
-    int col = 0;
-    int ww = 0;
-    QChar lastChr;
-    for ( ; i < len; ++i, ++col ) {
-	if ( c )
-	    lastChr = c->c;
-	c = &string->at( i );
-	if ( i > 0 && x > curLeft || lastWasNonInlineCustom ) {
-	    c->lineStart = 0;
-	} else {
-	    c->lineStart = 1;
-	    firstChar = c;
-            firstCharIndex = i;
-	}
-
-	if ( c->isCustom() && c->customItem()->placement() != QTextCustomItem::PlaceInline )
-	    lastWasNonInlineCustom = TRUE;
-	else
-	    lastWasNonInlineCustom = FALSE;
-
-	if ( c->c.unicode() >= 32 || c->isCustom() ) {
-	    ww = string->width( i );
-	} else if ( c->c == '\t' ) {
-	    int nx = parag->nextTab( i, x );
-	    if ( nx < x )
-		ww = w - x;
-	    else
-		ww = nx - x + 1;
-	} else {
-	    ww = c->format()->width( ' ' );
-	}
-
-        // Custom item that forces a new line
-	if ( c->isCustom() && c->customItem()->ownLine() ) {
-	    x = doc ? doc->flow()->adjustLMargin( y + parag->rect().y(), c->height(), left, 4 ) : left;
-	    w = dw - ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), c->height(), rm, 4 ) : 0 );
-	    QTextParagLineStart *lineStart2 = formatLine( parag, string, lineStart, firstChar, c-1, align, w - x );
-	    c->customItem()->resize( parag->painter(), dw );
-	    if ( x != left || w != dw )
-		fullWidth = FALSE;
-	    curLeft = x;
-	    if ( i == 0 || !isBreakable( string, i - 1 ) || string->at( i - 1 ).lineStart == 0 ) {
-                // Create a new line for this custom item
-                lineStart->h += doc ? parag->lineSpacing( line++ ) : 0;
-		y += QMAX( h, tmph );
-		tmph = c->height();
-		h = tmph;
-		lineStart = lineStart2;
-		lineStart->y = y;
-		insertLineStart( parag, i, lineStart );
-		c->lineStart = 1;
-		firstChar = c;
-	    } else {
-                // No need for a new line, already at beginning of line
-		tmph = c->height();
-		h = tmph;
-		delete lineStart2;
-	    }
-	    lineStart->h = h;
-	    lineStart->baseLine = h;
-	    tmpBaseLine = lineStart->baseLine;
-	    lastBreak = -2;
-	    x = 0xffffff;
-	    minw = QMAX( minw, tminw );
-	    int tw = QMAX( c->customItem()->minimumWidth(), QMIN( c->customItem()->widthHint(), c->customItem()->width ) );
-	    if ( tw < 32000 )
-		tminw = tw;
-	    else
-		tminw = marg;
-	    continue;
-	}
-        //qDebug("c=%c i=%d/%d x=%d ww=%d w=%d (test is x+ww>w) lastBreak=%d isBreakable=%d",c->c.latin1(),i,len,x,ww,w,lastBreak,isBreakable(string,i));
-        // Wrapping at end of line
-	if ( isWrapEnabled() &&
-             ( !isBreakable( string, i ) || ( i > 0 && !isBreakable( string, i - 1 ) ) ) && // break after '  '
-             ( lastBreak != -1 || allowBreakInWords() ) &&
-	     ( wrapAtColumn() == -1 && x + ww > w && lastBreak != -1 ||
-	       wrapAtColumn() == -1 && x + ww > w - 4 && lastBreak == -1 && allowBreakInWords() ||
-	       wrapAtColumn() != -1 && col >= wrapAtColumn() ) ||
-	       parag->isNewLinesAllowed() && lastChr == '\n' ) {
-            //qDebug( "BREAKING" );
-	    if ( wrapAtColumn() != -1 )
-		minw = QMAX( minw, x + ww );
-            // No breakable char found -> break at current char
-	    if ( lastBreak < 0 ) {
-                ASSERT( lineStart );
-		//if ( lineStart ) {
-                    // (combine lineStart and tmpBaseLine/tmph)
-                    int belowBaseLine = QMAX( h - lineStart->baseLine, tmph - tmpBaseLine );
-                    lineStart->baseLine = QMAX( lineStart->baseLine, tmpBaseLine );
-                    h = lineStart->baseLine + belowBaseLine;
-		    lineStart->h = h;
-                //}
-		QTextParagLineStart *lineStart2 = formatLine( parag, string, lineStart, firstChar, c-1, align, w - x );
-                lineStart->h += doc ? parag->lineSpacing( line++ ) : 0;
-		y += lineStart->h;
-
-                lineStart = lineStart2;
-		tmph = c->height();
-		h = 0;
-		x = doc ? doc->flow()->adjustLMargin( y + parag->rect().y(), tmph, left, 4 ) : left;
-                initialHeight = tmph;
-                initialLMargin = x;
-                initialRMargin = ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), tmph, rm, 4 ) : 0 );
-		w = dw - initialRMargin;
-		if ( parag->isNewLinesAllowed() && c->c == '\t' ) {
-		    int nx = parag->nextTab( i, x );
-		    if ( nx < x )
-			ww = w - x;
-		    else
-			ww = nx - x + 1;
-		}
-		if ( x != left || w != dw )
-		    fullWidth = FALSE;
-		curLeft = x;
-		lineStart->y = y;
-		insertLineStart( parag, i, lineStart );
-		lineStart->baseLine = c->ascent();
-		lineStart->h = c->height();
-		c->lineStart = 1;
-		firstChar = c;
-		tmpBaseLine = lineStart->baseLine;
-		lastBreak = -1;
-		col = 0;
-	    } else {
-                // Breakable char was found
-		i = lastBreak;
-		QTextParagLineStart *lineStart2 = formatLine( parag, string, lineStart, firstChar, parag->at( lastBreak ), align, w - string->at( i ).x );
-                lineStart->h += doc ? parag->lineSpacing( line++ ) : 0;
-		y += lineStart->h;
-		lineStart = lineStart2;
-		tmph = c->height();
-		h = tmph;
-		x = doc ? doc->flow()->adjustLMargin( y + parag->rect().y(), h, left, 4 ) : left;
-                initialHeight = h;
-                initialLMargin = x;
-                initialRMargin = ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), h, rm, 4 ) : 0 );
-		w = dw - initialRMargin;
-		if ( parag->isNewLinesAllowed() && c->c == '\t' ) {
-		    int nx = parag->nextTab( i, x );
-		    if ( nx < x )
-			ww = w - x;
-		    else
-			ww = nx - x + 1;
-		}
-		if ( x != left || w != dw )
-		    fullWidth = FALSE;
-		curLeft = x;
-		lineStart->y = y;
-		insertLineStart( parag, i + 1, lineStart );
-		lineStart->baseLine = c->ascent();
-		lineStart->h = c->height();
-		c->lineStart = 1;
-		firstChar = c;
-		tmpBaseLine = lineStart->baseLine;
-		lastBreak = -1;
-		col = 0;
-		tminw = marg;
-		continue;
-	    }
-	} else if ( lineStart && ( isBreakable( string, i ) || parag->isNewLinesAllowed() && c->c == '\n' ) ) {
-            // Breakable character
-	    if ( len <= 2 || i < len - 1 ) {
-                //qDebug( " Breakable character (i=%d len=%d): combining %d/%d with %d/%d", i, len,
-                //        tmpBaseLine, tmph, c->ascent(), c->height()+ls );
-                // (combine tmpBaseLine/tmph and this character)
-                int belowBaseLine = QMAX( tmph - tmpBaseLine, c->height() - c->ascent() );
-                tmpBaseLine = QMAX( tmpBaseLine, c->ascent() );
-                tmph = tmpBaseLine + belowBaseLine;
-                //qDebug(  " -> tmpBaseLine/tmph : %d/%d", tmpBaseLine, tmph );
-	    }
-	    minw = QMAX( minw, tminw );
-	    tminw = marg + ww;
-            // (combine lineStart and tmpBaseLine/tmph)
-            //qDebug( "Breakable character: combining %d/%d with %d/%d", lineStart->baseLine, h, tmpBaseLine, tmph );
-            int belowBaseLine = QMAX( h - lineStart->baseLine, tmph - tmpBaseLine );
-            lineStart->baseLine = QMAX( lineStart->baseLine, tmpBaseLine );
-	    h = lineStart->baseLine + belowBaseLine;
-            lineStart->h = h;
-            // if h > initialHeight,  call adjust[LR]Margin, and if the result is != initial[LR]Margin,
-            // format this line again
-            if ( doc && h > initialHeight )
-            {
-                int newLMargin = doc->flow()->adjustLMargin( y + parag->rect().y(), h, left, 4 );
-                int newRMargin = doc->flow()->adjustRMargin( y + parag->rect().y(), h, rm, 4 );
-                //qDebug("new height: %d => newLMargin=%d newRMargin=%d", h, newLMargin, newRMargin);
-                if ( newLMargin != initialLMargin || newRMargin != initialRMargin )
-                {
-                    //qDebug("formatting again");
-                    i = firstCharIndex;
-                    x = newLMargin;
-                    w = dw - newRMargin;
-                    initialLMargin = newLMargin;
-                    initialRMargin = newRMargin;
-                    initialHeight = h;
-                    curLeft = x;
-                    lastBreak = -1;
-                    col = 0;
-                    if ( parag->isNewLinesAllowed() && firstChar->c == '\t' ) {
-                        int nx = parag->nextTab( i, x );
-                        if ( nx < x )
-                            ww = w - x;
-                        else
-                            ww = nx - x + 1;
-                    }
-                    //minw ? tminw ?
-                }
-            }
-
-            //qDebug(  " -> lineStart->baseLine/lineStart->h : %d/%d", lineStart->baseLine, lineStart->h );
-	    if ( i < len - 2 || c->c != ' ' )
-		lastBreak = i;
-	} else {
-            // Non-breakable character
-	    tminw += ww;
-            //qDebug( " Non-breakable character: combining %d/%d with %d/%d", tmpBaseLine, tmph, c->ascent(), c->height()+ls );
-            // (combine tmpBaseLine/tmph and this character)
-            int belowBaseLine = QMAX( tmph - tmpBaseLine, c->height() - c->ascent() );
-            tmpBaseLine = QMAX( tmpBaseLine, c->ascent() );
-	    tmph = tmpBaseLine + belowBaseLine;
-            //qDebug(  " -> tmpBaseLine/tmph : %d/%d", tmpBaseLine, tmph );
-	}
-
-	c->x = x;
-        //qDebug("setting c->x to %d",c->x);
-        if ( c->isCustom() )
-        {
-            //qDebug("custom item -> moving to %d,%d",x,y);
-            c->customItem()->move( x, y );
-        }
-	x += ww;
-        //qDebug("added %d -> now x=%d",ww,x);
-    }
-
-    // Finish formatting the last line
-    if ( lineStart ) {
-        //qDebug( "Last Line.... Combining %d/%d with %d/%d", lineStart->baseLine, h, tmpBaseLine, tmph );
-        // (combine lineStart and tmpBaseLine/tmph)
-        int belowBaseLine = QMAX( h - lineStart->baseLine, tmph - tmpBaseLine );
-        lineStart->baseLine = QMAX( lineStart->baseLine, tmpBaseLine );
-        h = lineStart->baseLine + belowBaseLine;
-	lineStart->h = h;
-        //qDebug(  " -> lineStart->baseLine/lineStart->h : %d/%d", lineStart->baseLine, lineStart->h );
-	// last line in a paragraph is not justified
-	if ( align == Qt3::AlignJustify )
-	    align = Qt3::AlignAuto;
-	QTextParagLineStart *lineStart2 = formatLine( parag, string, lineStart, firstChar, c, align, w - x );
-        h += doc ? parag->lineSpacing( line++ ) : 0;
-        lineStart->h = h;
-	delete lineStart2;
-    }
-
-    minw = QMAX( minw, tminw );
-
-    int m = parag->bottomMargin();
-    if ( parag->next() && !doc->addMargins() )
-	m = QMAX( m, parag->next()->topMargin() );
-    parag->setFullWidth( fullWidth );
-    if ( is_printer( parag->painter() ) ) {
-	QPaintDeviceMetrics metrics( parag->painter()->device() );
-	double yscale = scale_factor( metrics.logicalDpiY() );
-	m = (int)( (double)m * yscale );
-    }
-    //qDebug( "Adding h(%d) and bottomMargin(%d) to y(%d) => %d", h, m, y, y+h+m );
-    y += h + m;
-    //if ( doc && doc->addMargins() )
-    //    y -= parag->topMargin(); // Was already in y's initial value
-
-    if ( !isWrapEnabled() )
-	minw = QMAX( minw, c->x + ww ); // #### Lars: Fix this for BiDi, please
-    if ( doc ) {
-	if ( minw < 32000 )
-	    doc->setMinimumWidth( minw, parag );
-    }
-
-    return y;
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextIndent::QTextIndent()
-{
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextFormatCollection::QTextFormatCollection()
-    : cKey( 307 ), sheet( 0 )
-{
-#ifdef DEBUG_COLLECTION
-    qDebug("QTextFormatCollection::QTextFormatCollection %p", this);
-#endif
-    defFormat = new QTextFormat( QApplication::font(),
-				 QApplication::palette().color( QPalette::Active, QColorGroup::Text ) );
-    lastFormat = cres = 0;
-    cflags = -1;
-    cKey.setAutoDelete( TRUE );
-    cachedFormat = 0;
-}
-
-QTextFormatCollection::~QTextFormatCollection()
-{
-#ifdef DEBUG_COLLECTION
-    qDebug("QTextFormatCollection::~QTextFormatCollection %p", this);
-#endif
-    delete defFormat;
-}
-
-QTextFormat *QTextFormatCollection::format( const QTextFormat *f )
-{
-    if ( f->parent() == this || f == defFormat ) {
-#ifdef DEBUG_COLLECTION
-	qDebug( " format(f) need '%s', best case!", f->key().latin1() );
-#endif
-	lastFormat = const_cast<QTextFormat*>(f);
-	lastFormat->addRef();
-	return lastFormat;
-    }
-
-    if ( f == lastFormat || ( lastFormat && f->key() == lastFormat->key() ) ) {
-#ifdef DEBUG_COLLECTION
-	qDebug( " format(f) need '%s', good case!", f->key().latin1() );
-#endif
-	lastFormat->addRef();
-	return lastFormat;
-    }
-
-#if 0 // #### disabled, because if this format is not in the
- // formatcollection, it doesn't get the painter through
- // QTextFormatCollection::setPainter() which breaks printing on
- // windows
-    if ( f->isAnchor() ) {
-	lastFormat = createFormat( *f );
-	lastFormat->collection = 0;
-	return lastFormat;
-    }
-#endif
-
-    QTextFormat *fm = cKey.find( f->key() );
-    if ( fm ) {
-#ifdef DEBUG_COLLECTION
-	qDebug( " format(f) need '%s', normal case!", f->key().latin1() );
-#endif
-	lastFormat = fm;
-	lastFormat->addRef();
-	return lastFormat;
-    }
-
-#ifdef DEBUG_COLLECTION
-    qDebug( " format(f) need '%s', worst case!", f->key().latin1() );
-#endif
-    lastFormat = createFormat( *f );
-    lastFormat->collection = this;
-    cKey.insert( lastFormat->key(), lastFormat );
-    return lastFormat;
-}
-
-QTextFormat *QTextFormatCollection::format( QTextFormat *of, QTextFormat *nf, int flags )
-{
-    if ( cres && kof == of->key() && knf == nf->key() && cflags == flags ) {
-#ifdef DEBUG_COLLECTION
-	qDebug( " format(of,nf,flags) mix of '%s' and '%s, best case!", of->key().latin1(), nf->key().latin1() );
-#endif
-	cres->addRef();
-	return cres;
-    }
-
-#ifdef DEBUG_COLLECTION
-    qDebug(" format(of,nf,%d) calling createFormat(of=%p %s)",flags,of,of->key().latin1());
-#endif
-    cres = createFormat( *of );
-    kof = of->key();
-    knf = nf->key();
-    cflags = flags;
-
-#ifdef DEBUG_COLLECTION
-    qDebug(" format(of,nf,%d) calling copyFormat(nf=%p %s)",flags,nf,nf->key().latin1());
-#endif
-    cres->copyFormat( *nf, flags );
-
-    QTextFormat *fm = cKey.find( cres->key() );
-    if ( !fm ) {
-#ifdef DEBUG_COLLECTION
-	qDebug( " format(of,nf,flags) mix of '%s' and '%s, worst case!", of->key().latin1(), nf->key().latin1() );
-#endif
-	cres->collection = this;
-	cKey.insert( cres->key(), cres );
-    } else {
-#ifdef DEBUG_COLLECTION
-	qDebug( " format(of,nf,flags) mix of '%s' and '%s, good case!", of->key().latin1(), nf->key().latin1() );
-#endif
-	delete cres;
-	cres = fm;
-	cres->addRef();
-    }
-
-    return cres;
-}
-
-QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c )
-{
-    if ( cachedFormat && cfont == f && ccol == c ) {
-#ifdef DEBUG_COLLECTION
-	qDebug( " format of font and col '%s' - best case", cachedFormat->key().latin1() );
-#endif
-	cachedFormat->addRef();
-	return cachedFormat;
-    }
-
-    QString key = QTextFormat::getKey( f, c, FALSE, QString::null, QString::null, QTextFormat::AlignNormal );
-    cachedFormat = cKey.find( key );
-    cfont = f;
-    ccol = c;
-
-    if ( cachedFormat ) {
-#ifdef DEBUG_COLLECTION
-	qDebug( " format of font and col '%s' - good case", cachedFormat->key().latin1() );
-#endif
-	cachedFormat->addRef();
-	return cachedFormat;
-    }
-
-    cachedFormat = createFormat( f, c );
-    cachedFormat->collection = this;
-    cKey.insert( cachedFormat->key(), cachedFormat );
-#ifdef DEBUG_COLLECTION
-    qDebug( " format of font and col '%s' - worst case", cachedFormat->key().latin1() );
-#endif
-    return cachedFormat;
-}
-
-void QTextFormatCollection::remove( QTextFormat *f )
-{
-    if ( lastFormat == f )
-	lastFormat = 0;
-    if ( cres == f )
-	cres = 0;
-    if ( cachedFormat == f )
-	cachedFormat = 0;
-    cKey.remove( f->key() );
-}
-
-void QTextFormatCollection::setPainter( QPainter *p )
-{
-    QDictIterator<QTextFormat> it( cKey );
-    QTextFormat *f;
-    while ( ( f = it.current() ) ) {
-	++it;
-	f->setPainter( p );
-    }
-}
-
-void QTextFormatCollection::debug()
-{
-    qDebug( "------------ QTextFormatCollection: debug --------------- BEGIN" );
-    QDictIterator<QTextFormat> it( cKey );
-    for ( ; it.current(); ++it ) {
-	qDebug( "format '%s' (%p): refcount: %d", it.current()->key().latin1(),
-		it.current(), it.current()->ref );
-    }
-    qDebug( "------------ QTextFormatCollection: debug --------------- END" );
-}
-
-void QTextFormatCollection::updateStyles()
-{
-    QDictIterator<QTextFormat> it( cKey );
-    QTextFormat *f;
-    while ( ( f = it.current() ) ) {
-	++it;
-	f->updateStyle();
-    }
-}
-
-void QTextFormatCollection::updateFontSizes( int base )
-{
-    QDictIterator<QTextFormat> it( cKey );
-    QTextFormat *f;
-    while ( ( f = it.current() ) ) {
-	++it;
-	f->stdPointSize = base;
-	f->fn.setPointSize( f->stdPointSize );
-	styleSheet()->scaleFont( f->fn, f->logicalFontSize );
-	f->update();
-    }
-    f = defFormat;
-    f->stdPointSize = base;
-    f->fn.setPointSize( f->stdPointSize );
-    styleSheet()->scaleFont( f->fn, f->logicalFontSize );
-    f->update();
-}
-
-void QTextFormatCollection::updateFontAttributes( const QFont &f, const QFont &old )
-{
-    QDictIterator<QTextFormat> it( cKey );
-    QTextFormat *fm;
-    while ( ( fm = it.current() ) ) {
-	++it;
-	if ( fm->fn.family() == old.family() &&
-	     fm->fn.weight() == old.weight() &&
-	     fm->fn.italic() == old.italic() &&
-	     fm->fn.underline() == old.underline() ) {
-	    fm->fn.setFamily( f.family() );
-	    fm->fn.setWeight( f.weight() );
-	    fm->fn.setItalic( f.italic() );
-	    fm->fn.setUnderline( f.underline() );
-	    fm->update();
-	}
-    }
-    fm = defFormat;
-    if ( fm->fn.family() == old.family() &&
-	 fm->fn.weight() == old.weight() &&
-	 fm->fn.italic() == old.italic() &&
-	 fm->fn.underline() == old.underline() ) {
-	fm->fn.setFamily( f.family() );
-	fm->fn.setWeight( f.weight() );
-	fm->fn.setItalic( f.italic() );
-	fm->fn.setUnderline( f.underline() );
-	fm->update();
-    }
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-void QTextFormat::copyFormat( const QTextFormat & nf, int flags )
-{
-    if ( flags & QTextFormat::Bold )
-	fn.setBold( nf.fn.bold() );
-    if ( flags & QTextFormat::Italic )
-	fn.setItalic( nf.fn.italic() );
-    if ( flags & QTextFormat::Underline )
-	fn.setUnderline( nf.fn.underline() );
-    if ( flags & QTextFormat::Family )
-	fn.setFamily( nf.fn.family() );
-    if ( flags & QTextFormat::Size )
-	fn.setPointSize( nf.fn.pointSize() );
-    if ( flags & QTextFormat::Color )
-	col = nf.col;
-    if ( flags & QTextFormat::Misspelled )
-	missp = nf.missp;
-    if ( flags & QTextFormat::VAlign )
-	ha = nf.ha;
-    update();
-}
-
-void QTextFormat::setBold( bool b )
-{
-    if ( b == fn.bold() )
-	return;
-    fn.setBold( b );
-    update();
-}
-
-void QTextFormat::setMisspelled( bool b )
-{
-    if ( b == (bool)missp )
-	return;
-    missp = b;
-    update();
-}
-
-void QTextFormat::setVAlign( VerticalAlignment a )
-{
-    if ( a == ha )
-	return;
-    ha = a;
-    update();
-}
-
-void QTextFormat::setItalic( bool b )
-{
-    if ( b == fn.italic() )
-	return;
-    fn.setItalic( b );
-    update();
-}
-
-void QTextFormat::setUnderline( bool b )
-{
-    if ( b == fn.underline() )
-	return;
-    fn.setUnderline( b );
-    update();
-}
-
-void QTextFormat::setFamily( const QString &f )
-{
-    if ( f == fn.family() )
-	return;
-    fn.setFamily( f );
-
-//ANY_CHARSET_BEGIN
-  if ( m_charsetMap && m_charsetMap->contains(f) ) {
-		fn.setCharSet((*m_charsetMap)[f]);
-  }
-//ANY_CHARSET_END
-    update();
-}
-
-void QTextFormat::setPointSize( int s )
-{
-    if ( s == fn.pointSize() )
-	return;
-    fn.setPointSize( s );
-    update();
-}
-
-void QTextFormat::setFont( const QFont &f )
-{
-    if ( f == fn && !k.isEmpty() )
-	return;
-    fn = f;
-//ANY_CHARSET_BEGIN
-    if (m_charsetMap && m_charsetMap->contains(fn.family()))
-    	fn.setCharSet((*m_charsetMap)[fn.family()]);
-//ANY_CHARSET_END
-    update();
-}
-
-void QTextFormat::setColor( const QColor &c )
-{
-    if ( c == col )
-	return;
-    col = c;
-    update();
-}
-
-void QTextFormat::setPainter( QPainter *p )
-{
-    painter = p;
-    update();
-}
-
-static int makeLogicFontSize( int s )
-{
-    int defSize = QApplication::font().pointSize();
-    if ( s < defSize - 4 )
-	return 1;
-    if ( s < defSize )
-	return 2;
-    if ( s < defSize + 4 )
-	return 3;
-    if ( s < defSize + 8 )
-	return 4;
-    if ( s < defSize + 12 )
-	return 5;
-    if (s < defSize + 16 )
-	return 6;
-    return 7;
-}
-
-static QTextFormat *defaultFormat = 0;
-
-QString QTextFormat::makeFormatChangeTags( QTextFormat *f ) const
-{
-    if ( !defaultFormat )
-	defaultFormat = new QTextFormat( QApplication::font(),
-					     QApplication::palette().color( QPalette::Active, QColorGroup::Text ) );
-
-    QString tag;
-
-    if ( f ) {
-	if ( f->font() != defaultFormat->font() ||
-	     f->color().rgb() != defaultFormat->color().rgb() )
-	    tag += "</font>";
-	if ( f->font() != defaultFormat->font() ) {
-	    if ( f->font().underline() && f->font().underline() != defaultFormat->font().underline() )
-		tag += "</u>";
-	    if ( f->font().italic() && f->font().italic() != defaultFormat->font().italic() )
-		tag += "</i>";
-	    if ( f->font().bold() && f->font().bold() != defaultFormat->font().bold() )
-		tag += "</b>";
-	}
-	if ( f->isAnchor() && !f->anchorHref().isEmpty() )
-	    tag += "</a>";
-    }
-
-    if ( isAnchor() ) {
-	if ( !anchor_href.isEmpty() )
-	    tag += "<a href=\"" + anchor_href + "\">";
-	else
-	    tag += "<a name=\"" + anchor_name + "\"></a>";
-    }
-
-    if ( font() != defaultFormat->font() ) {
-	if ( font().bold() && font().bold() != defaultFormat->font().bold() )
-	    tag += "<b>";
-	if ( font().italic() && font().italic() != defaultFormat->font().italic() )
-	    tag += "<i>";
-	if ( font().underline() && font().underline() != defaultFormat->font().underline() )
-	    tag += "<u>";
-    }
-    if ( font() != defaultFormat->font() ||
-	 color().rgb() != defaultFormat->color().rgb() ) {
-	tag += "<font ";
-	if ( font().family() != defaultFormat->font().family() )
-	    tag +="face=\"" + fn.family() + "\" ";
-	if ( font().pointSize() != defaultFormat->font().pointSize() )
-	    tag +="size=\"" + QString::number( makeLogicFontSize( fn.pointSize() ) ) + "\" ";
-	if ( color().rgb() != defaultFormat->color().rgb() )
-	    tag +="color=\"" + col.name() + "\" ";
-	tag += ">";
-    }
-
-    return tag;
-}
-
-QString QTextFormat::makeFormatEndTags() const
-{
-    if ( !defaultFormat )
-	defaultFormat = new QTextFormat( QApplication::font(),
-					     QApplication::palette().color( QPalette::Active, QColorGroup::Text ) );
-
-    QString tag;
-    if ( font() != defaultFormat->font() ||
-	 color().rgb() != defaultFormat->color().rgb() )
-	tag += "</font>";
-    if ( font() != defaultFormat->font() ) {
-	if ( font().underline() && font().underline() != defaultFormat->font().underline() )
-	    tag += "</u>";
-	if ( font().italic() && font().italic() != defaultFormat->font().italic() )
-	    tag += "</i>";
-	if ( font().bold() && font().bold() != defaultFormat->font().bold() )
-	    tag += "</b>";
-    }
-    if ( isAnchor() && anchorHref().isEmpty() )
-	tag += "</a>";
-    return tag;
-}
-
-QTextFormat QTextFormat::makeTextFormat( const QStyleSheetItem *style, const QMap<QString,QString>& attr ) const
-{
-    QTextFormat format(*this);
-    bool changed = FALSE;
-    if ( style ) {
-	format.style = style->name();
-	if ( style->name() == "font") {
-	    if ( attr.contains("color") ) {
-		QString s = attr["color"];
-		if ( !s.isEmpty() ) {
-		    format.col.setNamedColor( s );
-		    format.linkColor = FALSE;
-		}
-	    }
-	    if ( attr.contains("size") ) {
-		QString a = attr["size"];
-		int n = a.toInt();
-		if ( a[0] == '+' || a[0] == '-' )
-		    n += format.logicalFontSize;
-		format.logicalFontSize = n;
-		format.fn.setPointSize( format.stdPointSize );
-		style->styleSheet()->scaleFont( format.fn, format.logicalFontSize );
-	    }
-	    if ( attr.contains("face") ) {
-		QString a = attr["face"];
-		if ( a.contains(',') )
-		    a = a.left( a.find(',') );
-		format.fn.setFamily( a );
-//ANY_CHARSET_BEGIN		
-		if (m_charsetMap && m_charsetMap->contains(format.fn.family())) {
-			format.fn.setCharSet((*m_charsetMap)[format.fn.family()]);
-		}
-//ANY_CHARSET_END
-	    }
-	} else {
-
-	    if ( style->isAnchor() ) {
-		format.anchor_href = attr["href"];
-		format.anchor_name = attr["name"];
-		changed = TRUE;
-	    }
-
-	    if ( style->fontWeight() != QStyleSheetItem::Undefined )
-		format.fn.setWeight( style->fontWeight() );
-	    if ( style->fontSize() != QStyleSheetItem::Undefined )
-		format.fn.setPointSize( style->fontSize() );
-	    else if ( style->logicalFontSize() != QStyleSheetItem::Undefined ) {
-		format.logicalFontSize = style->logicalFontSize();
-		format.fn.setPointSize( format.stdPointSize );
-		style->styleSheet()->scaleFont( format.fn, format.logicalFontSize );
-	    }
-	    else if ( style->logicalFontSizeStep() ) {
-		format.logicalFontSize += style->logicalFontSizeStep();
-		format.fn.setPointSize( format.stdPointSize );
-		style->styleSheet()->scaleFont( format.fn, format.logicalFontSize );
-	    }
-	    if ( !style->fontFamily().isEmpty() )
-		format.fn.setFamily( style->fontFamily() );
-//ANY_CHARSET_BEGIN
-	    if ( !style->fontFamily().isEmpty() )
-		if (m_charsetMap && m_charsetMap->contains(style->fontFamily()))
-			format.fn.setCharSet( (*m_charsetMap)[style->fontFamily()] );
-//ANY_CHARSET_END
-	    if ( style->color().isValid() )
-		format.col = style->color();
-	    if ( style->definesFontItalic() )
-		format.fn.setItalic( style->fontItalic() );
-	    if ( style->definesFontUnderline() )
-		format.fn.setUnderline( style->fontUnderline() );
-	}
-    }
-
-    if ( fn != format.fn || changed || col != format.col ) // slight performance improvement
-	format.generateKey();
-    format.update();
-    return format;
-}
-
-QTextCustomItem::QTextCustomItem( QTextDocument *p )
-      :  width(-1), height(0), parent(p), xpos(0), ypos(-1), parag(0)
-{
-}
-
-QTextCustomItem::~QTextCustomItem()
-{
-}
-
-struct QPixmapInt
-{
-    QPixmapInt() : ref( 0 ) {}
-    QPixmap pm;
-    int	    ref;
-};
-
-static QMap<QString, QPixmapInt> *pixmap_map = 0;
-
-QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, const QString& context,
-			QMimeSourceFactory &factory )
-    : QTextCustomItem( p )
-{
-#if defined(PARSER_DEBUG)
-    qDebug( debug_indent + "new QTextImage (pappi: %p)", p );
-#endif
-
-    width = height = 0;
-    if ( attr.contains("width") )
-	width = attr["width"].toInt();
-    if ( attr.contains("height") )
-	height = attr["height"].toInt();
-
-    reg = 0;
-    QString imageName = attr["src"];
-
-    if (!imageName)
-	imageName = attr["source"];
-
-#if defined(PARSER_DEBUG)
-    qDebug( debug_indent + "    .." + imageName );
-#endif
-
-    if ( !imageName.isEmpty() ) {
-	imgId = QString( "%1,%2,%3,%4" ).arg( imageName ).arg( width ).arg( height ).arg( (ulong)&factory );
-	if ( !pixmap_map )
-	    pixmap_map = new QMap<QString, QPixmapInt>;
-	if ( pixmap_map->contains( imgId ) ) {
-	    QPixmapInt& pmi = pixmap_map->operator[](imgId);
-	    pm = pmi.pm;
-	    pmi.ref++;
-	    width = pm.width();
-	    height = pm.height();
-	} else {
-	    QImage img;
-	    const QMimeSource* m =
-		factory.data( imageName, context );
-	    if ( !m ) {
-//		qWarning("QTextImage: no mimesource for %s", imageName.latin1() );
-	    }
-	    else {
-		if ( !QImageDrag::decode( m, img ) ) {
-//		    qWarning("QTextImage: cannot decode %s", imageName.latin1() );
-		}
-	    }
-
-	    if ( !img.isNull() ) {
-		if ( width == 0 ) {
-		    width = img.width();
-		    if ( height != 0 ) {
-			width = img.width() * height / img.height();
-		    }
-		}
-		if ( height == 0 ) {
-		    height = img.height();
-		    if ( width != img.width() ) {
-			height = img.height() * width / img.width();
-		    }
-		}
-
-		if ( img.width() != width || img.height() != height ){
-		    img = img.smoothScale(width, height);
-		    width = img.width();
-		    height = img.height();
-		}
-		pm.convertFromImage( img );
-	    }
-	    if ( !pm.isNull() ) {
-		QPixmapInt& pmi = pixmap_map->operator[](imgId);
-		pmi.pm = pm;
-		pmi.ref++;
-	    }
-	}
-	if ( pm.mask() ) {
-	    QRegion mask( *pm.mask() );
-	    QRegion all( 0, 0, pm.width(), pm.height() );
-	    reg = new QRegion( all.subtract( mask ) );
-	}
-    }
-
-    if ( pm.isNull() && (width*height)==0 )
-	width = height = 50;
-
-    place = PlaceInline;
-    if ( attr["align"] == "left" )
-	place = PlaceLeft;
-    else if ( attr["align"] == "right" )
-	place = PlaceRight;
-
-    tmpwidth = width;
-    tmpheight = height;
-
-    attributes = attr;
-}
-
-QTextImage::~QTextImage()
-{
-    if ( pixmap_map && pixmap_map->contains( imgId ) ) {
-	QPixmapInt& pmi = pixmap_map->operator[](imgId);
-	pmi.ref--;
-	if ( !pmi.ref ) {
-	    pixmap_map->remove( imgId );
-	    if ( pixmap_map->isEmpty() ) {
-		delete pixmap_map;
-		pixmap_map = 0;
-	    }
-	}
-    }
-}
-
-QString QTextImage::richText() const
-{
-    QString s;
-    s += "<img ";
-    QMap<QString, QString>::ConstIterator it = attributes.begin();
-    for ( ; it != attributes.end(); ++it )
-	s += it.key() + "=" + *it + " ";
-    s += ">";
-    return s;
-}
-
-void QTextImage::adjustToPainter( QPainter* p )
-{
-    width = tmpwidth;
-    height = tmpheight;
-    if ( !is_printer( p ) )
-	return;
-    QPaintDeviceMetrics metrics(p->device());
-    width = int( width * scale_factor( metrics.logicalDpiX() ) );
-    height = int( height * scale_factor( metrics.logicalDpiY() ) );
-}
-
-#if !defined(Q_WS_X11)
-#include <qbitmap.h>
-#include <qcleanuphandler.h>
-static QPixmap *qrt_selection = 0;
-static QCleanupHandler<QPixmap> qrt_cleanup_pixmap;
-static void qrt_createSelectionPixmap( const QColorGroup &cg )
-{
-    qrt_selection = new QPixmap( 2, 2 );
-    qrt_cleanup_pixmap.add( qrt_selection );
-    qrt_selection->fill( Qt::color0 );
-    QBitmap m( 2, 2 );
-    m.fill( Qt::color1 );
-    QPainter p( &m );
-    p.setPen( Qt::color0 );
-    for ( int j = 0; j < 2; ++j ) {
-	p.drawPoint( j % 2, j );
-    }
-    p.end();
-    qrt_selection->setMask( m );
-    qrt_selection->fill( cg.highlight() );
-}
-#endif
-
-void QTextImage::draw( QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected )
-{
-    if ( placement() != PlaceInline ) {
-	x = xpos;
-	y = ypos;
-    }
-
-    if ( pm.isNull() ) {
-	p->fillRect( x , y, width, height,  cg.dark() );
-	return;
-    }
-
-    if ( is_printer( p ) ) {
-#ifndef QT_NO_TRANSFORMATIONS
-	p->saveWorldMatrix();
-	QPaintDeviceMetrics metrics( p->device() );
-	p->translate( x, y );
-	p->scale( scale_factor( metrics.logicalDpiY() ),
-		  scale_factor( metrics.logicalDpiY() ) );
-	p->drawPixmap( 0, 0, pm );
-	p->restoreWorldMatrix();
-#else
-	p->drawPixmap( x, y, pm );
-#endif
-	return;
-    }
-
-    if ( placement() != PlaceInline && !QRect( xpos, ypos, width, height ).intersects( QRect( cx, cy, cw, ch ) ) )
-	return;
-
-    if ( placement() == PlaceInline )
-	p->drawPixmap( x , y, pm );
-    else
-	p->drawPixmap( cx , cy, pm, cx - x, cy - y, cw, ch );
-
-    if ( selected && placement() == PlaceInline && p->device()->devType() != QInternal::Printer ) {
-	p->save();
-#if defined(Q_WS_X11)
-	p->fillRect( QRect( QPoint( x, y ), pm.size() ), QBrush( cg.highlight(), QBrush::Dense4Pattern) );
-#else // in WIN32 Dense4Pattern doesn't work correctly (transparency problem), so work around it
-	if ( !qrt_selection )
-	    qrt_createSelectionPixmap( cg );
-	p->drawTiledPixmap( x, y, pm.width(), pm.height(), *qrt_selection );
-#endif
-    }
-}
-
-void QTextHorizontalLine::adjustToPainter( QPainter* p )
-{
-    if ( !is_printer( p ) )
-	return;
-    QPaintDeviceMetrics metrics(p->device());
-    height = int( tmpheight * scale_factor( metrics.logicalDpiY() ) );
-}
-
-
-QTextHorizontalLine::QTextHorizontalLine( QTextDocument *p )
-    : QTextCustomItem( p )
-{
-    height = tmpheight = 8;
-}
-
-QTextHorizontalLine::~QTextHorizontalLine()
-{
-}
-
-QString QTextHorizontalLine::richText() const
-{
-    return "<hr>";
-}
-
-void QTextHorizontalLine::draw( QPainter* p, int x, int y, int , int , int , int , const QColorGroup& cg, bool selected )
-{
-    QRect r( x, y, width, height);
-    if ( is_printer( p ) || ( p && p->device() && p->device()->devType() == QInternal::Printer ) ) {
-	QPen oldPen = p->pen();
-	p->setPen( QPen( cg.text(), height/8 ) );
-	p->drawLine( r.left()-1, y + height / 2, r.right() + 1, y + height / 2 );
-	p->setPen( oldPen );
-    } else {
-	if ( selected )
-	    p->fillRect( r.left(), y, r.right(), y + height, cg.highlight() );
-	qDrawShadeLine( p, r.left() - 1, y + height / 2, r.right() + 1, y + height / 2, cg, TRUE, height / 8 );
-    }
-}
-
-
-/*****************************************************************/
-// Small set of utility functions to make the parser a bit simpler
-//
-
-bool QTextDocument::hasPrefix(const QString& doc, int pos, QChar c)
-{
-    if ( pos >= (int)doc.length() )
-	return FALSE;
-    return ( doc.unicode() )[ pos ].lower() == c.lower();
-}
-
-bool QTextDocument::hasPrefix( const QString& doc, int pos, const QString& s )
-{
-    if ( pos + s.length() >= doc.length() )
-	return FALSE;
-    for ( int i = 0; i < (int)s.length(); i++ ) {
-	if ( ( doc.unicode() )[ pos + i ].lower() != s[ i ].lower() )
-	    return FALSE;
-    }
-    return TRUE;
-}
-
-static bool qt_is_cell_in_use( QPtrList<QTextTableCell>& cells, int row, int col )
-{
-    for ( QTextTableCell* c = cells.first(); c; c = cells.next() ) {
-	if ( row >= c->row() && row < c->row() + c->rowspan()
-	     && col >= c->column() && col < c->column() + c->colspan() )
-	    return TRUE;
-    }
-    return FALSE;
-}
-
-QTextCustomItem* QTextDocument::parseTable( const QMap<QString, QString> &attr, const QTextFormat &fmt,
-					    const QString &doc, int& pos, QTextParag *curpar )
-{
-
-    QTextTable* table = new QTextTable( this, attr );
-    int row = -1;
-    int col = -1;
-
-    QString rowbgcolor;
-    QString rowalign;
-    QString tablebgcolor = attr["bgcolor"];
-
-    QPtrList<QTextTableCell> multicells;
-
-    QString tagname;
-    (void) eatSpace(doc, pos);
-    while ( pos < int(doc.length() )) {
-	int beforePos = pos;
-	if (hasPrefix(doc, pos, QChar('<')) ){
-	    if (hasPrefix(doc, pos+1, QChar('/'))) {
-		tagname = parseCloseTag( doc, pos );
-		if ( tagname == "table" ) {
-		    pos = beforePos;
-#if defined(PARSER_DEBUG)
-		    debug_indent.remove( debug_indent.length() - 3, 2 );
-#endif
-		    return table;
-		}
-	    } else {
-		QMap<QString, QString> attr2;
-		bool emptyTag = FALSE;
-		tagname = parseOpenTag( doc, pos, attr2, emptyTag );
-		if ( tagname == "tr" ) {
-		    rowbgcolor = attr2["bgcolor"];
-		    rowalign = attr2["align"];
-		    row++;
-		    col = -1;
-		}
-		else if ( tagname == "td" || tagname == "th" ) {
-		    col++;
-		    while ( qt_is_cell_in_use( multicells, row, col ) ) {
-			col++;
-		    }
-
-		    if ( row >= 0 && col >= 0 ) {
-			const QStyleSheetItem* s = sheet_->item(tagname);
-			if ( !attr2.contains("bgcolor") ) {
-			    if (!rowbgcolor.isEmpty() )
-				attr2["bgcolor"] = rowbgcolor;
-			    else if (!tablebgcolor.isEmpty() )
-				attr2["bgcolor"] = tablebgcolor;
-			}
-			if ( !attr2.contains("align") ) {
-			    if (!rowalign.isEmpty() )
-				attr2["align"] = rowalign;
-			}
-
-			// extract the cell contents
-			int end = pos;
-			while ( end < (int) doc.length()
-				&& !hasPrefix( doc, end, "</td")
-				&& !hasPrefix( doc, end, "<td")
-				&& !hasPrefix( doc, end, "</th")
-				&& !hasPrefix( doc, end, "<th")
-				&& !hasPrefix( doc, end, "<td")
-				&& !hasPrefix( doc, end, "</tr")
-				&& !hasPrefix( doc, end, "<tr")
-				&& !hasPrefix( doc, end, "</table") ) {
-			    if ( hasPrefix( doc, end, "<table" ) ) { // nested table
-				int nested = 1;
-				++end;
-				while ( end < (int)doc.length() && nested != 0 ) {
-				    if ( hasPrefix( doc, end, "</table" ) )
-					nested--;
-				    if ( hasPrefix( doc, end, "<table" ) )
-					nested++;
-				    end++;
-				}
-			    }
-			    end++;
-			}
-			QTextTableCell* cell  = new QTextTableCell( table, row, col,
-								    attr2, s, fmt.makeTextFormat( s, attr2 ),
-								    contxt, *factory_, sheet_, doc.mid( pos, end - pos ) );
-			cell->richText()->parParag = curpar;
-			if ( cell->colspan() > 1 || cell->rowspan() > 1 )
-			    multicells.append( cell );
-			col += cell->colspan()-1;
-			pos = end;
-		    }
-		}
-	    }
-
-	} else {
-	    ++pos;
-	}
-    }
-#if defined(PARSER_DEBUG)
-    debug_indent.remove( debug_indent.length() - 3, 2 );
-#endif
-    return table;
-}
-
-bool QTextDocument::eatSpace(const QString& doc, int& pos, bool includeNbsp )
-{
-    int old_pos = pos;
-    while (pos < int(doc.length()) && (doc.unicode())[pos].isSpace() && ( includeNbsp || (doc.unicode())[pos] != QChar::nbsp ) )
-	pos++;
-    return old_pos < pos;
-}
-
-bool QTextDocument::eat(const QString& doc, int& pos, QChar c)
-{
-    bool ok = pos < int(doc.length()) && ((doc.unicode())[pos] == c);
-    if ( ok )
-	pos++;
-    return ok;
-}
-/*****************************************************************/
-
-
-
-static QMap<QCString, QChar> *html_map = 0;
-static void qt_cleanup_html_map()
-{
-    delete html_map;
-    html_map = 0;
-}
-
-static QMap<QCString, QChar> *htmlMap()
-{
-    if ( !html_map ) {
-	html_map = new QMap<QCString, QChar>;
-	qAddPostRoutine( qt_cleanup_html_map );
-	html_map->insert( "lt", '<');
-	html_map->insert( "gt", '>');
-	html_map->insert( "amp", '&');
-	html_map->insert( "nbsp", 0x00a0U);
-	html_map->insert( "bull", 0x2022U);
-	html_map->insert( "aring", '\xe5');
-	html_map->insert( "oslash", '\xf8');
-	html_map->insert( "ouml", '\xf6');
-	html_map->insert( "auml", '\xe4');
-	html_map->insert( "uuml", '\xfc');
-	html_map->insert( "Ouml", '\xd6');
-	html_map->insert( "Auml", '\xc4');
-	html_map->insert( "Uuml", '\xdc');
-	html_map->insert( "szlig", '\xdf');
-	html_map->insert( "copy", '\xa9');
-	html_map->insert( "deg", '\xb0');
-	html_map->insert( "micro", '\xb5');
-	html_map->insert( "plusmn", '\xb1');
-	html_map->insert( "middot", '*');
-	html_map->insert( "quot", '\"');
-	html_map->insert( "commat", '@');
-	html_map->insert( "num", '#');
-	html_map->insert( "dollar", '$');
-	html_map->insert( "ldquo", '`');
-	html_map->insert( "rdquo", '\'');
-	html_map->insert( "sol", '/' );
-	html_map->insert( "bsol", '\\');
-	html_map->insert( "lowbar", '_');
-	html_map->insert( "shy", '\xad');
-    }
-    return html_map;
-}
-
-QChar QTextDocument::parseHTMLSpecialChar(const QString& doc, int& pos)
-{
-    QCString s;
-    pos++;
-    int recoverpos = pos;
-    while ( pos < int(doc.length()) && (doc.unicode())[pos] != ';' && !(doc.unicode())[pos].isSpace() && pos < recoverpos + 6) {
-	s += (doc.unicode())[pos];
-	pos++;
-    }
-    if ((doc.unicode())[pos] != ';' && !(doc.unicode())[pos].isSpace() ) {
-	pos = recoverpos;
-	return '&';
-    }
-    pos++;
-
-    if ( s.length() > 1 && s[0] == '#') {
-	int num = s.mid(1).toInt();
-	if ( num == 151 ) // ### hack for designer manual
-	    return '-';
-	return num;
-    }
-
-    QMap<QCString, QChar>::Iterator it = htmlMap()->find(s);
-    if ( it != htmlMap()->end() ) {
-	return *it;
-    }
-
-    pos = recoverpos;
-    return '&';
-}
-
-QString QTextDocument::parseWord(const QString& doc, int& pos, bool lower)
-{
-    QString s;
-
-    if ((doc.unicode())[pos] == '"') {
-	pos++;
-	while ( pos < int(doc.length()) && (doc.unicode())[pos] != '"' ) {
-	    s += (doc.unicode())[pos];
-	    pos++;
-	}
-	eat(doc, pos, '"');
-    } else {
-	static QString term = QString::fromLatin1("/>");
-	while( pos < int(doc.length()) &&
-	       ((doc.unicode())[pos] != '>' && !hasPrefix( doc, pos, term))
-	       && (doc.unicode())[pos] != '<'
-	       && (doc.unicode())[pos] != '='
-	       && !(doc.unicode())[pos].isSpace())
-	{
-	    if ( (doc.unicode())[pos] == '&')
-		s += parseHTMLSpecialChar( doc, pos );
-	    else {
-		s += (doc.unicode())[pos];
-		pos++;
-	    }
-	}
-	if (lower)
-	    s = s.lower();
-    }
-    return s;
-}
-
-QChar QTextDocument::parseChar(const QString& doc, int& pos, QStyleSheetItem::WhiteSpaceMode wsm )
-{
-    if ( pos >=  int(doc.length() ) )
-	return QChar::null;
-
-    QChar c = (doc.unicode())[pos++];
-
-    if (c == '<' )
-	return QChar::null;
-
-    if ( c.isSpace() && c != QChar::nbsp ) {
-	if ( wsm == QStyleSheetItem::WhiteSpacePre ) {
-	    if ( c == ' ' )
-		return QChar::nbsp;
-	    else
-		return c;
-	} else { // non-pre mode: collapse whitespace except nbsp
-	    while ( pos< int(doc.length() ) &&
-		    (doc.unicode())[pos].isSpace()  && (doc.unicode())[pos] != QChar::nbsp )
-		pos++;
-	    if ( wsm == QStyleSheetItem::WhiteSpaceNoWrap )
-		return QChar::nbsp;
-	    else
-		return ' ';
-	}
-    }
-    else if ( c == '&' )
-	return parseHTMLSpecialChar( doc, --pos );
-    else
-	return c;
-}
-
-QString QTextDocument::parseOpenTag(const QString& doc, int& pos,
-				  QMap<QString, QString> &attr, bool& emptyTag)
-{
-    emptyTag = FALSE;
-    pos++;
-    if ( hasPrefix(doc, pos, '!') ) {
-	if ( hasPrefix( doc, pos+1, "--")) {
-	    pos += 3;
-	    // eat comments
-	    QString pref = QString::fromLatin1("-->");
-	    while ( !hasPrefix(doc, pos, pref ) && pos < int(doc.length()) )
-		pos++;
-	    if ( hasPrefix(doc, pos, pref ) ) {
-		pos += 3;
-		eatSpace(doc, pos, TRUE);
-	    }
-	    emptyTag = TRUE;
-	    return QString::null;
-	}
-	else {
-	    // eat strange internal tags
-	    while ( !hasPrefix(doc, pos, '>') && pos < int(doc.length()) )
-		pos++;
-	    if ( hasPrefix(doc, pos, '>') ) {
-		pos++;
-		eatSpace(doc, pos, TRUE);
-	    }
-	    return QString::null;
-	}
-    }
-
-    QString tag = parseWord(doc, pos );
-    eatSpace(doc, pos, TRUE);
-    static QString term = QString::fromLatin1("/>");
-    static QString s_TRUE = QString::fromLatin1("TRUE");
-
-    while ((doc.unicode())[pos] != '>' && ! (emptyTag = hasPrefix(doc, pos, term) )) {
-	QString key = parseWord(doc, pos );
-	eatSpace(doc, pos, TRUE);
-	if ( key.isEmpty()) {
-	    // error recovery
-	    while ( pos < int(doc.length()) && (doc.unicode())[pos] != '>' )
-		pos++;
-	    break;
-	}
-	QString value;
-	if (hasPrefix(doc, pos, '=') ){
-	    pos++;
-	    eatSpace(doc, pos);
-	    value = parseWord(doc, pos, FALSE);
-	}
-	else
-	    value = s_TRUE;
-	attr.insert(key, value );
-	eatSpace(doc, pos, TRUE);
-    }
-
-    if (emptyTag) {
-	eat(doc, pos, '/');
-	eat(doc, pos, '>');
-    }
-    else
-	eat(doc, pos, '>');
-
-    return tag;
-}
-
-QString QTextDocument::parseCloseTag( const QString& doc, int& pos )
-{
-    pos++;
-    pos++;
-    QString tag = parseWord(doc, pos );
-    eatSpace(doc, pos, TRUE);
-    eat(doc, pos, '>');
-    return tag;
-}
-
-QTextFlow::QTextFlow()
-{
-    width = height = pagesize = 0;
-    leftItems.setAutoDelete( FALSE );
-    rightItems.setAutoDelete( FALSE );
-}
-
-QTextFlow::~QTextFlow()
-{
-}
-
-void QTextFlow::clear()
-{
-    leftItems.clear();
-    rightItems.clear();
-}
-
-void QTextFlow::setWidth( int w )
-{
-    height = 0;
-    width = w;
-}
-
-int QTextFlow::adjustLMargin( int yp, int, int margin, int space )
-{
-    for ( QTextCustomItem* item = leftItems.first(); item; item = leftItems.next() ) {
-	if ( item->y() == -1 )
-	    continue;
-	if ( yp >= item->y() && yp < item->y() + item->height )
-	    margin = QMAX( margin, item->x() + item->width + space );
-    }
-    return margin;
-}
-
-int QTextFlow::adjustRMargin( int yp, int, int margin, int space )
-{
-    for ( QTextCustomItem* item = rightItems.first(); item; item = rightItems.next() ) {
-	if ( item->y() == -1 )
-	    continue;
-	if ( yp >= item->y() && yp < item->y() + item->height )
-	    margin = QMAX( margin, width - item->x() - space );
-    }
-    return margin;
-}
-
-void QTextFlow::adjustFlow( int &yp, int , int h, QTextParag *, bool pages )
-{
-    if ( pages && pagesize > 0 ) { // check pages
-	int ty = yp;
-	int yinpage = ty % pagesize;
-	if ( yinpage < 2 )
-	    yp += 2 - yinpage;
-	else
-	    if ( yinpage + h > pagesize - 2 )
-	    yp += ( pagesize - yinpage ) + 2;
-    }
-
-    if ( yp + h > height )
-    {
-	height = yp + h;
-	//qDebug("QTextFlow::adjustFlow now height=%d",height);
-    }
-}
-
-void QTextFlow::unregisterFloatingItem( QTextCustomItem* item )
-{
-    leftItems.removeRef( item );
-    rightItems.removeRef( item );
-}
-
-void QTextFlow::registerFloatingItem( QTextCustomItem* item, bool right )
-{
-    if ( right ) {
-	if ( !rightItems.contains( item ) )
-	    rightItems.append( item );
-    } else if ( !leftItems.contains( item ) ) {
-	leftItems.append( item );
-    }
-}
-
-void QTextFlow::drawFloatingItems( QPainter* p, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected )
-{
-    QTextCustomItem *item;
-    for ( item = leftItems.first(); item; item = leftItems.next() ) {
-	if ( item->x() == -1 || item->y() == -1 )
-	    continue;
-	item->draw( p, item->x(), item->y(), cx, cy, cw, ch, cg, selected );
-    }
-
-    for ( item = rightItems.first(); item; item = rightItems.next() ) {
-	if ( item->x() == -1 || item->y() == -1 )
-	    continue;
-	item->draw( p, item->x(), item->y(), cx, cy, cw, ch, cg, selected );
-    }
-}
-
-void QTextFlow::updateHeight( QTextCustomItem *i )
-{
-    height = QMAX( height, i->y() + i->height );
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-QTextTable::QTextTable( QTextDocument *p, const QMap<QString, QString> & attr  )
-    : QTextCustomItem( p ), painter( 0 )
-{
-    cells.setAutoDelete( FALSE );
-#if defined(PARSER_DEBUG)
-    debug_indent += "\t";
-    qDebug( debug_indent + "new QTextTable (%p)", this );
-    debug_indent += "\t";
-#endif
-    cellspacing = 2;
-    if ( attr.contains("cellspacing") )
-	cellspacing = attr["cellspacing"].toInt();
-    cellpadding = 1;
-    if ( attr.contains("cellpadding") )
-	cellpadding = attr["cellpadding"].toInt();
-    border = 0;
-    innerborder = us_ib = 1;
-    if ( attr.contains("border" ) ) {
-	QString s( attr["border"] );
-	if ( s == "TRUE" )
-	    border = 1;
-	else
-	    border = attr["border"].toInt();
-    }
-    us_b = border;
-
-    if ( border )
-	cellspacing += 2;
-    us_cs = cellspacing;
-    outerborder = cellspacing + border;
-    us_ob = outerborder;
-    layout = new QGridLayout( 1, 1, cellspacing );
-
-    fixwidth = 0;
-    stretch = 0;
-    if ( attr.contains("width") ) {
-	bool b;
-	QString s( attr["width"] );
-	int w = s.toInt( &b );
-	if ( b ) {
-	    fixwidth = w;
-	} else {
-	    s = s.stripWhiteSpace();
-	    if ( s.length() > 1 && s[ (int)s.length()-1 ] == '%' )
-		stretch = s.left( s.length()-1).toInt();
-	}
-    }
-
-    place = PlaceInline;
-    if ( attr["align"] == "left" )
-	place = PlaceLeft;
-    else if ( attr["align"] == "right" )
-	place = PlaceRight;
-    cachewidth = 0;
-    attributes = attr;
-}
-
-QTextTable::~QTextTable()
-{
-    delete layout;
-}
-
-QString QTextTable::richText() const
-{
-    QString s;
-    s = "<table ";
-    QMap<QString, QString>::ConstIterator it = attributes.begin();
-    for ( ; it != attributes.end(); ++it )
-	s += it.key() + "=" + *it + " ";
-    s += ">\n";
-
-    int lastRow = -1;
-    bool needEnd = FALSE;
-    QPtrListIterator<QTextTableCell> it2( cells );
-    while ( it2.current() ) {
-	QTextTableCell *cell = it2.current();
-	++it2;
-	if ( lastRow != cell->row() ) {
-	    if ( lastRow != -1 )
-		s += "</tr>\n";
-	    s += "<tr>";
-	    lastRow = cell->row();
-	    needEnd = TRUE;
-	}
-	s += "<td ";
-	it = cell->attributes.begin();
-	for ( ; it != cell->attributes.end(); ++it )
-	    s += it.key() + "=" + *it + " ";
-	s += ">";
-	s += cell->richText()->richText();
-	s += "</td>";
-    }
-    if ( needEnd )
-	s += "</tr>\n";
-    s += "</table>\n";
-    return s;
-}
-
-void QTextTable::adjustToPainter( QPainter* p)
-{
-    painter = p;
-    if ( is_printer( p ) ) {
-	QPaintDeviceMetrics metrics(p->device());
-	double xscale = QMAX( scale_factor( metrics.logicalDpiX() ),
-			      scale_factor( metrics.logicalDpiY() ) );
-	xscale = QMAX( xscale, 1 );
-	cellspacing = int(us_cs * xscale);
-	border = int(us_b * xscale);
-	innerborder = int(us_ib * xscale);
-	outerborder = int(us_ob * xscale);
-    }
-    for ( QTextTableCell* cell = cells.first(); cell; cell = cells.next() )
-	cell->adjustToPainter();
-
-    width = 0;
-}
-
-void QTextTable::verticalBreak( int  yt, QTextFlow* flow )
-{
-    if ( flow->pageSize() <= 0 )
-	return;
-    int shift = 0;
-    for (QTextTableCell* cell = cells.first(); cell; cell = cells.next() ) {
-	QRect r = cell->geometry();
-	r.moveBy(0, shift );
-	cell->setGeometry( r );
-	if ( cell->column() == 0 ) {
-	    int y = yt + outerborder + cell->geometry().y();
-	    int oldy = y;
-	    flow->adjustFlow( y, width, cell->geometry().height() + 2*cellspacing, 0 );
-	    shift += y - oldy;
-	    r = cell->geometry();
-	    r.moveBy(0, y - oldy );
-	    cell->setGeometry( r );
-	}
-    }
-    height += shift;
-}
-
-void QTextTable::draw(QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected )
-{
-    if ( placement() != PlaceInline ) {
-	x = xpos;
-	y = ypos;
-    }
-
-    lastX = x;
-    lastY = y;
-
-    painter = p;
-
-    for (QTextTableCell* cell = cells.first(); cell; cell = cells.next() ) {
-	if ( cx < 0 && cy < 0 ||
-	     QRect( cx, cy, cw, ch ).intersects( QRect( x + outerborder + cell->geometry().x(),
-							y + outerborder + cell->geometry().y(),
-							cell->geometry().width(), cell->geometry().height() ) ) ) {
-	    cell->draw( x+outerborder, y+outerborder, cx, cy, cw, ch, cg, selected );
-	    if ( border ) {
-		QRect r( x+outerborder+cell->geometry().x() - us_ib,
-			 y+outerborder+cell->geometry().y() - us_ib,
-			 cell->geometry().width() + 2 * us_ib,
-			 cell->geometry().height() + 2 * us_ib );
-		int s = cellspacing;
-		if ( is_printer( p ) || ( p && p->device() && p->device()->devType() == QInternal::Printer ) ) {
-		    qDrawPlainRect( p, r, cg.text(), us_ib );
-		} else {
-		    p->fillRect( r.left()-s, r.top(), s, r.height(), cg.button() );
-		    p->fillRect( r.right(), r.top(), s, r.height(), cg.button() );
-		    p->fillRect( r.left()-s, r.top()-s, r.width()+2*s, s, cg.button() );
-		    p->fillRect( r.left()-s, r.bottom(), r.width()+2*s, s, cg.button() );
-		    qDrawShadePanel( p, r, cg, TRUE, us_ib );
-		}
-	    }
-	}
-    }
-    if ( border ) {
-	QRect r ( x, y, width, height );
-	if ( is_printer( p ) || ( p && p->device() && p->device()->devType() == QInternal::Printer ) ) {
-	    qDrawPlainRect( p, QRect(QMAX( 0, r.x()+1 ), QMAX( 0, r.y()+1 ), QMAX( r.width()-2, 0 ), QMAX( 0, r.height()-2 ) ), cg.text(), us_b );
-	} else {
-	    int s = border;
-	    p->fillRect( r.left(), r.top(), s, r.height(), cg.button() );
-	    p->fillRect( r.right()-s, r.top(), s, r.height(), cg.button() );
-	    p->fillRect( r.left(), r.top(), r.width(), s, cg.button() );
-	    p->fillRect( r.left(), r.bottom()-s, r.width(), s, cg.button() );
-	    qDrawShadePanel( p, r, cg, FALSE, us_b );
-	}
-    }
-
-#if defined(DEBUG_TABLE_RENDERING)
-    p->save();
-    p->setPen( Qt::red );
-    p->drawRect( x, y, width, height );
-    p->restore();
-#endif
-}
-
-void QTextTable::resize( QPainter* p, int nwidth )
-{
-    if ( fixwidth && cachewidth != 0 )
-	return;
-    if ( nwidth == cachewidth )
-	return;
-    cachewidth = nwidth;
-    int w = nwidth;
-    painter = p;
-    if ( is_printer( painter ) ) {
-	adjustToPainter( painter );
-    } else {
-	painter = 0;
-    }
-    format( w );
-    if ( nwidth >= 32000 )
-	nwidth = w;
-    if ( stretch )
-	nwidth = nwidth * stretch / 100;
-
-    width = nwidth + 2*outerborder;
-    layout->invalidate();
-    int shw = layout->sizeHint().width() + 2*outerborder;
-    int mw = layout->minimumSize().width() + 2*outerborder;
-    if ( stretch )
-	width = QMAX( mw, nwidth );
-    else
-	width = QMAX( mw, QMIN( nwidth, shw ) );
-
-    if ( fixwidth )
-	width = fixwidth;
-
-    layout->invalidate();
-    mw = layout->minimumSize().width() + 2*outerborder;
-    width = QMAX( width, mw );
-
-    int h = layout->heightForWidth( width-2*outerborder );
-    layout->setGeometry( QRect(0, 0, width-2*outerborder, h)  );
-    height = layout->geometry().height()+2*outerborder;
-};
-
-void QTextTable::format( int &w )
-{
-    for ( int i = 0; i < (int)cells.count(); ++i ) {
-	QTextTableCell *cell = cells.at( i );
-	cell->richText()->doLayout( painter, QWIDGETSIZE_MAX );
-	cell->cached_sizehint = cell->richText()->widthUsed() + 2 * ( innerborder + 4 );
-	if ( cell->cached_sizehint > 32000 ) // nested table in paragraph
-	    cell->cached_sizehint = cell->minimumSize().width();
-	cell->richText()->doLayout( painter, cell->cached_sizehint );
-	cell->cached_width = -1;
-    }
-    w = widthHint();
-    layout->invalidate();
-    layout->activate();
-    width = minimumWidth();
-}
-
-void QTextTable::addCell( QTextTableCell* cell )
-{
-    cells.append( cell );
-    layout->addMultiCell( cell, cell->row(), cell->row() + cell->rowspan()-1,
-			  cell->column(), cell->column() + cell->colspan()-1 );
-}
-
-void QTextTable::enter( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy, bool atEnd )
-{
-    currCell.remove( c );
-    if ( !atEnd ) {
-	next( c, doc, parag, idx, ox, oy );
-    } else {
-	currCell.insert( c, cells.count() );
-	prev( c, doc, parag, idx, ox, oy );
-    }
-}
-
-void QTextTable::enterAt( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy, const QPoint &pos )
-{
-    currCell.remove( c );
-    int lastCell = -1;
-    int lastY = -1;
-    for ( int i = 0; i < (int)cells.count(); ++i ) {
-	QTextTableCell *cell = cells.at( i );
-	if ( !cell )
-	    continue;
-	if ( cell->geometry().x() - innerborder <= pos.x() &&
-	     cell->geometry().x() + cell->geometry().width() + innerborder >= pos.x() ) {
-	    if ( cell->geometry().y() > lastY ) {
-		lastCell = i;
-		lastY = cell->geometry().y();
-	    }
-	    if ( cell->geometry().y() - innerborder <= pos.y() &&
-		 cell->geometry().y() + cell->geometry().height() + innerborder >= pos.y() ) {
-		currCell.insert( c, i );
-		break;
-	    }
-	}
-    }
-
-    if ( currCell.find( c ) == currCell.end() ) {
-	if ( lastY != -1 )
-	    currCell.insert( c, lastCell );
-    }
-
-    QTextTableCell *cell = cells.at( *currCell.find( c ) );
-    if ( !cell )
-	return;
-    doc = cell->richText();
-    parag = doc->firstParag();
-    idx = 0;
-    ox += cell->geometry().x() + outerborder + parent->x();
-    oy += cell->geometry().y() + outerborder;
-}
-
-void QTextTable::next( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy )
-{
-    int cc = *currCell.find( c );
-    if ( cc > (int)cells.count() - 1 || cc < 0 )
-	cc = -1;
-    currCell.remove( c );
-    currCell.insert( c, ++cc );
-    if ( cc >= (int)cells.count() ) {
-	currCell.insert( c, 0 );
-	QTextCustomItem::next( c, doc, parag, idx, ox, oy );
-	QTextTableCell *cell = cells.at( 0 );
-	if ( !cell )
-	    return;
-	doc = cell->richText();
-	idx = -1;
-	return;
-    }
-
-    QTextTableCell *cell = cells.at( *currCell.find( c ) );
-    if ( !cell )
-	return;
-    doc = cell->richText();
-    parag = doc->firstParag();
-    idx = 0;
-    ox += cell->geometry().x() + outerborder + parent->x();
-    oy += cell->geometry().y() + outerborder;
-}
-
-void QTextTable::prev( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy )
-{
-    int cc = *currCell.find( c );
-    if ( cc > (int)cells.count() - 1 || cc < 0 )
-	cc = cells.count();
-    currCell.remove( c );
-    currCell.insert( c, --cc );
-    if ( cc < 0 ) {
-	currCell.insert( c, 0 );
-	QTextCustomItem::prev( c, doc, parag, idx, ox, oy );
-	QTextTableCell *cell = cells.at( 0 );
-	if ( !cell )
-	    return;
-	doc = cell->richText();
-	idx = -1;
-	return;
-    }
-
-    QTextTableCell *cell = cells.at( *currCell.find( c ) );
-    if ( !cell )
-	return;
-    doc = cell->richText();
-    parag = doc->firstParag();
-    idx = parag->length() - 1;
-    ox += cell->geometry().x() + outerborder + parent->x();
-    oy += cell->geometry().y() + outerborder;
-}
-
-void QTextTable::down( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy )
-{
-    QTextTableCell *cell = cells.at( *currCell.find( c ) );
-    if ( cell->row_ == layout->numRows() - 1 ) {
-	currCell.insert( c, 0 );
-	QTextCustomItem::down( c, doc, parag, idx, ox, oy );
-	QTextTableCell *cell = cells.at( 0 );
-	if ( !cell )
-	    return;
-	doc = cell->richText();
-	idx = -1;
-	return;
-    }
-
-    int oldRow = cell->row_;
-    int oldCol = cell->col_;
-    int cc = *currCell.find( c );
-    for ( int i = cc; i < (int)cells.count(); ++i ) {
-	cell = cells.at( i );
-	if ( cell->row_ > oldRow && cell->col_ == oldCol ) {
-	    currCell.insert( c, i );
-	    break;
-	}
-    }
-    doc = cell->richText();
-    if ( !cell )
-	return;
-    parag = doc->firstParag();
-    idx = 0;
-    ox += cell->geometry().x() + outerborder + parent->x(),
-    oy += cell->geometry().y() + outerborder;
-}
-
-void QTextTable::up( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy )
-{
-    QTextTableCell *cell = cells.at( *currCell.find( c ) );
-    if ( cell->row_ == 0 ) {
-	currCell.insert( c, 0 );
-	QTextCustomItem::up( c, doc, parag, idx, ox, oy );
-	QTextTableCell *cell = cells.at( 0 );
-	if ( !cell )
-	    return;
-	doc = cell->richText();
-	idx = -1;
-	return;
-    }
-
-    int oldRow = cell->row_;
-    int oldCol = cell->col_;
-    int cc = *currCell.find( c );
-    for ( int i = cc; i >= 0; --i ) {
-	cell = cells.at( i );
-	if ( cell->row_ < oldRow && cell->col_ == oldCol ) {
-	    currCell.insert( c, i );
-	    break;
-	}
-    }
-    doc = cell->richText();
-    if ( !cell )
-	return;
-    parag = doc->lastParag();
-    idx = parag->length() - 1;
-    ox += cell->geometry().x() + outerborder + parent->x();
-    oy += cell->geometry().y() + outerborder;
-}
-
-QTextTableCell::QTextTableCell( QTextTable* table,
-				int row, int column,
-				const QMap<QString, QString> &attr,
-				const QStyleSheetItem* /*style*/, // ### use them
-				const QTextFormat& /*fmt*/, const QString& context,
-				QMimeSourceFactory &factory, QStyleSheet *sheet,
-				const QString& doc)
-{
-#if defined(PARSER_DEBUG)
-    qDebug( debug_indent + "new QTextTableCell1 (pappi: %p)", table );
-    qDebug( debug_indent + doc );
-#endif
-    cached_width = -1;
-    cached_sizehint = -1;
-
-    maxw = QWIDGETSIZE_MAX;
-    minw = 0;
-
-    parent = table;
-    row_ = row;
-    col_ = column;
-    stretch_ = 0;
-    richtext = new QTextDocument( table->parent );
-    richtext->setTableCell( this );
-    QString align = *attr.find( "align" );
-    if ( !align.isEmpty() ) {
-	if ( align.lower() == "left" )
-	    richtext->setAlignment( Qt::AlignLeft );
-	else if ( align.lower() == "center" )
-	    richtext->setAlignment( Qt::AlignHCenter );
-	else if ( align.lower() == "right" )
-	    richtext->setAlignment( Qt::AlignRight );
-    }
-    richtext->setFormatter( table->parent->formatter() );
-    richtext->setUseFormatCollection( table->parent->useFormatCollection() );
-    richtext->setMimeSourceFactory( &factory );
-    richtext->setStyleSheet( sheet );
-    richtext->setDefaultFont( table->parent->formatCollection()->defaultFormat()->font() );
-    richtext->setRichText( doc, context );
-    rowspan_ = 1;
-    colspan_ = 1;
-    if ( attr.contains("colspan") )
-	colspan_ = attr["colspan"].toInt();
-    if ( attr.contains("rowspan") )
-	rowspan_ = attr["rowspan"].toInt();
-
-    background = 0;
-    if ( attr.contains("bgcolor") ) {
-	background = new QBrush(QColor( attr["bgcolor"] ));
-    }
-
-    hasFixedWidth = FALSE;
-    if ( attr.contains("width") ) {
-	bool b;
-	QString s( attr["width"] );
-	int w = s.toInt( &b );
-	if ( b ) {
-	    maxw = w;
-	    minw = maxw;
-	    hasFixedWidth = TRUE;
-	} else {
-	    s = s.stripWhiteSpace();
-	    if ( s.length() > 1 && s[ (int)s.length()-1 ] == '%' )
-		stretch_ = s.left( s.length()-1).toInt();
-	}
-    }
-
-    attributes = attr;
-
-    parent->addCell( this );
-}
-
-QTextTableCell::QTextTableCell( QTextTable* table, int row, int column )
-{
-#if defined(PARSER_DEBUG)
-    qDebug( debug_indent + "new QTextTableCell2( pappi: %p", table );
-#endif
-    maxw = QWIDGETSIZE_MAX;
-    minw = 0;
-    cached_width = -1;
-    cached_sizehint = -1;
-
-    parent = table;
-    row_ = row;
-    col_ = column;
-    stretch_ = 0;
-    richtext = new QTextDocument( table->parent );
-    richtext->setTableCell( this );
-    richtext->setFormatter( table->parent->formatter() );
-    richtext->setUseFormatCollection( table->parent->useFormatCollection() );
-    richtext->setDefaultFont( table->parent->formatCollection()->defaultFormat()->font() );
-    richtext->setRichText( "<html></html>", QString::null );
-    rowspan_ = 1;
-    colspan_ = 1;
-    background = 0;
-    hasFixedWidth = FALSE;
-    parent->addCell( this );
-}
-
-
-QTextTableCell::~QTextTableCell()
-{
-    delete background;
-    background = 0;
-    delete richtext;
-    richtext = 0;
-}
-
-QSize QTextTableCell::sizeHint() const
-{
-    if ( cached_sizehint != -1 )
-	return QSize( cached_sizehint, 0 );
-    QTextTableCell *that = (QTextTableCell*)this;
-    if ( stretch_ )
-	return QSize( ( that->cached_sizehint = QWIDGETSIZE_MAX ), 0 );
-    return QSize( ( that->cached_sizehint = richtext->widthUsed() + 2 * ( table()->innerborder + 4 ) ), 0 );
-}
-
-QSize QTextTableCell::minimumSize() const
-{
-    if ( stretch_ )
-	return QSize( QMAX( minw, parent->width * stretch_ / 100 - 2*parent->cellspacing), 0 );
-    return QSize(QMAX( richtext->minimumWidth(), minw ),0);
-}
-
-QSize QTextTableCell::maximumSize() const
-{
-    return QSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
-}
-
-QSizePolicy::ExpandData QTextTableCell::expanding() const
-{
-    return QSizePolicy::BothDirections;
-}
-
-bool QTextTableCell::isEmpty() const
-{
-    return FALSE;
-}
-void QTextTableCell::setGeometry( const QRect& r )
-{
-    if ( r.width() != cached_width )
-	richtext->doLayout( painter(), r.width() );
-    cached_width = r.width();
-    richtext->setWidth( r.width() );
-    richtext->flow()->height = r.height();
-    geom = r;
-}
-
-QRect QTextTableCell::geometry() const
-{
-    return geom;
-}
-
-bool QTextTableCell::hasHeightForWidth() const
-{
-    return TRUE;
-}
-
-int QTextTableCell::heightForWidth( int w ) const
-{
-    w = QMAX( minw, w );
-
-    if ( cached_width != w ) {
-	QTextTableCell* that = (QTextTableCell*) this;
-	that->richtext->doLayout( painter(), w );
-	that->cached_width = w;
-    }
-    return richtext->height() + 2 * parent->innerborder;
-}
-
-void QTextTableCell::adjustToPainter()
-{
-    if ( !is_printer( painter() ) )
-	return;
-    richtext->formatCollection()->setPainter( painter() );
-    QTextParag *parag = richtext->firstParag();
-    while ( parag ) {
-	parag->setPainter( painter() );
-	parag = parag->next();
-    }
-}
-
-QPainter* QTextTableCell::painter() const
-{
-    return parent->painter;
-}
-
-void QTextTableCell::draw( int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool )
-{
-    if ( cached_width != geom.width() ) {
-	richtext->doLayout( painter(), geom.width() );
-	cached_width = geom.width();
-    }
-    QColorGroup g( cg );
-    if ( background )
-	g.setBrush( QColorGroup::Base, *background );
-    else if ( richtext->paper() )
-	g.setBrush( QColorGroup::Base, *richtext->paper() );
-
-    painter()->save();
-    painter()->translate( x + geom.x(), y + geom.y() );
-    if ( background )
-	painter()->fillRect( 0, 0, geom.width(), geom.height(), *background );
-    else if ( richtext->paper() )
-	painter()->fillRect( 0, 0, geom.width(), geom.height(), *richtext->paper() );
-
-    QRegion r;
-    QTextCursor *c = 0;
-    if ( richtext->parent()->tmpCursor )
-	c = richtext->parent()->tmpCursor;
-    if ( cx >= 0 && cy >= 0 )
-	richtext->draw( painter(), cx - ( x + geom.x() ), cy - ( y + geom.y() ), cw, ch, g, FALSE, (c != 0), c );
-    else
-	richtext->draw( painter(), -1, -1, -1, -1, g, FALSE, (c != 0), c );
-
-#if defined(DEBUG_TABLE_RENDERING)
-    painter()->save();
-    painter()->setPen( Qt::blue );
-    painter()->drawRect( 0, 0, geom.width(), geom.height() );
-    painter()->restore();
-#endif
-
-    painter()->restore();
-}
-
-
-///// Some of this is in qrichtext_p.cpp in qt-rsync at the moment
-
-QTextFormat::QTextFormat()
-    : fm( QFontMetrics( fn ) ), linkColor( TRUE ), logicalFontSize( 3 ), stdPointSize( qApp->font().pointSize() ),
-      painter( 0 ), different( NoFlags )
-{
-    ref = 0;
-    missp = FALSE;
-    ha = AlignNormal;
-    collection = 0;
-//#ifdef DEBUG_COLLECTION
-//    qDebug("QTextFormat simple ctor, no addRef ! %p",this);
-//#endif
-}
-
-QTextFormat::QTextFormat( const QStyleSheetItem *style )
-    : fm( QFontMetrics( fn ) ), linkColor( TRUE ), logicalFontSize( 3 ), stdPointSize( qApp->font().pointSize() ),
-      painter( 0 ), different( NoFlags )
-{
-#ifdef DEBUG_COLLECTION
-    qDebug("QTextFormat::QTextFormat( const QStyleSheetItem *style )");
-#endif
-    ref = 0;
-    this->style = style->name();
-    missp = FALSE;
-    ha = AlignNormal;
-    collection = 0;
-    fn = QFont( style->fontFamily(),
-                style->fontSize(),
-                style->fontWeight(),
-                style->fontItalic() );
-    fn.setUnderline( style->fontUnderline() );
-    col = style->color();
-    fm = QFontMetrics( fn );
-    leftBearing = fm.minLeftBearing();
-    rightBearing = fm.minRightBearing();
-    hei = fm.height();
-    asc = fm.ascent();
-    dsc = fm.descent();
-    missp = FALSE;
-    ha = AlignNormal;
-    memset( widths, 0, 256 );
-    generateKey();
-    addRef();
-    updateStyleFlags();
-}
-
-QTextFormat::QTextFormat( const QFont &f, const QColor &c, QTextFormatCollection * coll )
-    : fn( f ), col( c ), fm( QFontMetrics( f ) ), linkColor( TRUE ),
-      logicalFontSize( 3 ), stdPointSize( f.pointSize() ), painter( 0 ),
-      different( NoFlags )
-{
-#ifdef DEBUG_COLLECTION
-    qDebug("QTextFormat with font & color & coll (%p), addRef. %p",coll,this);
-#endif
-    ref = 0;
-    collection = coll;
-    leftBearing = fm.minLeftBearing();
-    rightBearing = fm.minRightBearing();
-    hei = fm.height();
-    asc = fm.ascent();
-    dsc = fm.descent();
-    missp = FALSE;
-    ha = AlignNormal;
-    memset( widths, 0, 256 );
-    generateKey();
-    addRef();
-    updateStyleFlags();
-}
-
-QTextFormat::QTextFormat( const QTextFormat &f )
-    : fm( f.fm )
-{
-#ifdef DEBUG_COLLECTION
-    //qDebug("QTextFormat::QTextFormat %p copy ctor (copying %p). Will addRef.",this,&f);
-#endif
-    ref = 0;
-    collection = 0;
-    fn = f.fn;
-    col = f.col;
-    painter = f.painter;
-    leftBearing = f.leftBearing;
-    rightBearing = f.rightBearing;
-    memset( widths, 0, 256 );
-    hei = f.hei;
-    asc = f.asc;
-    dsc = f.dsc;
-    stdPointSize = f.stdPointSize;
-    logicalFontSize = f.logicalFontSize;
-    missp = f.missp;
-    ha = f.ha;
-    k = f.k;
-    anchor_name = f.anchor_name;
-    anchor_href = f.anchor_href;
-    linkColor = f.linkColor;
-    style = f.style;
-    different = f.different;
-    addRef();
-}
-
-QTextFormat& QTextFormat::operator=( const QTextFormat &f )
-{
-#ifdef DEBUG_COLLECTION
-    qDebug("QTextFormat::operator= %p (copying %p). Will addRef",this,&f);
-#endif
-    ref = 0;
-    collection = f.collection;
-    fn = f.fn;
-    col = f.col;
-    fm = f.fm;
-    leftBearing = f.leftBearing;
-    rightBearing = f.rightBearing;
-    memset( widths, 0, 256 );
-    hei = f.hei;
-    asc = f.asc;
-    dsc = f.dsc;
-    stdPointSize = f.stdPointSize;
-    logicalFontSize = f.logicalFontSize;
-    missp = f.missp;
-    ha = f.ha;
-    k = f.k;
-    anchor_name = f.anchor_name;
-    anchor_href = f.anchor_href;
-    linkColor = f.linkColor;
-    style = f.style;
-    different = f.different;
-    addRef();
-    return *this;
-}
-
-void QTextFormat::update()
-{
-    fm = QFontMetrics( fn );
-    leftBearing = fm.minLeftBearing();
-    rightBearing = fm.minRightBearing();
-    hei = fm.height();
-    asc = fm.ascent();
-    dsc = fm.descent();
-    memset( widths, 0, 256 );
-    generateKey();
-    updateStyleFlags();
-}
-
-void QTextFormat::addRef()
-{
-    ref++;
-#ifdef DEBUG_COLLECTION
-    if ( collection )
-        qDebug( "  add ref of '%s' to %d (%p) (coll %p)", k.latin1(), ref, this, collection );
-#endif
-}
-
-void QTextFormat::removeRef()
-{
-    ref--;
-    if ( !collection )
-        return;
-#ifdef DEBUG_COLLECTION
-    qDebug( "  remove ref of '%s' to %d (%p) (coll %p)", k.latin1(), ref, this, collection );
-#endif
-    if ( ref == 0 )
-        collection->remove( this );
-}
-
-void QTextParag::setTabArray( int *a )
-{
-    if ( tArray )
-        delete [] tArray;
-    tArray = a;
-}
-
-void QTextParag::setTabStops( int tw )
-{
-    if ( doc )
-        doc->setTabStops( tw );
-    else
-        tabStopWidth = tw;
-}
-
-
-
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qrichtext_p.h b/bibletime/frontend/thirdparty/qt3stuff/qrichtext_p.h
deleted file mode 100644
index a04db64..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qrichtext_p.h
+++ /dev/null
@@ -1,2446 +0,0 @@
-/****************************************************************************
-**
-** Definition of internal rich text classes
-**
-** Created : 990124
-**
-** Copyright (C) 1999-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the kernel module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#ifndef QT3_QRICHTEXT_P_H
-#define QT3_QRICHTEXT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of a number of Qt sources files.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-//
-
-#ifndef QT_H
-#include "qt3stuff.h"
-#include "qstring.h"
-#include "qlist.h"
-#include "qrect.h"
-#include "qfontmetrics.h"
-#include "qintdict.h"
-#include "qmap.h"
-#include "qstringlist.h"
-#include "qfont.h"
-#include "qcolor.h"
-#include "qsize.h"
-#include "qvaluelist.h"
-#include "qvaluestack.h"
-#include "qobject.h"
-#include "qdict.h"
-#include "qtextstream.h"
-#include "qpixmap.h"
-#include "qstylesheet.h"
-#include "qvector.h"
-#include "qpainter.h"
-#include "qlayout.h"
-#include "qobject.h"
-#include <limits.h>
-#include "qcomplextext_p.h"
-#include "qapplication.h"
-#endif // QT_H
-
-// We need this to avoid clashes
-namespace Qt3 {
-
-class QTextDocument;
-class QTextString;
-class QTextPreProcessor;
-class QTextFormat;
-class QTextCursor;
-class QTextParag;
-class QTextFormatter;
-class QTextIndent;
-class QTextFormatCollection;
-class QStyleSheetItem;
-class QTextCustomItem;
-class QTextFlow;
-struct QBidiContext;
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextStringChar
-{
-    friend class QTextString;
-
-public:
-    // this is never called, initialize variables in QTextString::insert()!!!
-    QTextStringChar() : lineStart( 0 ), type( Regular ), startOfRun( 0 ) {d.format=0;}
-    ~QTextStringChar();
-    QChar c;
-    enum Type { Regular, Custom, Mark, Shaped };
-    uint lineStart : 1;
-    uint rightToLeft : 1;
-    uint hasCursor : 1;
-    uint canBreak : 1;
-    Type type : 2;
-    uint startOfRun : 1;
-
-    int x;
-    int height() const;
-    int ascent() const;
-    int descent() const;
-    bool isCustom() const { return type == Custom; }
-    QTextFormat *format() const;
-    QTextCustomItem *customItem() const;
-    void setFormat( QTextFormat *f );
-    void setCustomItem( QTextCustomItem *i );
-    void loseCustomItem();
-    QTextStringChar *clone() const;
-    struct CustomData
-    {
-	QTextFormat *format;
-	QTextCustomItem *custom;
-    };
-
-    struct MarkData
-    {
-	QTextFormat *format;
-	short xoff; // x offset for painting the Mark
-	short yoff; // y offset for painting the Mark
-    };
-
-    struct ShapedData
-    {
-	QTextFormat *format;
-	QChar shapedGlyph;
-    };
-
-    union {
-	QTextFormat* format;
-	CustomData* custom;
-	MarkData *mark;
-	ShapedData *shaped;
-    } d;
-
-private:
-    QTextStringChar &operator=( const QTextStringChar & ) {
-	//abort();
-	return *this;
-    }
-    QTextStringChar( const QTextStringChar & ); // copy-constructor, forbidden
-    friend class QComplexText;
-    friend class QTextParag;
-};
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QMemArray<QTextStringChar>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextString
-{
-public:
-
-    QTextString();
-    QTextString( const QTextString &s );
-    ~QTextString();
-
-    QString toString() const;
-    static QString toString( const QMemArray<QTextStringChar> &data );
-    QString toReverseString() const;
-
-    QTextStringChar &at( int i ) const;
-    int length() const;
-
-    int width( int idx ) const;
-
-    void insert( int index, const QString &s, QTextFormat *f );
-    void insert( int index, QTextStringChar *c );
-    void truncate( int index );
-    void remove( int index, int len );
-    void clear();
-
-    void setFormat( int index, QTextFormat *f, bool useCollection );
-
-    void setTextChanged( bool b ) { textChanged = b; }
-    void setBidi( bool b ) { bidi = b; }
-    bool isTextChanged() const { return textChanged; }
-    bool isBidi() const;
-    bool isRightToLeft() const;
-
-    QMemArray<QTextStringChar> subString( int start = 0, int len = 0xFFFFFF ) const;
-    QMemArray<QTextStringChar> rawData() const { return data; }
-
-    void operator=( const QString &s ) { clear(); insert( 0, s, 0 ); }
-    void operator+=( const QString &s );
-    void prepend( const QString &s ) { insert( 0, s, 0 ); }
-
-private:
-    void checkBidi() const;
-    void basicDirection() const;
-
-    QMemArray<QTextStringChar> data;
-    uint textChanged : 1;
-    uint bidi : 1; // true when the paragraph has right to left characters
-    uint rightToLeft : 1; // true if the basic direction of the paragraph is right to left.
-};
-
-inline bool QTextString::isBidi() const
-{
-    if ( textChanged )
-	checkBidi();
-    return bidi;
-}
-
-inline bool QTextString::isRightToLeft() const
-{
-     if ( textChanged )
-	checkBidi();
-    return rightToLeft;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QValueStack<int>;
-template class Q_EXPORT QValueStack<QTextParag*>;
-template class Q_EXPORT QValueStack<bool>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextCursor
-{
-public:
-    QTextCursor( QTextDocument *d );
-    QTextCursor();
-    QTextCursor( const QTextCursor &c );
-    QTextCursor &operator=( const QTextCursor &c );
-    bool operator==( const QTextCursor &c ) const;
-    bool operator!=( const QTextCursor &c ) const { return !(*this == c); }
-
-    QTextDocument *document() const { return doc; }
-    void setDocument( QTextDocument *d );
-
-    QTextParag *parag() const;
-    int index() const;
-    void setParag( QTextParag *s, bool restore = TRUE );
-
-    void gotoLeft();
-    void gotoRight();
-    void gotoUp();
-    void gotoDown();
-    void gotoLineEnd();
-    void gotoLineStart();
-    void gotoHome();
-    void gotoEnd();
-    void gotoPageUp( int visibleHeight );
-    void gotoPageDown( int visibleHeight );
-    void gotoWordLeft();
-    void gotoWordRight();
-
-    void insert( const QString &s, bool checkNewLine, QMemArray<QTextStringChar> *formatting = 0 );
-    void splitAndInsertEmptyParag( bool ind = TRUE, bool updateIds = TRUE );
-    bool remove();
-    void killLine();
-    void indent();
-
-    bool atParagStart();
-    bool atParagEnd();
-
-    void setIndex( int i, bool restore = TRUE );
-
-    void checkIndex();
-
-    int offsetX() const { return ox; }
-    int offsetY() const { return oy; }
-
-    QTextParag *topParag() const { return parags.isEmpty() ? string : parags.first(); }
-    int totalOffsetX() const;
-    int totalOffsetY() const;
-
-    bool place( const QPoint &pos, QTextParag *s );
-    void restoreState();
-
-    int x() const;
-    int y() const;
-
-    int nestedDepth() const { return indices.count(); }
-
-private:
-    enum Operation { EnterBegin, EnterEnd, Next, Prev, Up, Down };
-
-    void push();
-    void pop();
-    void processNesting( Operation op );
-    void invalidateNested();
-    void gotoIntoNested( const QPoint &globalPos );
-
-    QTextParag *string;
-    QTextDocument *doc;
-    int idx, tmpIndex;
-    int ox, oy;
-    QValueStack<int> indices;
-    QValueStack<QTextParag*> parags;
-    QValueStack<int> xOffsets;
-    QValueStack<int> yOffsets;
-    QValueStack<bool> nestedStack;
-    bool nested;
-
-};
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextCommand
-{
-public:
-    enum Commands { Invalid, Insert, Delete, Format, Alignment, ParagType };
-
-    QTextCommand( QTextDocument *d ) : doc( d ), cursor( d ) {}
-    virtual ~QTextCommand() {}
-    virtual Commands type() const { return Invalid; };
-
-    virtual QTextCursor *execute( QTextCursor *c ) = 0;
-    virtual QTextCursor *unexecute( QTextCursor *c ) = 0;
-
-protected:
-    QTextDocument *doc;
-    QTextCursor cursor;
-
-};
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QPtrList<QTextCommand>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextCommandHistory
-{
-public:
-    QTextCommandHistory( int s ) : current( -1 ), steps( s ) { history.setAutoDelete( TRUE ); }
-    ~QTextCommandHistory() { clear(); }
-
-    void clear() { history.clear(); current = -1; }
-
-    void addCommand( QTextCommand *cmd );
-    QTextCursor *undo( QTextCursor *c );
-    QTextCursor *redo( QTextCursor *c );
-
-    bool isUndoAvailable();
-    bool isRedoAvailable();
-
-    void setUndoDepth( int d ) { steps = d; }
-    int undoDepth() const { return steps; }
-
-private:
-    QPtrList<QTextCommand> history;
-    int current, steps;
-
-};
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextCustomItem
-{
-public:
-    QTextCustomItem( QTextDocument *p );
-    virtual ~QTextCustomItem();
-
-    virtual void draw(QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected ) = 0;
-
-    virtual void move( int x, int y ) { xpos = x; ypos = y; }
-    int x() const { return xpos; }
-    int y() const { return ypos; }
-
-    virtual void adjustToPainter( QPainter* ) { width = 0; }
-
-    enum Placement { PlaceInline = 0, PlaceLeft, PlaceRight };
-    virtual Placement placement() const { return PlaceInline; }
-    bool placeInline() { return placement() == PlaceInline; }
-
-    virtual bool ownLine() const { return FALSE; }
-    virtual void resize( QPainter*, int nwidth ){ width = nwidth; };
-    virtual void invalidate() {};
-
-    virtual bool isNested() const { return FALSE; }
-    virtual int minimumWidth() const { return 0; }
-    virtual int widthHint() const { return 0; }
-
-    virtual QString richText() const { return QString::null; }
-
-    int width;
-    int height;
-
-    virtual void enter( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy, bool atEnd = FALSE ) {
-	doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; Q_UNUSED( atEnd )
-    }
-    virtual void enterAt( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy, const QPoint & ) {
-	doc = doc; parag = parag; idx = idx; ox = ox; oy = oy;
-    }
-    virtual void next( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy ) {
-	doc = doc; parag = parag; idx = idx; ox = ox; oy = oy;
-    }
-    virtual void prev( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy ) {
-	doc = doc; parag = parag; idx = idx; ox = ox; oy = oy;
-    }
-    virtual void down( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy ) {
-	doc = doc; parag = parag; idx = idx; ox = ox; oy = oy;
-    }
-    virtual void up( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy ) {
-	doc = doc; parag = parag; idx = idx; ox = ox; oy = oy;
-    }
-
-    QTextDocument *parent; // obsolete?
-
-    QTextParag *paragraph() const { return parag; }
-    void setParagraph( QTextParag * p ) { parag = p; }
-protected:
-    int xpos;
-    int ypos;
-private:
-    QTextParag *parag;
-};
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QMap<QString, QString>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextImage : public QTextCustomItem
-{
-public:
-    QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, const QString& context,
-		QMimeSourceFactory &factory);
-    ~QTextImage();
-
-    Placement placement() const { return place; }
-    void adjustToPainter( QPainter* );
-    int widthHint() const { return width; }
-    int minimumWidth() const { return width; }
-
-    QString richText() const;
-
-    void draw( QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected );
-
-private:
-    QRegion* reg;
-    QPixmap pm;
-    Placement place;
-    int tmpwidth, tmpheight;
-    QMap<QString, QString> attributes;
-    QString imgId;
-
-};
-
-class Q_EXPORT QTextHorizontalLine : public QTextCustomItem
-{
-public:
-    QTextHorizontalLine( QTextDocument *p );
-    ~QTextHorizontalLine();
-    void adjustToPainter( QPainter* );
-    void draw(QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected );
-    QString richText() const;
-
-    bool ownLine() const { return TRUE; }
-
-private:
-    int tmpheight;
-
-};
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QPtrList<QTextCustomItem>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextFlow
-{
-    friend class QTextDocument;
-    friend class QTextTableCell;
-
-public:
-    QTextFlow();
-    virtual ~QTextFlow();
-
-    virtual void setWidth( int w );
-    virtual void setPageSize( int ps ) { pagesize = ps; }
-    int pageSize() const { return pagesize; }
-
-    virtual int adjustLMargin( int yp, int h, int margin, int space );
-    virtual int adjustRMargin( int yp, int h, int margin, int space );
-
-    virtual void registerFloatingItem( QTextCustomItem* item, bool right = FALSE );
-    virtual void unregisterFloatingItem( QTextCustomItem* item );
-    virtual void drawFloatingItems(QPainter* p, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected );
-    virtual void adjustFlow( int  &yp, int w, int h, QTextParag *parag, bool pages = TRUE );
-
-    virtual bool isEmpty() { return leftItems.isEmpty() && rightItems.isEmpty(); }
-    virtual void updateHeight( QTextCustomItem *i );
-
-    virtual void draw( QPainter *, int , int , int , int ) {}
-    virtual void eraseAfter( QTextParag *, QPainter *, const QColorGroup& ) {}
-
-    void clear();
-
-private:
-    int width;
-    int height;
-
-    int pagesize;
-
-    QPtrList<QTextCustomItem> leftItems;
-    QPtrList<QTextCustomItem> rightItems;
-
-};
-
-class QTextTable;
-
-class Q_EXPORT QTextTableCell : public QLayoutItem
-{
-    friend class QTextTable;
-
-public:
-    QTextTableCell( QTextTable* table,
-		    int row, int column,
-		    const QMap<QString, QString> &attr,
-		    const QStyleSheetItem* style,
-		    const QTextFormat&, const QString& context,
-		    QMimeSourceFactory &factory, QStyleSheet *sheet, const QString& doc );
-    QTextTableCell( QTextTable* table, int row, int column );
-
-    ~QTextTableCell();
-    QSize sizeHint() const ;
-    QSize minimumSize() const ;
-    QSize maximumSize() const ;
-    QSizePolicy::ExpandData expanding() const;
-    bool isEmpty() const;
-    void setGeometry( const QRect& ) ;
-    QRect geometry() const;
-
-    bool hasHeightForWidth() const;
-    int heightForWidth( int ) const;
-
-    void adjustToPainter();
-
-    int row() const { return row_; }
-    int column() const { return col_; }
-    int rowspan() const { return rowspan_; }
-    int colspan() const { return colspan_; }
-    int stretch() const { return stretch_; }
-
-    QTextDocument* richText()  const { return richtext; }
-    QTextTable* table() const { return parent; }
-
-    void draw( int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected );
-
-    QBrush *backGround() const { return background; }
-    virtual void invalidate() { cached_width = -1; cached_sizehint = -1; }
-
-private:
-    QPainter* painter() const;
-    QRect geom;
-    QTextTable* parent;
-    QTextDocument* richtext;
-    int row_;
-    int col_;
-    int rowspan_;
-    int colspan_;
-    int stretch_;
-    int maxw;
-    int minw;
-    bool hasFixedWidth;
-    QBrush *background;
-    int cached_width;
-    int cached_sizehint;
-    QMap<QString, QString> attributes;
-
-};
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QPtrList<QTextTableCell>;
-template class Q_EXPORT QMap<QTextCursor*, int>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextTable: public QTextCustomItem
-{
-    friend class QTextTableCell;
-
-public:
-    QTextTable( QTextDocument *p, const QMap<QString, QString> &attr );
-    ~QTextTable();
-    void adjustToPainter( QPainter *p );
-    void verticalBreak( int  y, QTextFlow* flow );
-    void draw( QPainter* p, int x, int y, int cx, int cy, int cw, int ch,
-	       const QColorGroup& cg, bool selected );
-
-    bool noErase() const { return TRUE; };
-    bool ownLine() const { return TRUE; }
-    Placement placement() const { return place; }
-    bool isNested() const { return TRUE; }
-    void resize( QPainter*, int nwidth );
-    virtual void invalidate() { cachewidth = -1; };
-    /// ## QString anchorAt( QPainter* p, int x, int y );
-
-    virtual void enter( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy, bool atEnd = FALSE );
-    virtual void enterAt( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy, const QPoint &pos );
-    virtual void next( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy );
-    virtual void prev( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy );
-    virtual void down( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy );
-    virtual void up( QTextCursor *c, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy );
-
-    QString richText() const;
-
-    int minimumWidth() const { return layout ? layout->minimumSize().width() : 0; }
-    int widthHint() const { return ( layout ? layout->sizeHint().width() : 0 ) + 2 * outerborder; }
-
-private:
-    void format( int &w );
-    void addCell( QTextTableCell* cell );
-
-private:
-    QGridLayout* layout;
-    QPtrList<QTextTableCell> cells;
-    QPainter* painter;
-    int cachewidth;
-    int fixwidth;
-    int cellpadding;
-    int cellspacing;
-    int border;
-    int outerborder;
-    int stretch;
-    int innerborder;
-    int us_ib, us_b, us_ob, us_cs;
-    int lastX, lastY;
-    QMap<QString, QString> attributes;
-
-    QMap<QTextCursor*, int> currCell;
-
-    Placement place;
-};
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class QTextTableCell;
-class QTextParag;
-
-struct Q_EXPORT QTextDocumentSelection
-{
-    QTextCursor startCursor, endCursor;
-    bool swapped;
-};
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QMap<int, QColor>;
-template class Q_EXPORT QMap<int, bool>;
-template class Q_EXPORT QMap<int, QTextDocumentSelection>;
-template class Q_EXPORT QPtrList<QTextDocument>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextDocument : public QObject
-{
-    Q_OBJECT
-
-    friend class QTextTableCell;
-    friend class QTextCursor;
-    friend class QTextView;
-    friend class QTextParag;
-
-public:
-//ANY_CHARSET_BEGIN
-    QMap<QString,QFont::CharSet>* charsetMap;
-//ANY_CHARSET_END
-
-    enum SelectionIds {
-	Standard = 0,
-	Temp = 32000 // This selection must not be drawn, it's used e.g. by undo/redo to
-	// remove multiple lines with removeSelectedText()
-    };
-
-    QTextDocument( QTextDocument *p );
-    QTextDocument( QTextDocument *d, QTextFormatCollection *f );
-    ~QTextDocument();
-    QTextDocument *parent() const { return par; }
-    QTextParag *parentParag() const { return parParag; }
-
-    void setText( const QString &text, const QString &context );
-    QMap<QString, QString> attributes() const { return attribs; }
-    void setAttributes( const QMap<QString, QString> &attr ) { attribs = attr; }
-
-    QString text() const;
-    QString text( int parag ) const;
-    QString originalText() const;
-
-    int x() const;
-    int y() const;
-    int width() const;
-    int widthUsed() const;
-    int visibleWidth() const;
-    int height() const;
-    void setWidth( int w );
-    int minimumWidth() const;
-    bool setMinimumWidth( int w, QTextParag *parag );
-
-    QTextParag *firstParag() const;
-    QTextParag *lastParag() const;
-    void setFirstParag( QTextParag *p );
-    void setLastParag( QTextParag *p );
-
-    void invalidate();
-
-    void setPreProcessor( QTextPreProcessor *sh );
-    QTextPreProcessor *preProcessor() const;
-
-    void setFormatter( QTextFormatter *f );
-    QTextFormatter *formatter() const;
-
-    void setIndent( QTextIndent *i );
-    QTextIndent *indent() const;
-
-    QColor selectionColor( int id ) const;
-    bool invertSelectionText( int id ) const;
-    void setSelectionColor( int id, const QColor &c );
-    void setInvertSelectionText( int id, bool b );
-    bool hasSelection( int id ) const;
-    void setSelectionStart( int id, QTextCursor *cursor );
-    bool setSelectionEnd( int id, QTextCursor *cursor );
-    void selectAll( int id );
-    bool removeSelection( int id );
-    void selectionStart( int id, int &paragId, int &index );
-    QTextCursor selectionStartCursor( int id );
-    QTextCursor selectionEndCursor( int id );
-    void selectionEnd( int id, int &paragId, int &index );
-    void setFormat( int id, QTextFormat *f, int flags );
-    QTextParag *selectionStart( int id );
-    QTextParag *selectionEnd( int id );
-    int numSelections() const { return nSelections; }
-    void addSelection( int id );
-
-    QString selectedText( int id ) const;
-    void copySelectedText( int id );
-    void removeSelectedText( int id, QTextCursor *cursor );
-    void indentSelection( int id );
-
-    QTextParag *paragAt( int i ) const;
-
-    void addCommand( QTextCommand *cmd );
-    QTextCursor *undo( QTextCursor *c = 0 );
-    QTextCursor *redo( QTextCursor *c  = 0 );
-    QTextCommandHistory *commands() const { return commandHistory; }
-
-    QTextFormatCollection *formatCollection() const;
-
-    bool find( const QString &expr, bool cs, bool wo, bool forward, int *parag, int *index, QTextCursor *cursor );
-
-    void setTextFormat( Qt::TextFormat f );
-    Qt::TextFormat textFormat() const;
-
-    bool inSelection( int selId, const QPoint &pos ) const;
-
-    QStyleSheet *styleSheet() const { return sheet_; }
-    QMimeSourceFactory *mimeSourceFactory() const { return factory_; }
-    QString context() const { return contxt; }
-
-    void setStyleSheet( QStyleSheet *s );
-    void updateStyles();
-    void updateFontSizes( int base );
-    void updateFontAttributes( const QFont &f, const QFont &old );
-    void setMimeSourceFactory( QMimeSourceFactory *f ) { if ( f ) factory_ = f; }
-    void setContext( const QString &c ) { if ( !c.isEmpty() ) contxt = c; }
-
-    void setUnderlineLinks( bool b ) { underlLinks = b; }
-    bool underlineLinks() const { return underlLinks; }
-
-    void setPaper( QBrush *brush ) { if ( backBrush ) delete backBrush; backBrush = brush; }
-    QBrush *paper() const { return backBrush; }
-
-    void doLayout( QPainter *p, int w );
-    void draw( QPainter *p, const QRegion &reg, const QColorGroup &cg, const QBrush *paper = 0 );
-    void drawParag( QPainter *p, QTextParag *parag, int cx, int cy, int cw, int ch,
-		    QPixmap *&doubleBuffer, const QColorGroup &cg,
-		    bool drawCursor, QTextCursor *cursor, bool resetChanged = TRUE );
-    QTextParag *draw( QPainter *p, int cx, int cy, int cw, int ch, const QColorGroup &cg,
-		      bool onlyChanged = FALSE, bool drawCursor = FALSE, QTextCursor *cursor = 0,
-		      bool resetChanged = TRUE );
-
-    void setDefaultFont( const QFont &f );
-
-    void registerCustomItem( QTextCustomItem *i, QTextParag *p );
-    void unregisterCustomItem( QTextCustomItem *i, QTextParag *p );
-    const QList<QTextCustomItem> & allCustomItems() const { return customItems; }
-
-    void setFlow( QTextFlow *f );
-    QTextFlow *flow() const { return flow_; }
-    bool verticalBreak() const { return pages; }
-    void setVerticalBreak( bool b ) { pages = b; }
-
-    void setUseFormatCollection( bool b ) { useFC = b; }
-    bool useFormatCollection() const { return useFC; }
-
-    QTextTableCell *tableCell() const { return tc; }
-    void setTableCell( QTextTableCell *c ) { tc = c; }
-
-    void setPlainText( const QString &text );
-    void setRichText( const QString &text, const QString &context );
-    QString richText( QTextParag *p = 0 ) const;
-    QString plainText( QTextParag *p = 0 ) const;
-
-    bool focusNextPrevChild( bool next );
-
-    int alignment() const;
-    void setAlignment( int a );
-
-    int *tabArray() const;
-    int tabStopWidth() const;
-    void setTabArray( int *a );
-    void setTabStops( int tw );
-
-    void setUndoDepth( int d ) { commandHistory->setUndoDepth( d ); }
-    int undoDepth() const { return commandHistory->undoDepth(); }
-
-    int length() const;
-    void clear( bool createEmptyParag = FALSE );
-
-    virtual QTextParag *createParag( QTextDocument *d, QTextParag *pr = 0, QTextParag *nx = 0, bool updateIds = TRUE );
-    void insertChild( QObject *o ) { QObject::insertChild( o ); }
-    void removeChild( QObject *o ) { QObject::removeChild( o ); }
-    void insertChild( QTextDocument *d ) { childList.append( d ); }
-    void removeChild( QTextDocument *d ) { childList.removeRef( d ); }
-    QPtrList<QTextDocument> children() const { return childList; }
-
-    void setAddMargins( bool b ) { addMargs = b; }
-    int addMargins() const { return addMargs; }
-
-signals:
-    void minimumWidthChanged( int );
-
-private:
-//ANY_CHARSET_BEGIN    
-    bool m_assignedFontMap;
-//ANY_CHARSET_END
-    void init();
-    QPixmap *bufferPixmap( const QSize &s );
-    // HTML parser
-    bool hasPrefix(const QString& doc, int pos, QChar c);
-    bool hasPrefix(const QString& doc, int pos, const QString& s);
-    QTextCustomItem* parseTable( const QMap<QString, QString> &attr, const QTextFormat &fmt, const QString &doc, int& pos, QTextParag *curpar );
-    bool eatSpace(const QString& doc, int& pos, bool includeNbsp = FALSE );
-    bool eat(const QString& doc, int& pos, QChar c);
-    QString parseOpenTag(const QString& doc, int& pos, QMap<QString, QString> &attr, bool& emptyTag);
-    QString parseCloseTag( const QString& doc, int& pos );
-    QChar parseHTMLSpecialChar(const QString& doc, int& pos);
-    QString parseWord(const QString& doc, int& pos, bool lower = TRUE);
-    QChar parseChar(const QString& doc, int& pos, QStyleSheetItem::WhiteSpaceMode wsm );
-    void setRichTextInternal( const QString &text );
-
-private:
-    struct Q_EXPORT Focus {
-	QTextParag *parag;
-	int start, len;
-	QString href;
-    };
-
-    int cx, cy, cw, vw;
-    QTextParag *fParag, *lParag;
-    QTextPreProcessor *pProcessor;
-    QMap<int, QColor> selectionColors;
-    QMap<int, QTextDocumentSelection> selections;
-    QMap<int, bool> selectionText;
-    QTextCommandHistory *commandHistory;
-    QTextFormatter *pFormatter;
-    QTextIndent *indenter;
-    QTextFormatCollection *fCollection;
-    Qt::TextFormat txtFormat;
-    bool preferRichText;
-    QTextFlow *flow_;
-    QPtrList<QTextCustomItem> customItems;
-    bool pages;
-    QTextDocument *par;
-    QTextParag *parParag;
-    bool useFC;
-    QTextTableCell *tc;
-    bool withoutDoubleBuffer;
-    QTextCursor *tmpCursor;
-    bool underlLinks;
-    QColor linkC;
-    QBrush *backBrush;
-    QPixmap *buf_pixmap;
-    bool nextDoubleBuffered;
-    Focus focusIndicator;
-    int minw;
-    QTextParag *minwParag;
-    QStyleSheet* sheet_;
-    QMimeSourceFactory* factory_;
-    QString contxt;
-    QMap<QString, QString> attribs;
-    int align;
-    int *tArray;
-    int tStopWidth;
-    int uDepth;
-    QString oText;
-    QPtrList<QTextDocument> childList;
-    int nSelections;
-    bool addMargs;
-
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-class Q_EXPORT QTextDeleteCommand : public QTextCommand
-{
-public:
-    QTextDeleteCommand( QTextDocument *d, int i, int idx, const QMemArray<QTextStringChar> &str,
-			const QValueList< QPtrVector<QStyleSheetItem> > &os,
-			const QValueList<QStyleSheetItem::ListStyle> &ols,
-			const QMemArray<int> &oas );
-    QTextDeleteCommand( QTextParag *p, int idx, const QMemArray<QTextStringChar> &str );
-    ~QTextDeleteCommand();
-    Commands type() const { return Delete; };
-    QTextCursor *execute( QTextCursor *c );
-    QTextCursor *unexecute( QTextCursor *c );
-
-protected:
-    int id, index;
-    QTextParag *parag;
-    QMemArray<QTextStringChar> text;
-    QValueList< QPtrVector<QStyleSheetItem> > oldStyles;
-    QValueList<QStyleSheetItem::ListStyle> oldListStyles;
-    QMemArray<int> oldAligns;
-
-};
-
-class Q_EXPORT QTextInsertCommand : public QTextDeleteCommand
-{
-public:
-    QTextInsertCommand( QTextDocument *d, int i, int idx, const QMemArray<QTextStringChar> &str,
-			const QValueList< QPtrVector<QStyleSheetItem> > &os,
-			const QValueList<QStyleSheetItem::ListStyle> &ols,
-			const QMemArray<int> &oas )
-	: QTextDeleteCommand( d, i, idx, str, os, ols, oas ) {}
-    QTextInsertCommand( QTextParag *p, int idx, const QMemArray<QTextStringChar> &str )
-	: QTextDeleteCommand( p, idx, str ) {}
-    Commands type() const { return Insert; };
-    QTextCursor *execute( QTextCursor *c ) { return QTextDeleteCommand::unexecute( c ); }
-    QTextCursor *unexecute( QTextCursor *c ) { return QTextDeleteCommand::execute( c ); }
-
-};
-
-class Q_EXPORT QTextFormatCommand : public QTextCommand
-{
-public:
-    QTextFormatCommand( QTextDocument *d, int sid, int sidx, int eid, int eidx, const QMemArray<QTextStringChar> &old, QTextFormat *f, int fl );
-    ~QTextFormatCommand();
-    Commands type() const { return Format; }
-    QTextCursor *execute( QTextCursor *c );
-    QTextCursor *unexecute( QTextCursor *c );
-
-protected:
-    int startId, startIndex, endId, endIndex;
-    QTextFormat *format;
-    QMemArray<QTextStringChar> oldFormats;
-    int flags;
-
-};
-
-class Q_EXPORT QTextAlignmentCommand : public QTextCommand
-{
-public:
-    QTextAlignmentCommand( QTextDocument *d, int fParag, int lParag, int na, const QMemArray<int> &oa );
-    Commands type() const { return Alignment; }
-    QTextCursor *execute( QTextCursor *c );
-    QTextCursor *unexecute( QTextCursor *c );
-
-private:
-    int firstParag, lastParag;
-    int newAlign;
-    QMemArray<int> oldAligns;
-
-};
-
-class Q_EXPORT QTextParagTypeCommand : public QTextCommand
-{
-public:
-    QTextParagTypeCommand( QTextDocument *d, int fParag, int lParag, bool l,
-			   QStyleSheetItem::ListStyle s, const QValueList< QPtrVector<QStyleSheetItem> > &os,
-			   const QValueList<QStyleSheetItem::ListStyle> &ols );
-    Commands type() const { return ParagType; }
-    QTextCursor *execute( QTextCursor *c );
-    QTextCursor *unexecute( QTextCursor *c );
-
-private:
-    int firstParag, lastParag;
-    bool list;
-    QStyleSheetItem::ListStyle listStyle;
-    QValueList< QPtrVector<QStyleSheetItem> > oldStyles;
-    QValueList<QStyleSheetItem::ListStyle> oldListStyles;
-
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-struct Q_EXPORT QTextParagSelection
-{
-    int start, end;
-};
-
-struct Q_EXPORT QTextParagLineStart
-{
-    QTextParagLineStart() : y( 0 ), baseLine( 0 ), h( 0 ), bidicontext( 0 ) {  }
-    QTextParagLineStart( ushort y_, ushort bl, ushort h_ ) : y( y_ ), baseLine( bl ), h( h_ ),
-	w( 0 ), bidicontext( 0 )  {  }
-    QTextParagLineStart( QBidiContext *c, QBidiStatus s ) : y(0), baseLine(0), h(0),
-	status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref();  }
-    ~QTextParagLineStart() { if ( bidicontext && bidicontext->deref() ) delete bidicontext;  }
-    void setContext( QBidiContext *c ) {
-	if ( c == bidicontext )
-	    return;
-	if ( bidicontext && bidicontext->deref() )
-	    delete bidicontext;
-	bidicontext = c;
-	if ( bidicontext )
-	    bidicontext->ref();
-    }
-    QBidiContext *context() const { return bidicontext; }
-
-public:
-    ushort y, baseLine, h;
-    QBidiStatus status;
-    int w;
-
-private:
-    QBidiContext *bidicontext;
-
-};
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QMap<int, QTextParagSelection>;
-template class Q_EXPORT QMap<int, QTextParagLineStart*>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextParagData
-{
-public:
-    QTextParagData() {}
-    virtual ~QTextParagData() {}
-    virtual void join( QTextParagData * ) {}
-};
-
-class Q_EXPORT QTextParag
-{
-    friend class QTextDocument;
-    friend class QTextCursor;
-
-public:
-    QTextParag( QTextDocument *d, QTextParag *pr = 0, QTextParag *nx = 0, bool updateIds = TRUE );
-    virtual ~QTextParag();
-
-    QTextString *string() const;
-    QTextStringChar *at( int i ) const; // maybe remove later
-    int length() const; // maybe remove later
-
-    void setListStyle( QStyleSheetItem::ListStyle ls );
-    QStyleSheetItem::ListStyle listStyle() const;
-    void setListValue( int v ) { list_val = v; }
-    int listValue() const { return list_val; }
-
-    void setList( bool b, int listStyle );
-    void incDepth();
-    void decDepth();
-
-    void setFormat( QTextFormat *fm );
-    QTextFormat *paragFormat() const;
-
-    QTextDocument *document() const;
-
-    QRect rect() const;
-    void setHeight( int h ) { r.setHeight( h ); }
-    void setWidth( int w ) { r.setWidth( w ); }
-    void show();
-    void hide();
-    bool isVisible() const { return visible; }
-
-    bool isLastInFrame() const { return lastInFrame; }
-    void setMovedDown( bool b ) { movedDown = b; }
-    bool isMovedDown() const { return movedDown; }
-
-    QTextParag *prev() const;
-    QTextParag *next() const;
-    void setPrev( QTextParag *s );
-    void setNext( QTextParag *s );
-
-    void insert( int index, const QString &s );
-    void append( const QString &s, bool reallyAtEnd = FALSE );
-    void truncate( int index );
-    void remove( int index, int len );
-    void join( QTextParag *s );
-
-    void invalidate( int chr );
-
-    void move( int &dy );
-    void format( int start = -1, bool doMove = TRUE );
-
-    bool isValid() const;
-    bool hasChanged() const;
-    void setChanged( bool b, bool recursive = FALSE );
-
-    int lineHeightOfChar( int i, int *bl = 0, int *y = 0 ) const;
-    QTextStringChar *lineStartOfChar( int i, int *index = 0, int *line = 0 ) const;
-    int lines() const;
-    QTextStringChar *lineStartOfLine( int line, int *index = 0 ) const;
-    int lineY( int l ) const;
-    int lineBaseLine( int l ) const;
-    int lineHeight( int l ) const;
-    void lineInfo( int l, int &y, int &h, int &bl ) const;
-
-    void setSelection( int id, int start, int end );
-    void removeSelection( int id );
-    int selectionStart( int id ) const;
-    int selectionEnd( int id ) const;
-    bool hasSelection( int id ) const;
-    bool hasAnySelection() const;
-    bool fullSelected( int id ) const;
-
-    void setEndState( int s );
-    int endState() const;
-
-    void setParagId( int i );
-    int paragId() const;
-
-    bool firstPreProcess() const;
-    void setFirstPreProcess( bool b );
-
-    void indent( int *oldIndent = 0, int *newIndent = 0 );
-
-    void setExtraData( QTextParagData *data );
-    QTextParagData *extraData() const;
-
-    QMap<int, QTextParagLineStart*> &lineStartList();
-
-    void setFormat( int index, int len, QTextFormat *f, bool useCollection = TRUE, int flags = -1 );
-
-    void setAlignment( int a );
-    int alignment() const;
-
-    virtual void paint( QPainter &painter, const QColorGroup &cg, QTextCursor *cursor = 0, bool drawSelections = FALSE,
-			int clipx = -1, int clipy = -1, int clipw = -1, int cliph = -1 );
-
-    void setStyleSheetItems( const QPtrVector<QStyleSheetItem> &vec );
-    QPtrVector<QStyleSheetItem> styleSheetItems() const;
-    QStyleSheetItem *style() const;
-
-    virtual int topMargin() const;
-    virtual int bottomMargin() const;
-    virtual int leftMargin() const;
-    virtual int firstLineMargin() const;
-    virtual int rightMargin() const;
-    virtual int lineSpacing( int line ) const;
-
-    int numberOfSubParagraph() const;
-    void registerFloatingItem( QTextCustomItem *i );
-    void unregisterFloatingItem( QTextCustomItem *i );
-
-    void setFullWidth( bool b ) { fullWidth = b; }
-    bool isFullWidth() const { return fullWidth; }
-
-    QTextTableCell *tableCell() const { return tc; }
-    void setTableCell( QTextTableCell *c ) { tc = c; }
-
-    void addCustomItem();
-    void removeCustomItem();
-    int customItems() const;
-
-    QBrush *background() const;
-
-    void setDocumentRect( const QRect &r );
-    int documentWidth() const;
-    int documentVisibleWidth() const;
-    int documentX() const;
-    int documentY() const;
-    QTextFormatCollection *formatCollection() const;
-    void setFormatter( QTextFormatter *f );
-    QTextFormatter *formatter() const;
-    int minimumWidth() const;
-
-    virtual int nextTab( int i, int x );
-    void setTabArray( int *a );
-    void setTabStops( int tw );
-    int *tabArray() const { return tArray; }
-
-    void setPainter( QPainter *p );
-    QPainter *painter() const { return pntr; }
-
-    void setNewLinesAllowed( bool b );
-    bool isNewLinesAllowed() const;
-
-    QString richText() const;
-
-    void addCommand( QTextCommand *cmd );
-    QTextCursor *undo( QTextCursor *c = 0 );
-    QTextCursor *redo( QTextCursor *c  = 0 );
-    QTextCommandHistory *commands() const { return commandHistory; }
-    virtual void copyParagData( QTextParag *parag );
-
-protected:
-    virtual void drawLabel( QPainter* p, int x, int y, int w, int h, int base, const QColorGroup& cg );
-    virtual void drawParagString( QPainter &painter, const QString &str, int start, int len, int startX,
-				  int lastY, int baseLine, int bw, int h, bool drawSelections,
-				  QTextFormat *lastFormat, int i, const QMemArray<int> &selectionStarts,
-				  const QMemArray<int> &selectionEnds, const QColorGroup &cg, bool rightToLeft  );
-
-private:
-
-    QMap<int, QTextParagLineStart*> lineStarts;
-    int invalid;
-    QRect r;
-    QTextParag *p, *n;
-    QTextDocument *doc;
-    bool changed : 1;
-    bool firstFormat : 1;
-    bool firstPProcess : 1;
-    bool needPreProcess : 1;
-    bool fullWidth : 1;
-    bool newLinesAllowed : 1;
-    bool movedDown : 1;
-    bool lastInFrame : 1;
-    bool visible : 1;
-    QMap<int, QTextParagSelection> selections;
-    int state, id;
-    QTextString *str;
-    int align;
-    QPtrVector<QStyleSheetItem> styleSheetItemsVec;
-    QStyleSheetItem::ListStyle listS;
-    int numSubParag;
-    int tm, bm, lm, rm, flm;
-    QTextFormat *defFormat;
-    QPtrList<QTextCustomItem> floatingItems;
-    QTextTableCell *tc;
-    int numCustomItems;
-    QRect docRect;
-    QTextFormatter *pFormatter;
-    int *tArray;
-    int tabStopWidth;
-    QTextParagData *eData;
-    QPainter *pntr;
-    QTextCommandHistory *commandHistory;
-    int list_val;
-
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextFormatter
-{
-public:
-    QTextFormatter();
-    virtual ~QTextFormatter() {}
-    virtual int format( QTextDocument *doc, QTextParag *parag, int start, const QMap<int, QTextParagLineStart*> &oldLineStarts ) = 0;
-
-    bool isWrapEnabled() const { return wrapEnabled;}
-    int wrapAtColumn() const { return wrapColumn;}
-    virtual void setWrapEnabled( bool b ) { wrapEnabled = b; }
-    virtual void setWrapAtColumn( int c ) { wrapColumn = c; }
-    virtual void setAllowBreakInWords( bool b ) { biw = b; }
-    bool allowBreakInWords() const { return biw; }
-
-protected:
-    virtual QTextParagLineStart *formatLine( QTextParag *parag, QTextString *string, QTextParagLineStart *line, QTextStringChar *start,
-					       QTextStringChar *last, int align = Qt3::AlignAuto, int space = 0 );
-    //QTextStringChar
-    //virtual QTextParagLineStart *bidiReorderLine( QTextParag *parag, QTextString *string, QTextParagLineStart *line, QTextStringChar *start,
-    //					    QTextStringChar *last, int align, int space );
-    virtual bool isBreakable( QTextString *string, int pos ) const;
-    void insertLineStart( QTextParag *parag, int index, QTextParagLineStart *ls );
-
-private:
-    bool wrapEnabled;
-    int wrapColumn;
-    bool biw;
-
-#ifdef HAVE_THAI_BREAKS
-    static QCString *thaiCache;
-    static QTextString *cachedString;
-    static ThBreakIterator *thaiIt;
-#endif
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextFormatterBreakInWords : public QTextFormatter
-{
-public:
-    QTextFormatterBreakInWords();
-    int format( QTextDocument *doc, QTextParag *parag, int start, const QMap<int, QTextParagLineStart*> &oldLineStarts );
-
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextFormatterBreakWords : public QTextFormatter
-{
-public:
-    QTextFormatterBreakWords();
-    int format( QTextDocument *doc, QTextParag *parag, int start, const QMap<int, QTextParagLineStart*> &oldLineStarts );
-
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextIndent
-{
-public:
-    QTextIndent();
-    virtual void indent( QTextDocument *doc, QTextParag *parag, int *oldIndent = 0, int *newIndent = 0 ) = 0;
-
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextPreProcessor
-{
-public:
-    enum Ids {
-	Standard = 0
-    };
-
-    QTextPreProcessor();
-    virtual void process( QTextDocument *doc, QTextParag *, int, bool = TRUE ) = 0;
-    virtual QTextFormat *format( int id ) = 0;
-
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-class Q_EXPORT QTextFormat
-{
-    friend class QTextFormatCollection;
-
-public:
-    enum Flags {
-	NoFlags,
-	Bold = 1,
-	Italic = 2,
-	Underline = 4,
-	Family = 8,
-	Size = 16,
-	Color = 32,
-	Misspelled = 64,
-	VAlign = 128,
-	Font = Bold | Italic | Underline | Family | Size,
-	Format = Font | Color | Misspelled | VAlign
-    };
-
-    enum VerticalAlignment { AlignNormal, AlignSubScript, AlignSuperScript };
-
-    QTextFormat();
-    virtual ~QTextFormat() {}
-    QTextFormat( const QStyleSheetItem *s );
-    QTextFormat( const QFont &f, const QColor &c, QTextFormatCollection *parent = 0 );
-    QTextFormat( const QTextFormat &fm );
-    QTextFormat makeTextFormat( const QStyleSheetItem *style, const QMap<QString,QString>& attr ) const;
-    QTextFormat& operator=( const QTextFormat &fm );
-    virtual void copyFormat( const QTextFormat &fm, int flags );
-    QColor color() const;
-    QFont font() const;
-    bool isMisspelled() const;
-    VerticalAlignment vAlign() const;
-    int minLeftBearing() const;
-    int minRightBearing() const;
-    int width( const QChar &c ) const;
-    int width( const QString &str, int pos ) const;
-    int height() const;
-    int ascent() const;
-    int descent() const;
-    QString anchorHref() const;
-    QString anchorName() const;
-    bool isAnchor() const;
-    bool useLinkColor() const;
-
-    void setBold( bool b );
-    void setItalic( bool b );
-    void setUnderline( bool b );
-    void setFamily( const QString &f );
-    void setPointSize( int s );
-    void setFont( const QFont &f );
-    void setColor( const QColor &c );
-    void setMisspelled( bool b );
-    void setVAlign( VerticalAlignment a );
-
-    bool operator==( const QTextFormat &f ) const;
-    QTextFormatCollection *parent() const;
-    void setCollection( QTextFormatCollection *parent ) { collection = parent; }
-    QString key() const;
-
-    static QString getKey( const QFont &f, const QColor &c, bool misspelled, const QString &lhref, const QString &lnm, VerticalAlignment vAlign );
-
-    void addRef();
-    void removeRef();
-
-    QString makeFormatChangeTags( QTextFormat *f ) const;
-    QString makeFormatEndTags() const;
-
-    void setPainter( QPainter *p );
-    void updateStyle();
-    void updateStyleFlags();
-    void setStyle( const QString &s );
-    QString styleName() const { return style; }
-
-    int changed() const { return different; }
-
-protected:
-    virtual void generateKey();
-    QFont fn;
-    void update();
-    void setKey( const QString &key ) { k = key; }
-
-private:
-    QString k;
-    QColor col;
-    QFontMetrics fm;
-    uint missp : 1;
-    uint linkColor : 1;
-    int leftBearing, rightBearing;
-    VerticalAlignment ha;
-    uchar widths[ 256 ];
-    int hei, asc, dsc;
-    QTextFormatCollection *collection;
-    int ref;
-    int logicalFontSize;
-    int stdPointSize;
-    QString anchor_href;
-    QString anchor_name;
-    QPainter *painter;
-    QString style;
-    int different;
-
-};
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QDict<QTextFormat>;
-// MOC_SKIP_END
-#endif
-
-class Q_EXPORT QTextFormatCollection
-{
-    friend class QTextDocument;
-
-public:
-    QTextFormatCollection();
-    virtual ~QTextFormatCollection();
-
-    void setDefaultFormat( QTextFormat *f );
-    QTextFormat *defaultFormat() const;
-    QTextFormat *format( const QTextFormat *f );
-    virtual QTextFormat *format( QTextFormat *of, QTextFormat *nf, int flags );
-    virtual QTextFormat *format( const QFont &f, const QColor &c );
-    virtual void remove( QTextFormat *f );
-    virtual QTextFormat *createFormat( const QTextFormat &f ) { return new QTextFormat( f ); }
-    virtual QTextFormat *createFormat( const QFont &f, const QColor &c ) { return new QTextFormat( f, c, this ); }
-    void debug();
-
-    void setPainter( QPainter *p );
-    QStyleSheet *styleSheet() const { return sheet; }
-    void setStyleSheet( QStyleSheet *s ) { sheet = s; }
-    void updateStyles();
-    void updateFontSizes( int base );
-    void updateFontAttributes( const QFont &f, const QFont &old );
-
-    QDict<QTextFormat> & dict() { return cKey; }
-
-private:
-    QTextFormat *defFormat, *lastFormat, *cachedFormat;
-    QDict<QTextFormat> cKey;
-    QTextFormat *cres;
-    QFont cfont;
-    QColor ccol;
-    QString kof, knf;
-    int cflags;
-    QStyleSheet *sheet;
-
-};
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-inline int QTextString::length() const
-{
-    return data.size();
-}
-
-inline void QTextString::operator+=( const QString &s )
-{
-    insert( length(), s, 0 );
-}
-
-inline int QTextParag::length() const
-{
-    return str->length();
-}
-
-inline QRect QTextParag::rect() const
-{
-    return r;
-}
-
-inline QTextParag *QTextCursor::parag() const
-{
-    return string;
-}
-
-inline int QTextCursor::index() const
-{
-    return idx;
-}
-
-inline void QTextCursor::setIndex( int i, bool restore )
-{
-    if ( restore )
-	restoreState();
-    tmpIndex = -1;
-    idx = i;
-}
-
-inline void QTextCursor::setParag( QTextParag *s, bool restore )
-{
-    if ( restore )
-	restoreState();
-    idx = 0;
-    string = s;
-    tmpIndex = -1;
-}
-
-inline void QTextCursor::checkIndex()
-{
-    if ( idx >= string->length() )
-	idx = string->length() - 1;
-}
-
-inline int QTextCursor::x() const
-{
-    QTextStringChar *c = string->at( idx );
-    int curx = c->x;
-    if ( c->rightToLeft )
-	curx += string->string()->width( idx );
-    return curx;
-}
-
-inline int QTextCursor::y() const
-{
-    int dummy, line;
-    string->lineStartOfChar( idx, &dummy, &line );
-    return string->lineY( line );
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-inline int QTextDocument::x() const
-{
-    return cx;
-}
-
-inline int QTextDocument::y() const
-{
-    return cy;
-}
-
-inline int QTextDocument::width() const
-{
-    return QMAX( cw, flow_->width );
-}
-
-inline int QTextDocument::visibleWidth() const
-{
-    return vw;
-}
-
-inline int QTextDocument::height() const
-{
-    if ( lParag )
-	return QMAX( flow_->height, lParag->rect().top() + lParag->rect().height() + 1 );
-    return 0;
-}
-
-inline QTextParag *QTextDocument::firstParag() const
-{
-    return fParag;
-}
-
-inline QTextParag *QTextDocument::lastParag() const
-{
-    return lParag;
-}
-
-inline void QTextDocument::setFirstParag( QTextParag *p )
-{
-    fParag = p;
-}
-
-inline void QTextDocument::setLastParag( QTextParag *p )
-{
-    lParag = p;
-}
-
-inline void QTextDocument::setWidth( int w )
-{
-    cw = QMAX( w, minw );
-    flow_->setWidth( cw );
-    vw = w;
-}
-
-inline int QTextDocument::minimumWidth() const
-{
-    return minw;
-}
-
-inline QTextPreProcessor *QTextDocument::preProcessor() const
-{
-    return pProcessor;
-}
-
-inline void QTextDocument::setPreProcessor( QTextPreProcessor * sh )
-{
-    pProcessor = sh;
-}
-
-inline void QTextDocument::setFormatter( QTextFormatter *f )
-{
-    delete pFormatter;
-    pFormatter = f;
-}
-
-inline QTextFormatter *QTextDocument::formatter() const
-{
-    return pFormatter;
-}
-
-inline void QTextDocument::setIndent( QTextIndent *i )
-{
-    indenter = i;
-}
-
-inline QTextIndent *QTextDocument::indent() const
-{
-    return indenter;
-}
-
-inline QColor QTextDocument::selectionColor( int id ) const
-{
-    return selectionColors[ id ];
-}
-
-inline bool QTextDocument::invertSelectionText( int id ) const
-{
-    return selectionText[ id ];
-}
-
-inline void QTextDocument::setSelectionColor( int id, const QColor &c )
-{
-    selectionColors[ id ] = c;
-}
-
-inline void QTextDocument::setInvertSelectionText( int id, bool b )
-{
-    selectionText[ id ] = b;
-}
-
-inline bool QTextDocument::hasSelection( int id ) const
-{
-    return selections.find( id ) != selections.end();
-}
-
-inline void QTextDocument::setSelectionStart( int id, QTextCursor *cursor )
-{
-    QTextDocumentSelection sel;
-    sel.startCursor = *cursor;
-    sel.endCursor = *cursor;
-    sel.swapped = FALSE;
-    selections[ id ] = sel;
-}
-
-inline QTextParag *QTextDocument::paragAt( int i ) const
-{
-    QTextParag *s = fParag;
-    while ( s ) {
-	if ( s->paragId() == i )
-	    return s;
-	s = s->next();
-    }
-    return 0;
-}
-
-inline QTextFormatCollection *QTextDocument::formatCollection() const
-{
-    return fCollection;
-}
-
-inline int QTextDocument::alignment() const
-{
-    return align;
-}
-
-inline void QTextDocument::setAlignment( int a )
-{
-    align = a;
-}
-
-inline int *QTextDocument::tabArray() const
-{
-    return tArray;
-}
-
-inline int QTextDocument::tabStopWidth() const
-{
-    return tStopWidth;
-}
-
-inline void QTextDocument::setTabArray( int *a )
-{
-    tArray = a;
-}
-
-inline void QTextDocument::setTabStops( int tw )
-{
-    tStopWidth = tw;
-}
-
-inline QString QTextDocument::originalText() const
-{
-    return oText;
-}
-
-inline void QTextDocument::setFlow( QTextFlow *f )
-{
-    if ( flow_ )
-	delete flow_;
-    flow_ = f;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-inline QColor QTextFormat::color() const
-{
-    return col;
-}
-
-inline QFont QTextFormat::font() const
-{
-    return fn;
-}
-
-inline bool QTextFormat::isMisspelled() const
-{
-    return missp;
-}
-
-inline QTextFormat::VerticalAlignment QTextFormat::vAlign() const
-{
-    return ha;
-}
-
-inline int QTextFormat::minLeftBearing() const
-{
-    if ( !painter || !painter->isActive() )
-	return leftBearing;
-    painter->setFont( fn );
-    return painter->fontMetrics().minLeftBearing();
-}
-
-inline int QTextFormat::minRightBearing() const
-{
-    if ( !painter || !painter->isActive() )
-	return rightBearing;
-    painter->setFont( fn );
-    return painter->fontMetrics().minRightBearing();
-}
-
-inline int QTextFormat::height() const
-{
-    if ( !painter || !painter->isActive() )
-	return hei;
-    painter->setFont( fn );
-    return painter->fontMetrics().height();
-}
-
-inline int QTextFormat::ascent() const
-{
-    if ( !painter || !painter->isActive() )
-	return asc;
-    painter->setFont( fn );
-    return painter->fontMetrics().ascent();
-}
-
-inline int QTextFormat::descent() const
-{
-    if ( !painter || !painter->isActive() )
-	return dsc;
-    painter->setFont( fn );
-    return painter->fontMetrics().descent();
-}
-
-inline bool QTextFormat::operator==( const QTextFormat &f ) const
-{
-    return k == f.k;
-}
-
-inline QTextFormatCollection *QTextFormat::parent() const
-{
-    return collection;
-}
-
-inline QString QTextFormat::key() const
-{
-    return k;
-}
-
-inline void QTextFormat::generateKey()
-{
-    k = QString::null;
-    QTextOStream ts( &k );
-    ts << fn.pointSize()
-       << fn.weight()
-       << (int)fn.underline()
-       << (int)fn.strikeOut()
-       << (int)fn.italic()
-       << col.pixel()
-       << fn.family()
-       << (int)isMisspelled()
-       << anchor_href
-       << anchor_name
-       << (int)vAlign();
-}
-
-inline QString QTextFormat::getKey( const QFont &fn, const QColor &col, bool misspelled,
-				    const QString &lhref, const QString &lnm, VerticalAlignment a )
-{
-    QString k;
-    QTextOStream ts( &k );
-    ts << fn.pointSize()
-       << fn.weight()
-       << (int)fn.underline()
-       << (int)fn.strikeOut()
-       << (int)fn.italic()
-       << col.pixel()
-       << fn.family()
-       << (int)misspelled
-       << lhref
-       << lnm
-       << (int)a;
-    return k;
-}
-
-inline QString QTextFormat::anchorHref() const
-{
-    return anchor_href;
-}
-
-inline QString QTextFormat::anchorName() const
-{
-    return anchor_name;
-}
-
-inline bool QTextFormat::isAnchor() const
-{
-    return !anchor_href.isEmpty()  || !anchor_name.isEmpty();
-}
-
-inline bool QTextFormat::useLinkColor() const
-{
-    return linkColor;
-}
-
-inline void QTextFormat::setStyle( const QString &s )
-{
-    style = s;
-    updateStyleFlags();
-}
-
-inline void QTextFormat::updateStyle()
-{
-    if ( !collection || !collection->styleSheet() )
-	return;
-    QStyleSheetItem *item = collection->styleSheet()->item( style );
-    if ( !item )
-	return;
-    if ( !( different & Color ) && item->color().isValid() )
-	col = item->color();
-    if ( !( different & Size ) && item->fontSize() != -1 )
-	fn.setPointSize( item->fontSize() );
-    if ( !( different & Family ) && !item->fontFamily().isEmpty() )
-	fn.setFamily( item->fontFamily() );
-    if ( !( different & Bold ) && item->fontWeight() != -1 )
-	fn.setWeight( item->fontWeight() );
-    if ( !( different & Italic ) && item->definesFontItalic() )
-	fn.setItalic( item->fontItalic() );
-    if ( !( different & Underline ) && item->definesFontUnderline() )
-	fn.setUnderline( item->fontUnderline() );
-    generateKey();
-    update();
-
-}
-
-inline void QTextFormat::updateStyleFlags()
-{
-    different = NoFlags;
-    if ( !collection || !collection->styleSheet() )
-	return;
-    QStyleSheetItem *item = collection->styleSheet()->item( style );
-    if ( !item )
-	return;
-    if ( item->color() != col )
-	different |= Color;
-    if ( item->fontSize() != fn.pointSize() )
-	different |= Size;
-    if ( item->fontFamily() != fn.family() )
-	different |= Family;
-    if ( item->fontItalic() != fn.italic() )
-	different |= Italic;
-    if ( item->fontUnderline() != fn.underline() )
-	different |= Underline;
-    if ( item->fontWeight() != fn.weight() )
-	different |= Bold;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-inline QTextStringChar &QTextString::at( int i ) const
-{
-    return data[ i ];
-}
-
-inline QString QTextString::toString( const QArray<QTextStringChar> &data )
-{
-    QString s;
-    int l = data.size();
-    s.setUnicode( 0, l );
-    QTextStringChar *c = data.data();
-    QChar *uc = (QChar *)s.unicode();
-    while ( l-- ) {
-	*uc = c->c;
-	uc++;
-	c++;
-    }
-
-    return s;
-}
-
-inline QString QTextString::toString() const
-{
-    return toString( data );
-}
-
-inline QString QTextString::toReverseString() const
-{
-    QString s;
-    int l = length();
-    s.setUnicode(0, l);
-    QTextStringChar *c = data.data() + (l-1);
-    QChar *uc = (QChar *)s.unicode();
-    while ( l-- ) {
-	*uc = c->c;
-	uc++;
-	c--;
-    }
-
-    return s;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-inline QTextStringChar *QTextParag::at( int i ) const
-{
-    return &str->at( i );
-}
-
-inline bool QTextParag::isValid() const
-{
-    return invalid == -1;
-}
-
-inline bool QTextParag::hasChanged() const
-{
-    return changed;
-}
-
-inline void QTextParag::setChanged( bool b, bool recursive )
-{
-    changed = b;
-    if ( recursive ) {
-	if ( doc && doc->parentParag() )
-	    doc->parentParag()->setChanged( b, recursive );
-    }
-}
-
-inline void QTextParag::append( const QString &s, bool reallyAtEnd )
-{
-    if ( reallyAtEnd )
-	insert( str->length(), s );
-    else
-	insert( QMAX( str->length() - 1, 0 ), s );
-}
-
-inline QTextParag *QTextParag::prev() const
-{
-    return p;
-}
-
-inline QTextParag *QTextParag::next() const
-{
-    return n;
-}
-
-inline void QTextParag::setSelection( int id, int start, int end )
-{
-    QMap<int, QTextParagSelection>::ConstIterator it = selections.find( id );
-    if ( it != selections.end() ) {
-	if ( start == ( *it ).start && end == ( *it ).end )
-	    return;
-    }
-
-    QTextParagSelection sel;
-    sel.start = start;
-    sel.end = end;
-    selections[ id ] = sel;
-    setChanged( TRUE, TRUE );
-}
-
-inline void QTextParag::removeSelection( int id )
-{
-    if ( !hasSelection( id ) )
-	return;
-    selections.remove( id );
-    setChanged( TRUE, TRUE );
-}
-
-inline int QTextParag::selectionStart( int id ) const
-{
-    QMap<int, QTextParagSelection>::ConstIterator it = selections.find( id );
-    if ( it == selections.end() )
-	return -1;
-    return ( *it ).start;
-}
-
-inline int QTextParag::selectionEnd( int id ) const
-{
-    QMap<int, QTextParagSelection>::ConstIterator it = selections.find( id );
-    if ( it == selections.end() )
-	return -1;
-    return ( *it ).end;
-}
-
-inline bool QTextParag::hasSelection( int id ) const
-{
-    QMap<int, QTextParagSelection>::ConstIterator it = selections.find( id );
-    if ( it == selections.end() )
-	return FALSE;
-    return ( *it ).start != ( *it ).end || length() == 1;
-}
-
-inline bool QTextParag::hasAnySelection() const
-{
-    return !selections.isEmpty();
-}
-
-inline bool QTextParag::fullSelected( int id ) const
-{
-    QMap<int, QTextParagSelection>::ConstIterator it = selections.find( id );
-    if ( it == selections.end() )
-	return FALSE;
-    return ( *it ).start == 0 && ( *it ).end == str->length() - 1;
-}
-
-inline void QTextParag::setEndState( int s )
-{
-    if ( s == state )
-	return;
-    state = s;
-}
-
-inline int QTextParag::endState() const
-{
-    return state;
-}
-
-inline void QTextParag::setParagId( int i )
-{
-    id = i;
-}
-
-inline int QTextParag::paragId() const
-{
-//    if ( id == -1 )
-//	qWarning( "invalid parag id!!!!!!!! (%p)", (void*)this );
-    return id;
-}
-
-inline bool QTextParag::firstPreProcess() const
-{
-    return firstPProcess;
-}
-
-inline void QTextParag::setFirstPreProcess( bool b )
-{
-    firstPProcess = b;
-}
-
-inline QMap<int, QTextParagLineStart*> &QTextParag::lineStartList()
-{
-    return lineStarts;
-}
-
-inline int QTextParag::lineY( int l ) const
-{
-    if ( l > (int)lineStarts.count() - 1 ) {
-//	qWarning( "QTextParag::lineY: line %d out of range!", l );
-	return 0;
-    }
-
-    if ( !isValid() )
-	( (QTextParag*)this )->format();
-
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
-    while ( l-- > 0 )
-	++it;
-    return ( *it )->y;
-}
-
-inline int QTextParag::lineBaseLine( int l ) const
-{
-    if ( l > (int)lineStarts.count() - 1 ) {
-//	qWarning( "QTextParag::lineBaseLine: line %d out of range!", l );
-	return 10;
-    }
-
-    if ( !isValid() )
-	( (QTextParag*)this )->format();
-
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
-    while ( l-- > 0 )
-	++it;
-    return ( *it )->baseLine;
-}
-
-inline int QTextParag::lineHeight( int l ) const
-{
-    if ( l > (int)lineStarts.count() - 1 ) {
-//	qWarning( "QTextParag::lineHeight: line %d out of range!", l );
-	return 15;
-    }
-
-    if ( !isValid() )
-	( (QTextParag*)this )->format();
-
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
-    while ( l-- > 0 )
-	++it;
-    return ( *it )->h;
-}
-
-inline void QTextParag::lineInfo( int l, int &y, int &h, int &bl ) const
-{
-    if ( l > (int)lineStarts.count() - 1 ) {
-//	qWarning( "QTextParag::lineInfo: line %d out of range!", l );
-	qDebug( "%d %d", lineStarts.count() - 1, l );
-	y = 0;
-	h = 15;
-	bl = 10;
-	return;
-    }
-
-    if ( !isValid() )
-	( (QTextParag*)this )->format();
-
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
-    while ( l-- > 0 )
-	++it;
-    y = ( *it )->y;
-    h = ( *it )->h;
-    bl = ( *it )->baseLine;
-}
-
-inline QTextString *QTextParag::string() const
-{
-    return str;
-}
-
-inline QTextDocument *QTextParag::document() const
-{
-    return doc;
-}
-
-inline void QTextParag::setAlignment( int a )
-{
-    if ( a == align )
-	return;
-    align = a;
-    invalidate( 0 );
-}
-
-inline int QTextParag::alignment() const
-{
-    if ( align != -1 )
-	return align;
-    QStyleSheetItem *item = style();
-    if ( !item )
-	return Qt3::AlignAuto;
-    for ( int i = 0; i < (int)styleSheetItemsVec.size(); ++i ) {
-	item = styleSheetItemsVec[ i ];
-	if ( item->alignment() != QStyleSheetItem::Undefined )
-	    return item->alignment();
-    }
-    return Qt3::AlignAuto;
-}
-
-inline QVector<QStyleSheetItem> QTextParag::styleSheetItems() const
-{
-    QVector<QStyleSheetItem> vec;
-    vec.resize( styleSheetItemsVec.size() );
-    for ( int i = 0; i < (int)vec.size(); ++i )
-	vec.insert( i, styleSheetItemsVec[ i ] );
-    return vec;
-}
-
-inline QStyleSheetItem *QTextParag::style() const
-{
-    if ( styleSheetItemsVec.size() == 0 )
-	return 0;
-    return styleSheetItemsVec[ styleSheetItemsVec.size() - 1 ];
-}
-
-inline int QTextParag::numberOfSubParagraph() const
-{
-    if ( numSubParag != -1 )
- 	return numSubParag;
-    int n = 0;
-    QTextParag *p = (QTextParag*)this;
-    while ( p && style() == p->style() && listStyle() == p->listStyle() ) {
-	++n;
-	p = p->prev();
-    }
-    ( (QTextParag*)this )->numSubParag = n;
-    return n;
-}
-
-inline void QTextParag::setListStyle( QStyleSheetItem::ListStyle ls )
-{
-    listS = ls;
-    invalidate( 0 );
-}
-
-inline QStyleSheetItem::ListStyle QTextParag::listStyle() const
-{
-    return listS;
-}
-
-inline void QTextParag::setFormat( QTextFormat *fm )
-{
-    bool doUpdate = (bool)defFormat && defFormat != formatCollection()->defaultFormat();
-    defFormat = formatCollection()->format( fm );
-    if ( !doUpdate )
-	return;
-    for ( int i = 0; i < length(); ++i ) {
-	if ( at( i )->format()->styleName() == defFormat->styleName() )
-	    at( i )->format()->updateStyle();
-    }
-}
-
-inline QTextFormat *QTextParag::paragFormat() const
-{
-    return defFormat;
-}
-
-inline void QTextParag::registerFloatingItem( QTextCustomItem *i )
-{
-    floatingItems.append( i );
-}
-
-inline void QTextParag::unregisterFloatingItem( QTextCustomItem *i )
-{
-    floatingItems.removeRef( i );
-}
-
-inline void QTextParag::addCustomItem()
-{
-    numCustomItems++;
-}
-
-inline void QTextParag::removeCustomItem()
-{
-    numCustomItems--;
-}
-
-inline int QTextParag::customItems() const
-{
-    return numCustomItems;
-}
-
-inline QBrush *QTextParag::background() const
-{
-    return tc ? tc->backGround() : 0;
-}
-
-
-inline void QTextParag::setDocumentRect( const QRect &r )
-{
-    docRect = r;
-}
-
-inline int QTextParag::documentWidth() const
-{
-    return doc ? doc->width() : docRect.width();
-}
-
-inline int QTextParag::documentVisibleWidth() const
-{
-    return doc ? doc->visibleWidth() : docRect.width();
-}
-
-inline int QTextParag::documentX() const
-{
-    return doc ? doc->x() : docRect.x();
-}
-
-inline int QTextParag::documentY() const
-{
-    return doc ? doc->y() : docRect.y();
-}
-
-inline QTextFormatter *QTextParag::formatter() const
-{
-    if ( doc )
-	return doc->formatter();
-    if ( pFormatter )
-	return pFormatter;
-    return ( ( (QTextParag*)this )->pFormatter = new QTextFormatterBreakWords );
-}
-
-inline void QTextParag::setFormatter( QTextFormatter *f )
-{
-    if ( doc ) return;
-    if ( pFormatter ) delete pFormatter;
-    pFormatter = f;
-}
-
-inline int QTextParag::minimumWidth() const
-{
-    return doc ? doc->minimumWidth() : 0;
-}
-
-inline void QTextParag::setExtraData( QTextParagData *data )
-{
-    eData = data;
-}
-
-inline QTextParagData *QTextParag::extraData() const
-{
-    return eData;
-}
-
-inline void QTextParag::setNewLinesAllowed( bool b )
-{
-    newLinesAllowed = b;
-}
-
-inline bool QTextParag::isNewLinesAllowed() const
-{
-    return newLinesAllowed;
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-inline void QTextFormatCollection::setDefaultFormat( QTextFormat *f )
-{
-    defFormat = f;
-}
-
-inline QTextFormat *QTextFormatCollection::defaultFormat() const
-{
-    return defFormat;
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-inline QTextStringChar::~QTextStringChar()
-{
-    if ( format() )
-	format()->removeRef();
-    switch ( type ) {
-	case Custom:
-	    delete d.custom; break;
-	case Mark:
-	    delete d.mark; break;
-	case Shaped:
-	    delete d.shaped; break;
-	default:
-	    break;
-    }
-}
-
-inline QTextFormat *QTextStringChar::format() const
-{
-    return (type == Regular) ? d.format : d.custom->format;
-}
-
-
-inline QTextCustomItem *QTextStringChar::customItem() const
-{
-    return isCustom() ? d.custom->custom : 0;
-}
-
-inline int QTextStringChar::height() const
-{
-    return !isCustom() ? format()->height() : ( customItem()->placement() == QTextCustomItem::PlaceInline ? customItem()->height : 0 );
-}
-
-inline int QTextStringChar::ascent() const
-{
-    return !isCustom() ? format()->ascent() : ( customItem()->placement() == QTextCustomItem::PlaceInline ? customItem()->height : 0 );
-}
-
-inline int QTextStringChar::descent() const
-{
-    return !isCustom() ? format()->descent() : 0;
-}
-
-}; // namespace
-
-#endif
-
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qstylesheet.cpp b/bibletime/frontend/thirdparty/qt3stuff/qstylesheet.cpp
deleted file mode 100644
index 98dc721..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qstylesheet.cpp
+++ /dev/null
@@ -1,1349 +0,0 @@
-/****************************************************************************
-** $Id: qstylesheet.cpp,v 1.5 2001/06/15 13:32:21 joachim Exp $
-**
-** Implementation of the QStyleSheet class
-**
-** Created : 990101
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the kernel module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include "qstylesheet.h"
-
-#ifndef QT_NO_RICHTEXT
-
-#include "qrichtext_p.h"
-#include "qlayout.h"
-#include "qpainter.h"
-#include "qcleanuphandler.h"
-
-#include <stdio.h>
-
-using namespace Qt3;
-
-class QStyleSheetItem::Data
-{
-public:
-    QStyleSheetItem::DisplayMode disp;
-    int fontitalic;
-    int fontunderline;
-    int fontweight;
-    int fontsize;
-    int fontsizelog;
-    int fontsizestep;
-    int lineSpacing;
-    QString fontfamily;
-    QStyleSheetItem *parentstyle;
-    QString stylename;
-    int ncolumns;
-    QColor col;
-    bool anchor;
-    int align;
-    int margin[5];
-    QStyleSheetItem::ListStyle list;
-    QStyleSheetItem::WhiteSpaceMode whitespacemode;
-    QString contxt;
-    bool selfnest;
-    QStyleSheet* sheet;
-};
-
-/*!
-  \class QStyleSheetItem qstylesheet.h
-  \brief The QStyleSheetItem class encapsulates a text format.
-
-  A style consists of a name and a set of font, color, and other
-  display properties.  When used in a \link QStyleSheet style
-  sheet\endlink, items define the name of a rich text tag and the
-  display property changes associated with it.
-*/
-
-
-/*! \enum QStyleSheetItem::WhiteSpaceMode
-
-  This enum defines the ways in which QStyleSheet can treat whitespace.  There are three values at present:
-
-  \value WhiteSpaceNormal  any sequence of whitespace is equivalent
-  to a single space and is a line-break position.
-
-  \value WhiteSpacePre  whitespace must be output exactly as given
-  in the input.
-
-  \value WhiteSpaceNoWrap  multiple spaces are collapsed as with
-  WhiteSpaceNormal, but no automatic linebreaks occur. To break lines manually,
-  use the  <tt>&lt;br&gt;</tt> tag.
-
-*/
-
-/*! \enum QStyleSheetItem::Margin
-
-  \value MarginLeft  left margin
-  \value MarginRight  right margin
-  \value MarginTop  top margin
-  \value MarginBottom  bottom margin
-  \value MarginAll  all margins (left, right, top and bottom)
-  \value MarginVertical  top and bottom margins
-  \value MarginHorizontal  left and right margins
-  \value MarginFirstLine  margin (indentation) of the first line of a paragarph (in addition to the MarginLeft of the paragraph)
-*/
-
-/*!
-  Constructs a new style named \a name for the stylesheet \a parent.
-
-  All properties in QStyleSheetItem are initially in the "do not change" state,
-  except \link QStyleSheetItem::DisplayMode display mode\endlink, which defaults
-  to \c DisplayInline.
-*/
-QStyleSheetItem::QStyleSheetItem( QStyleSheet* parent, const QString& name )
-{
-    d = new Data;
-    d->stylename = name.lower();
-    d->sheet = parent;
-    init();
-    if (parent)
-	parent->insert( this );
-}
-
-/*!
-  Copy constructor. Constructs a copy of \a other that is
-  not bound to any style sheet.
- */
-QStyleSheetItem::QStyleSheetItem( const QStyleSheetItem & other )
-{
-    d = new Data;
-    *d = *other.d;
-}
-
-
-/*!
-  Destructs the style.  Note that QStyleSheetItem objects become owned
-  by QStyleSheet when they are created.
- */
-QStyleSheetItem::~QStyleSheetItem()
-{
-    delete d;
-}
-
-
-
-/*!
-  Returns the style sheet this item is in.
- */
-QStyleSheet* QStyleSheetItem::styleSheet()
-{
-    return d->sheet;
-}
-
-/*!
-  Returns the style sheet this item is in.
- */
-const QStyleSheet* QStyleSheetItem::styleSheet() const
-{
-    return d->sheet;
-}
-
-/*!
-  \internal
-  Internal initialization
- */
-void QStyleSheetItem::init()
-{
-    d->disp = DisplayInline;
-
-    d->fontitalic = Undefined;
-    d->fontunderline = Undefined;
-    d->fontweight = Undefined;
-    d->fontsize = Undefined;
-    d->fontsizelog = Undefined;
-    d->fontsizestep = 0;
-    d->ncolumns = Undefined;
-    d->col = QColor(); // !isValid()
-    d->anchor = FALSE;
-    d->align = Undefined;
-    d->margin[0] = Undefined;
-    d->margin[1] = Undefined;
-    d->margin[2] = Undefined;
-    d->margin[3] = Undefined;
-    d->margin[4] = Undefined;
-    d->list = QStyleSheetItem::ListDisc;
-    d->whitespacemode = QStyleSheetItem::WhiteSpaceNormal;
-    d->selfnest = TRUE;
-    d->lineSpacing = Undefined;
-}
-
-/*!
-  Returns the name of style.
-*/
-QString QStyleSheetItem::name() const
-{
-    return d->stylename;
-}
-
-/*!
-  Returns the \link QStyleSheetItem::DisplayMode display mode\endlink of the style.
-
-  \sa setDisplayMode()
- */
-QStyleSheetItem::DisplayMode QStyleSheetItem::displayMode() const
-{
-    return d->disp;
-}
-
-/*! \enum QStyleSheetItem::DisplayMode
-
-  This enum type defines the way adjacent elements are displayed.  The possible values are:
-
-  \value DisplayBlock  elements are displayed as a rectangular block (e.g.,
-    &lt;P&gt; ... &lt;/P&gt;).
-
-  \value DisplayInline  elements are displayed in a horizontally flowing
-     sequence (e.g., &lt;EM&gt; ... &lt;/EM&gt;).
-
-  \value DisplayListItem  elements are displayed in a vertically sequence
-    (e.g., &lt;EM&gt; ... &lt;/EM&gt;).
-
-  \value DisplayNone  elements are not displayed at all.
-*/
-
-/*!
-  Sets the display mode of the style to \a m.
-
-  \sa displayMode()
- */
-void QStyleSheetItem::setDisplayMode(DisplayMode m)
-{
-    d->disp=m;
-}
-
-
-/*!
-  Returns the alignment of this style. Possible values are AlignAuto, AlignLeft,
-  AlignRight, AlignCenter and AlignJustify.
-
-  \sa setAlignment(), Qt::AlignmentFlags
- */
-int QStyleSheetItem::alignment() const
-{
-    return d->align;
-}
-
-/*!
-  Sets the alignment. This only makes sense for styles with
-  \link QStyleSheetItem::DisplayMode display mode\endlink
-  DisplayBlock. Possible values are AlignAuto, AlignLeft, AlignRight,
-  AlignCenter and AlignJustify.
-
-  \sa alignment(), displayMode(), Qt::AlignmentFlags
- */
-void QStyleSheetItem::setAlignment( int f )
-{
-    d->align = f;
-}
-
-
-/*!
-  Returns whether the style sets an italic or upright font.
-
- \sa setFontItalic(), definesFontItalic()
- */
-bool QStyleSheetItem::fontItalic() const
-{
-    return d->fontitalic > 0;
-}
-
-/*!
-  Sets italic or upright shape for the style.
-
-  \sa fontItalic(), definesFontItalic()
- */
-void QStyleSheetItem::setFontItalic(bool italic)
-{
-    d->fontitalic = italic?1:0;
-}
-
-/*!
-  Returns whether the style defines a font shape.  A style
-  does not define any shape until setFontItalic() is called.
-
-  \sa setFontItalic(), fontItalic()
- */
-bool QStyleSheetItem::definesFontItalic() const
-{
-    return d->fontitalic != Undefined;
-}
-
-/*!
-  Returns whether the style sets an underlined font.
-
- \sa setFontUnderline(), definesFontUnderline()
- */
-bool QStyleSheetItem::fontUnderline() const
-{
-    return d->fontunderline > 0;
-}
-
-/*!
-  Sets underline for the style.
-
-  \sa fontUnderline(), definesFontUnderline()
- */
-void QStyleSheetItem::setFontUnderline(bool underline)
-{
-    d->fontunderline = underline?1:0;
-}
-
-/*!
-  Returns whether the style defines a setting for the underline
-  property of the font.  A style does not define this until
-  setFontUnderline() is called.
-
-  \sa setFontUnderline(), fontUnderline() */
-bool QStyleSheetItem::definesFontUnderline() const
-{
-    return d->fontunderline != Undefined;
-}
-
-
-/*!
-  Returns the font weight setting of the style. This is either a
-  valid QFont::Weight or the value QStyleSheetItem::Undefined.
-
- \sa setFontWeight(), QFont
- */
-int QStyleSheetItem::fontWeight() const
-{
-    return d->fontweight;
-}
-
-/*!
-  Sets the font weight setting of the style.  Valid values are
-  those defined by QFont::Weight.
-
-  \sa QFont, fontWeight()
- */
-void QStyleSheetItem::setFontWeight(int w)
-{
-    d->fontweight = w;
-}
-
-/*!
-  Returns the logical font size setting of the style. This is either a valid
-  size between 1 and 7  or QStyleSheetItem::Undefined.
-
- \sa setLogicalFontSize(), setLogicalFontSizeStep(), QFont::pointSize(), QFont::setPointSize()
- */
-int QStyleSheetItem::logicalFontSize() const
-{
-    return d->fontsizelog;
-}
-
-
-/*!
-  Sets the logical font size setting of the style tp \a s.
-  Valid logical sizes are 1 to 7.
-
- \sa logicalFontSize(), QFont::pointSize(), QFont::setPointSize()
- */
-void QStyleSheetItem::setLogicalFontSize(int s)
-{
-    d->fontsizelog = s;
-}
-
-/*!
-  Returns the logical font size step of this style.
-
-  The default is 0. Tags such as \c big define \c +1; \c small defines
-  \c -1.
-
-  \sa setLogicalFontSizeStep()
- */
-int QStyleSheetItem::logicalFontSizeStep() const
-{
-    return d->fontsizestep;
-}
-
-/*!
-  Sets the logical font size step of this style to \a s.
-
-  \sa logicalFontSizeStep()
- */
-void QStyleSheetItem::setLogicalFontSizeStep( int s )
-{
-    d->fontsizestep = s;
-}
-
-
-
-/*!
-  Sets the font size setting of the style in point measures.
-
- \sa fontSize(), QFont::pointSize(), QFont::setPointSize()
- */
-void QStyleSheetItem::setFontSize(int s)
-{
-    d->fontsize = s;
-}
-
-/*!
-  Returns the font size setting of the style. This is either a valid
-  point size or QStyleSheetItem::Undefined.
-
- \sa setFontSize(), QFont::pointSize(), QFont::setPointSize()
- */
-int QStyleSheetItem::fontSize() const
-{
-    return d->fontsize;
-}
-
-
-/*!
-  Returns the font family setting of the style. This is either a valid
-  font family or QString::null if no family has been set.
-
- \sa setFontFamily(), QFont::family(), QFont::setFamily()
- */
-QString QStyleSheetItem::fontFamily() const
-{
-    return d->fontfamily;
-}
-
-/*!
-  Sets the font family setting of the style.
-
- \sa fontFamily(), QFont::family(), QFont::setFamily()
- */
-void QStyleSheetItem::setFontFamily( const QString& fam)
-{
-    d->fontfamily = fam;
-}
-
-
-/*!\obsolete
-  Returns the number of columns for this style.
-
-  \sa setNumberOfColumns(), displayMode(), setDisplayMode()
-
- */
-int QStyleSheetItem::numberOfColumns() const
-{
-    return d->ncolumns;
-}
-
-
-/*!\obsolete
-  Sets the number of columns for this style.  Elements in the style
-  are divided into columns.
-
-  This makes sense only if the style uses a block display mode
-  (see QStyleSheetItem::DisplayMode).
-
-  \sa numberOfColumns()
- */
-void QStyleSheetItem::setNumberOfColumns(int ncols)
-{
-    if (ncols > 0)
-	d->ncolumns = ncols;
-}
-
-
-/*!
-  Returns the text color of this style or an invalid color
-  if no color has been set yet.
-
-  \sa setColor() QColor::isValid()
- */
-QColor QStyleSheetItem::color() const
-{
-    return d->col;
-}
-
-/*!
-  Sets the text color of this style.
-
-  \sa color()
- */
-void QStyleSheetItem::setColor( const QColor &c)
-{
-    d->col = c;
-}
-
-/*!
-  Returns whether this style is an anchor.
-
-  \sa setAnchor()
- */
-bool QStyleSheetItem::isAnchor() const
-{
-    return d->anchor;
-}
-
-/*!
-  Sets whether the style is an anchor (link).  Elements in this style
-  have connections to other documents or anchors.
-
-  \sa isAnchor()
- */
-void QStyleSheetItem::setAnchor(bool anc)
-{
-    d->anchor = anc;
-}
-
-
-/*!
-  Returns the whitespace mode.
-
-  \sa setWhiteSpaceMode()
- */
-QStyleSheetItem::WhiteSpaceMode QStyleSheetItem::whiteSpaceMode() const
-{
-    return d->whitespacemode;
-}
-
-/*!
-  Sets the whitespace mode to \a m. Possible values are
-  <ul>
-   <li> \c WhiteSpaceNormal
-	- whitespace in the document serves only as separators.
-	Multiple spaces or indentation are ignored.
-   <li> \c WhiteSpacePre
-	  - whitespace is preserved. This is particulary useful to
-	  display programming code.
-   <li> \c WhiteSpaceNoWrap
-	  - multiple spaces are collapsed as with WhiteSpaceNormal, but no
-	  automatic linebreaks occur. To break lines manually use the
-	  <tt>&lt;br&gt;</tt> tag.
-  </ul>
- */
-void QStyleSheetItem::setWhiteSpaceMode(WhiteSpaceMode m)
-{
-    d->whitespacemode = m;
-}
-
-
-/*!
-  Returns the width of margin \a m in pixel.
-
-  The margin determinator \a m can be \c MarginLeft, \c MarginRight,
-  \c MarginTop, \c MarginBottom, \c MarginAll, \c MarginVertical or \c
-  MarginHorizontal.
-
-  \sa setMargin()
- */
-int QStyleSheetItem::margin(Margin m) const
-{
-    return d->margin[m];
-}
-
-
-/*!
-  Sets the width of margin \a m to \a v  pixels.
-
-  The margin determinator \a m can be \c MarginLeft, \c MarginRight,
-  \c MarginTop, \c MarginBottom, \c MarginAll, \c MarginVertical or \c
-  MarginHorizontal.  The value \a v must be >= 0.
-
-  \sa margin()
- */
-void QStyleSheetItem::setMargin(Margin m, int v)
-{
-    if (m == MarginAll ) {
-	d->margin[0] = v;
-	d->margin[1] = v;
-	d->margin[2] = v;
-	d->margin[3] = v;
-	d->margin[4] = v;
-    } else if (m == MarginVertical ) {
-	d->margin[MarginTop] = v;
-	d->margin[MarginBottom] = v;
-    } else if (m == MarginHorizontal ) {
-	d->margin[MarginLeft] = v;
-	d->margin[MarginRight] = v;
-    } else {
-	d->margin[m] = v;
-    }
-}
-
-
-/*!
-  Returns the list style of the style.
-
-  \sa setListStyle()
- */
-QStyleSheetItem::ListStyle QStyleSheetItem::listStyle() const
-{
-    return d->list;
-}
-
-/*! \enum QStyleSheetItem::ListStyle
-
-  This enum type defines how the items in a list are prefixed when
-  displayed.  The currently defined values are:
-
-  \value ListDisc  a filled circle
-  \value ListCircle  an unfilled circle
-  \value ListSquare  a filled circle
-  \value ListDecimal  an integer in base 10: \e 1, \e 2, \e 3, ...
-  \value ListLowerAlpha  a lowercase letter: \e a, \e b, \e c, ...
-  \value ListUpperAlpha  an uppercase letter: \e A, \e B, \e C, ...
-*/
-/*!
-  Sets the list style of the style.
-
-  This is used by nested elements that have a display mode of
-  DisplayListItem.
-
-  \sa listStyle() DisplayMode
- */
-void QStyleSheetItem::setListStyle(ListStyle s)
-{
-    d->list=s;
-}
-
-
-/*!  Returns a space-separated list of names of styles that may
-  contain elements of this style. If nothing has been set, contexts()
-  returns an empty string, which indicates that this style can be
-  nested everywhere.
-
-  \sa setContexts()
- */
-QString QStyleSheetItem::contexts() const
-{
-    return d->contxt;
-}
-
-/*!
-  Sets a space-separated list of names of styles that may contain
-  elements of this style. If \a c is empty, the style can be nested
-  everywhere.
-
-  \sa contexts()
- */
-void QStyleSheetItem::setContexts( const QString& c)
-{
-    d->contxt = QChar(' ') + c + QChar(' ');
-}
-
-/*!
-  Returns TRUE if this style can be nested into an element
-  of style \a s, and FALSE otherwise.
-
-  \sa contxts(), setContexts()
- */
-bool QStyleSheetItem::allowedInContext( const QStyleSheetItem* s) const
-{
-    if ( d->contxt.isEmpty() )
-	return TRUE;
-    return d->contxt.find( QChar(' ')+s->name()+QChar(' ')) != -1;
-}
-
-
-/*!
-  Returns whether this style has self-nesting enabled.
-
-  \sa setSelfNesting()
- */
-bool QStyleSheetItem::selfNesting() const
-{
-    return d->selfnest;
-}
-
-/*!
-  Sets the self-nesting property for this style to \a nesting.
-
-  In order to support "dirty" HTML, paragraphs &lt;p&gt and list items
-  &lt;li&gt are not self-nesting. This means that starting a new
-  paragraph or list item automatically closes the previous one.
-
-  \sa selfNesting()
- */
-void QStyleSheetItem::setSelfNesting( bool nesting )
-{
-    d->selfnest = nesting;
-}
-
-/*! Sets the linespacing to be \a ls pixels */
-
-void QStyleSheetItem::setLineSpacing( int ls )
-{
-    d->lineSpacing = ls;
-}
-
-/*! Returns the linespacing */
-
-int QStyleSheetItem::lineSpacing() const
-{
-    return d->lineSpacing;
-}
-
-//************************************************************************
-
-
-
-
-//************************************************************************
-
-
-/*!
-  \class QStyleSheet qstylesheet.h
-  \brief A collection of styles for rich text rendering and a generator of tags.
-
-  \ingroup drawing
-  \ingroup helpsystem
-
-  By creating QStyleSheetItem objects for a style sheet you build a
-  definition of a set of tags.  This definition will be used by the
-  internal rich text rendering system to parse and display text
-  documents to which the style sheet applies. Rich text is normally
-  visualized in a QTextView or a QTextBrowser. However, QLabel,
-  QWhatsThis and QMessageBox also support it, and other classes are likely to
-  follow. With QSimpleRichText it is possible to use the rich text
-  renderer for custom widgets as well.
-
-  The default QStyleSheet object has the following style bindings,
-  sorted by structuring bindings, anchors, character style bindings
-  (i.e., inline styles), special elements such as horizontal lines or
-  images, and other tags. In addition, rich text supports simple HTML
-  tables.
-
-  The structuring tags are
-  <ul>
-    <li><tt>&lt;qt&gt;</tt>...<tt>&lt;/qt&gt;</tt>
-	- A Qt rich text document. It understands the following attributes:
-	<ul>
-	<li> \c title
-	- The caption of the document. This attribute is easily accessible with
-	QTextView::documentTitle().
-	<li> \c type
-	- The type of the document. The default type is \c page . It indicates that
-	the document is displayed in a page of its own. Another style is \c detail,
-	which can be used to explain certain expressions in more detail in a few
-	sentences. The QTextBrowser will then keep the current page and display the
-	new document in a small popup similar to QWhatsThis. Note that links
-	will not work in documents with <tt>&lt;qt type="detail"&gt;</tt>...&lt;/qt&gt.
-	<li> \c bgcolor
-	- The background color, for example \c bgcolor="yellow" or \c bgcolor="#0000FF".
-	<li> \c background
-	- The background pixmap, for example \c background="granit.xpm". The pixmap name
-	will be resolved by a QMimeSourceFactory().
-	<li> \c text
-	- The default text color, for example \c text="red".
-	<li> \c link
-	- The link color, for example \c link="green".
-	</ul>
-    <li><tt>&lt;h1&gt;</tt>...<tt>&lt;/h1&gt;</tt>
-	- A top-level heading.
-    <li><tt>&lt;h2&gt;</tt>...<tt>&lt;/h2&gt;</tt>
-	- A sublevel heading.
-    <li><tt>&lt;h3&gt;</tt>...<tt>&lt;/h3&gt;</tt>
-	- A sub-sublevel heading.
-    <li><tt>&lt;p&gt;</tt>...<tt>&lt;/p&gt;</tt>
-	- A left-aligned paragraph. Adjust the alignment with
-	the  \c align attribute. Possible values are
-	\c left, \c right and \c center.
-    <li><tt>&lt;center&gt;</tt>...<tt>&lt;/center&gt;</tt>
-	- A centered paragraph.
-    <li><tt>&lt;blockquote&gt;</tt>...<tt>&lt;/blockquote&gt;</tt>
-	- An indented paragraph that is useful for quotes.
-    <li><tt>&lt;ul&gt;</tt>...<tt>&lt;/ul&gt;</tt>
-	- An unordered list. You can also pass a type argument to
-	define the bullet style. The default is \c type=disc; other
-	types are \c circle and \c square.
-    <li><tt>&lt;ol&gt;</tt>...<tt>&lt;/ol&gt;</tt>
-	- An ordered list. You can also pass a type argument to define
-	the enumeration label style. The default is \c type="1"; other
-	types are \c "a" and \c "A".
-    <li><tt>&lt;li&gt;</tt>...<tt>&lt;/li&gt;</tt>
-	- A list item. This tag can be used only within the context of
-	\c ol or \c ul.
-    <li><tt>&lt;pre&gt;</tt>...<tt>&lt;/pre&gt;</tt>
-	- For larger junks of code. Whitespaces in the contents are preserved.
-	For small bits of code use the inline-style \c code.
-   </ul>
-
-   Anchors and links are done with a single tag:
-   <ul>
-    <li><tt>&lt;a&gt;</tt>...<tt>&lt;/a&gt;</tt>
-	- An anchor or link. The reference target is defined in the
-	\c href attribute of the tag as in <tt>&lt;a href="target.qml"&gt;</tt>...<tt>&lt;/a&gt;</tt>.
-	You can also specify an additional anchor within the specified target document, for
-	example <tt>&lt;a href="target.qml#123"&gt;</tt>...<tt>&lt;/a&gt;</tt>.  If
-	\c a is meant to be an anchor, the reference source is given in
-	the \c name attribute.
-  </ul>
-
-   The default character style bindings are
-   <ul>
-    <li><tt>&lt;em&gt;</tt>...<tt>&lt;/em&gt;</tt>
-	- Emphasized. By default this is the same as <tt>&lt;i&gt;</tt>...<tt>&lt;/i&gt;</tt> (italic).
-    <li><tt>&lt;strong&gt;</tt>...<tt>&lt;/strong&gt;</tt>
-	- Strong. By default this is the same as <tt>&lt;bold&gt;</tt>...<tt>&lt;/bold&gt;</tt> (bold).
-    <li><tt>&lt;i&gt;</tt>...<tt>&lt;/i&gt;</tt>
-	- Italic font style.
-    <li><tt>&lt;b&gt;</tt>...<tt>&lt;/b&gt;</tt>
-	- Bold font style.
-    <li><tt>&lt;u&gt;</tt>...<tt>&lt;/u&gt;</tt>
-	- Underlined font style.
-    <li><tt>&lt;big&gt;</tt>...<tt>&lt;/big&gt;</tt>
-	- A larger font size.
-    <li><tt>&lt;small&gt;</tt>...<tt>&lt;/small&gt;</tt>
-	- A smaller font size.
-    <li><tt>&lt;code&gt;</tt>...<tt>&lt;/code&gt;</tt>
-	- Indicates code. By default this is the same as <tt>&lt;tt&gt;</tt>...<tt>&lt;/tt&gt;</tt> (typewriter). For
-	larger junks of code use the block-tag \c pre.
-    <li><tt>&lt;tt&gt;</tt>...<tt>&lt;/tt&gt;</tt>
-	- Typewriter font style.
-    <li><tt>&lt;font&gt;</tt>...<tt>&lt;/font&gt;</tt>
-	- Customizes the font size, family  and text color. The tag understands
-	the following  attributes:
-	<ul>
-	<li> \c color
-	- The text color, for example \c color="red" or \c color="#FF0000".
-	<li> \c size
-	- The logical size of the font. Logical sizes 1 to 7 are supported.
-	 The value may either be absolute (for example,
-	\c size=3) or relative (\c size=-2). In the latter case the sizes
-	are simply added.
-	<li> \c face
-	- The family of the font, for example \c face=times.
-	</ul>
-   </ul>
-
-   Special elements are:
-   <ul>
-    <li><tt>&lt;img/&gt;</tt>
-	- An image. The image name for the mime source
-	factory is given in the source attribute, for example
-	<tt>&lt;img src="qt.xpm"/&gt;</tt>. The image tag also
-	understands the attributes \c width and \c height that determine
-	the size of the image. If the pixmap does not fit the specified
-	size it will be scaled automatically (by using QImage::smoothScale()).
-
-	The \c align attribute determines where the image is
-	placed. By default, an image is placed inline just like a
-	normal character. Specify \c left or \c right to place the
-	image at the respective side.
-    <li><tt>&lt;hr/&gt;</tt>
-	- A horizonal line.
-    <li><tt>&lt;br/&gt;</tt>
-	- A line break.
-  </ul>
-
-  Another tag not in any of the above cathegories is
-  <ul>
-  <li><tt>&lt;nobr&gt;</tt>...<tt>&lt;/nobr&gt;</tt>
-	- No break. Prevents word wrap.
-  </ul>
-
-  In addition, rich text supports simple HTML tables. A table consists
-  of a set of rows in which each row contains some number of cells. Cells
-  are either data cells or header cells, depending on their
-  content. Usually a cell fills one rectangle in the table grid. It
-  may, however, also span several rows, columns or both.
-
- <ul>
-   <li><tt>&lt;table&gt;</tt>...<tt>&lt;/table&gt;</tt>
-   - A table definition.
-     The default table is frameless. Specify the boolean attribute
-     \c border in order to get a frame. Other attributes are
-	<ul>
-	<li>\c bgcolor
-	- The background color.
-	<li> \c width
-	- The table width. This is either absolute in pixels or relative
-	in percent of the column width, for example \c width=80%.
-	<li> \c border
-	- The width of the table border. The default is 0 (= no border).
-	<li> \c cellspacing
-	- Additional space around the table cells. The default is 2.
-	<li> \c cellpadding
-	- Additional space around the contents of table cells. The default is 1.
-	</ul>
-   <li><tt>&lt;tr&gt;</tt>...<tt>&lt;/tr&gt;</tt>
-   - A table row. Can be used only within \c table. Understands the attributes.
-	<ul>
-	<li>\c bgcolor
-	- The background color.
-	</ul>
-   <li><tt>&lt;td&gt;</tt>...<tt>&lt;/td&gt;</tt>
-   - A table data cell. Can be used only within \c tr. Understands the attributes.
-	<ul>
-	<li>\c bgcolor
-	- The background color.
-	<li> \c width
-	- The cell width. This is either absolute in pixels or relative
-	in percent of the entire table width, for example \c width=50%.
-	<li> \c colspan
-	- Defines how many columns this cell spans. The default is 1.
-	<li> \c rowspan
-	- Defines how many rows this cell spans. The default is 1.
-	<li> \c align
-	- Alignment; possible values are \c left, \c right, and \c center. The
-	default is left-aligned.
-	</ul>
-   <li><tt>&lt;th&gt;</tt>...<tt>&lt;/th&gt;</tt>
-   - A table header cell. Similar to \c td, but defaults to center alignment
-     and a bold font.
-   </ul>
-*/
-
-/*!
-  Creates a style sheet.  Like any QObject, the created object will be
-  deleted when its parent destructs (if the child still exists).
-
-  By default the style sheet has the tag definitions defined above.
-*/
-QStyleSheet::QStyleSheet( QObject *parent, const char *name )
-    : QObject( parent, name )
-{
-    init();
-}
-
-/*!
-  Destructs the style sheet.  All styles inserted into the style sheet
-  will be deleted.
-*/
-QStyleSheet::~QStyleSheet()
-{
-}
-
-/*!
-  \internal
-  Initialized the style sheet to the basic Qt style.
-*/
-void QStyleSheet::init()
-{
-    styles.setAutoDelete( TRUE );
-
-    nullstyle  = new QStyleSheetItem( this,
-	QString::fromLatin1("") );
-
-    QStyleSheetItem*  style;
-
-    style = new QStyleSheetItem( this, "qml" ); // compatibility
-    style->setDisplayMode( QStyleSheetItem::DisplayBlock );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("qt") );
-    style->setDisplayMode( QStyleSheetItem::DisplayBlock );
-    //style->setMargin( QStyleSheetItem::MarginAll, 4 );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("a") );
-    style->setAnchor( TRUE );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("em") );
-    style->setFontItalic( TRUE );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("i") );
-    style->setFontItalic( TRUE );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("big") );
-    style->setLogicalFontSizeStep( 1 );
-    style = new QStyleSheetItem( this, QString::fromLatin1("large") ); // compatibility
-    style->setLogicalFontSizeStep( 1 );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("small") );
-    style->setLogicalFontSizeStep( -1 );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("strong") );
-    style->setFontWeight( QFont::Bold);
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("b") );
-    style->setFontWeight( QFont::Bold);
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("h1") );
-    style->setFontWeight( QFont::Bold);
-    style->setLogicalFontSize(6);
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style-> setMargin(QStyleSheetItem::MarginTop, 12);
-    style-> setMargin(QStyleSheetItem::MarginBottom, 6);
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("h2") );
-    style->setFontWeight( QFont::Bold);
-    style->setLogicalFontSize(5);
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style-> setMargin(QStyleSheetItem::MarginTop, 10);
-    style-> setMargin(QStyleSheetItem::MarginBottom, 5);
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("h3") );
-    style->setFontWeight( QFont::Bold);
-    style->setLogicalFontSize(4);
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style-> setMargin(QStyleSheetItem::MarginTop, 8);
-    style-> setMargin(QStyleSheetItem::MarginBottom, 4);
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("p") );
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style-> setMargin(QStyleSheetItem::MarginVertical, 4);
-    style->setSelfNesting( FALSE );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("center") );
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style->setAlignment( AlignCenter );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("twocolumn") );
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style->setNumberOfColumns( 2 );
-
-    style =  new QStyleSheetItem( this, QString::fromLatin1("multicol") );
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    (void) new QStyleSheetItem( this, QString::fromLatin1("font") );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("ul") );
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style-> setMargin(QStyleSheetItem::MarginVertical, 4);
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("ol") );
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style->setListStyle( QStyleSheetItem::ListDecimal );
-    style-> setMargin(QStyleSheetItem::MarginVertical, 4);
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("li") );
-    style->setDisplayMode(QStyleSheetItem::DisplayListItem);
-    style->setSelfNesting( FALSE );
-    style->setContexts(QString::fromLatin1("ol ul"));
-    style-> setMargin(QStyleSheetItem::MarginVertical, 4);
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("code") );
-    style->setFontFamily( QString::fromLatin1("courier") );
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("tt") );
-    style->setFontFamily( QString::fromLatin1("courier") );
-
-    new QStyleSheetItem(this, QString::fromLatin1("img"));
-    new QStyleSheetItem(this, QString::fromLatin1("br"));
-    new QStyleSheetItem(this, QString::fromLatin1("hr"));
-
-    style = new QStyleSheetItem( this, QString::fromLatin1("pre") );
-    style->setFontFamily( QString::fromLatin1("courier") );
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style->setWhiteSpaceMode(QStyleSheetItem::WhiteSpacePre);
-    style = new QStyleSheetItem( this, QString::fromLatin1("blockquote") );
-    style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-    style->setMargin(QStyleSheetItem::MarginHorizontal, 40 );
-
-     style = new QStyleSheetItem( this, QString::fromLatin1("head") );
-     style->setDisplayMode(QStyleSheetItem::DisplayNone);
-     style = new QStyleSheetItem( this, QString::fromLatin1("div") );
-     style->setDisplayMode(QStyleSheetItem::DisplayInline ); // #### set this to DisplayBlock after the parser in the new engine has been fixed for div
-     style = new QStyleSheetItem( this, QString::fromLatin1("dl") );
-     style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-     style = new QStyleSheetItem( this, QString::fromLatin1("dt") );
-     style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-     style->setContexts(QString::fromLatin1("dl") );
-     style = new QStyleSheetItem( this, QString::fromLatin1("dd") );
-     style->setDisplayMode(QStyleSheetItem::DisplayBlock);
-     style->setMargin(QStyleSheetItem::MarginLeft, 30);
-     style->setContexts(QString::fromLatin1("dt dl") );
-     style = new QStyleSheetItem( this, QString::fromLatin1("u") );
-     style->setFontUnderline( TRUE);
-     style = new QStyleSheetItem( this, QString::fromLatin1("nobr") );
-     style->setWhiteSpaceMode( QStyleSheetItem::WhiteSpaceNoWrap );
-
-     // tables
-     style = new QStyleSheetItem( this, QString::fromLatin1("table") );
-     style = new QStyleSheetItem( this, QString::fromLatin1("tr") );
-     style->setContexts(QString::fromLatin1("table"));
-     style = new QStyleSheetItem( this, QString::fromLatin1("td") );
-     style->setContexts(QString::fromLatin1("tr"));
-     style = new QStyleSheetItem( this, QString::fromLatin1("th") );
-     style->setFontWeight( QFont::Bold );
-     style->setAlignment( Qt::AlignCenter );
-     style->setContexts(QString::fromLatin1("tr"));
-
-     style = new QStyleSheetItem( this, QString::fromLatin1("html") );
-}
-
-
-
-static QStyleSheet* defaultsheet = 0;
-static QCleanupHandler<QStyleSheet> qt_cleanup_stylesheet;
-
-/*!
-  Returns the application-wide default style sheet.This style sheet is
-  used by rich text rendering classes such as QSimpleRichText,
-  QWhatsThis and also QMessageBox to define the rendering style and
-  available tags within rich text documents. It serves also as initial
-  style sheet for the more complex render widgets QTextView and
-  QTextBrowser.
-
-  \sa setDefaultSheet()
-*/
-QStyleSheet* QStyleSheet::defaultSheet()
-{
-    if (!defaultsheet) {
-	defaultsheet = new QStyleSheet();
-	qt_cleanup_stylesheet.add( defaultsheet );
-    }
-    return defaultsheet;
-}
-
-/*!
-  Sets the application-wide default style sheet, deleting any style
-  sheet previously set. The ownership is transferred.
-
-  \sa defaultSheet()
-*/
-void QStyleSheet::setDefaultSheet( QStyleSheet* sheet)
-{
-    if ( defaultsheet != sheet ) {
-	if ( defaultsheet )
-	    qt_cleanup_stylesheet.remove( defaultsheet );
-	delete defaultsheet;
-	if ( sheet )
-	    qt_cleanup_stylesheet.add( sheet );
-    }
-    defaultsheet = sheet;
-}
-
-/*!\internal
-  Inserts \a style.  Any tags generated after this time will be
-  bound to this style.  Note that \a style becomes owned by the
-  style sheet and will be deleted when the style sheet destructs.
-*/
-void QStyleSheet::insert( QStyleSheetItem* style )
-{
-    styles.insert(style->name(), style);
-}
-
-
-/*!
-  Returns the style with name \a name or 0 if there is no such style.
- */
-QStyleSheetItem* QStyleSheet::item( const QString& name)
-{
-    if ( name.isNull() )
-	return 0;
-    return styles[name];
-}
-
-/*!
-  Returns the style with name \a name or 0 if there is no such style (const version)
- */
-const QStyleSheetItem* QStyleSheet::item( const QString& name) const
-{
-    if ( name.isNull() )
-	return 0;
-    return styles[name];
-}
-
-
-/*!
-  Generates an internal object for tag named \a name, given the
-  attributes \a attr, and using additional information provided
-  by the mime source factory \a factory .
-
-  This function should not (yet) be used in application code.
-*/
-QTextCustomItem* QStyleSheet::tag(  const QString& name,
-				   const QMap<QString, QString> &attr,
-				   const QString& context,
-				   const QMimeSourceFactory& factory,
-				   bool /*emptyTag */, QTextDocument *doc ) const
-{
-    static QString s_img = QString::fromLatin1("img");
-    static QString s_hr = QString::fromLatin1("hr");
-
-    const QStyleSheetItem* style = item( name );
-    // first some known  tags
-    if ( !style )
-	return 0;
-    if ( style->name() == s_img )
-	return new QTextImage( doc, attr, context, (QMimeSourceFactory&)factory);
-    if ( style->name() == s_hr )
-	return new QTextHorizontalLine( doc );
-   return 0;
-}
-
-
-/*!
-  Auxiliary function. Converts the plain text string \a plain to a
-  rich text formatted string while preserving its look.
- */
-QString QStyleSheet::convertFromPlainText( const QString& plain)
-{
-    int col = 0;
-    QString rich;
-    rich += "<p>";
-    for ( int i = 0; i < int(plain.length()); ++i ) {
-	if ( plain[i] == '\n' ){
-	    if ( col == 1 )
-		rich += "<p></p>";
-	    else
-		rich += "<br>";
-	    col = 0;
-	}
-	else if ( plain[i] == '\t' ){
-	    rich += 0x00a0U;
-	    // while ( col / 4.0 != int( col/4 ) ) { // weird
-	    while ( col % 4 ) {
-		rich += 0x00a0U;
-		++col;
-	    }
-	}
-	else if ( plain[i].isSpace() )
-	    rich += 0x00a0U;
-	else if ( plain[i] == '<' )
-	    rich +="&lt;";
-	else if ( plain[i] == '>' )
-	    rich +="&gt;";
-	else if ( plain[i] == '&' )
-	    rich +="&amp;";
-	else
-	    rich += plain[i];
-	++col;
-    }
-    rich += "</p>";
-    return rich;
-}
-
-// Must doc this enum somewhere, and it is logically related to QStyleSheet
-
-/*!
-  \enum Qt::TextFormat
-
-  This enum is used in widgets that can display both plain text and
-  rich text, e.g., QLabel. It is used for deciding whether a text
-  string should be interpreted as one or the other. This is
-  normally done by passing one of the enum values to a setTextFormat()
-  function.
-
-  \value PlainText  The text string is interpreted as a normal text string.
-
-  \value RichText The text string is interpreted as a rich text
-  according to the current QStyleSheet::defaultSheet().
-
-  \value AutoText The text string is interpreted as for \c RichText if
-  QStyleSheet::mightBeRichText() returns TRUE, otherwise as for \c
-  PlainText.
-*/
-
-/*!
-  Returns whether the string \a text is likely to be rich text
-  formatted.
-
-  Note: The function uses a fast and therefore simple heuristic. It
-  mainly checks whether there is something that looks like a tag
-  before the first line break. Although the result may be correct for
-  most common cases, there is no guarantee.
-*/
-bool QStyleSheet::mightBeRichText( const QString& text)
-{
-    if ( text.isEmpty() )
-	return FALSE;
-    if ( text.left(5).lower() == "<!doc" )
-	return TRUE;
-    int open = 0;
-    while ( open < int(text.length()) && text[open] != '<'
-	    && text[open] != '\n' && text[open] != '&')
-	++open;
-    if ( text[open] == '&' ) {
-	if ( text.mid(open+1,3) == "lt;" )
-	    return TRUE; // support desperate attempt of user to see <...>
-    } else if ( text[open] == '<' ) {
-	int close = text.find('>', open);
-	if ( close > -1 ) {
-	    QString tag;
-	    for (int i = open+1; i < close; ++i) {
-		if ( text[i].isDigit() || text[i].isLetter() )
-		    tag += text[i];
-		else if ( !tag.isEmpty() && text[i].isSpace() )
-		    break;
-		else if ( !text[i].isSpace() && (!tag.isEmpty() || text[i] != '!' ) )
-		    return FALSE; // that's not a tag
-	    }
-	    return defaultSheet()->item( tag.lower() ) != 0;
-	}
-    }
-    return FALSE;
-}
-
-
-/*! \fn void QStyleSheet::error( const QString& msg) const
-
-  This virtual function is called when an error occurs when
-  processing rich text. Reimplement it if you need to catch
-  error messages.
-
-  Errors might occur if some rich text strings contain tags that are
-  not understood by the stylesheet, if some tags are nested incorrectly, or
-  if tags are not closed properly.
-
-  \a msg is the error message.
-*/
-void QStyleSheet::error( const QString& ) const
-{
-}
-
-
-/*!
-  Scales the font \a font to the appropriate physical point size
-  corresponding to the logical font size \a logicalSize.
-
-  When calling this function, \a font has a point size corresponding to
-  the logical font size 3.
-
-  Typical logical font sizes range from 1 to 7, with 1 being the smallest.
-
-  \sa QStyleSheetItem::logicalFontSize(),
-  QStyleSheetItem::logicalFontSizeStep(), QFont::setPointSize()
- */
-void QStyleSheet::scaleFont( QFont& font, int logicalSize ) const
-{
-    if ( logicalSize < 1 )
-	logicalSize = 1;
-    if ( logicalSize > 7 )
-	logicalSize = 7;
-    int basePointSize = font.pointSize();
-    int s;
-    switch ( logicalSize ) {
-    case 1:
-	s =  basePointSize/2;
-	break;
-    case 2:
-	s = (8 * basePointSize) / 10;
-	break;
-    case 4:
-	s =  (12 * basePointSize) / 10;
-	break;
-    case 5:
-	s = (15 * basePointSize) / 10;
-	break;
-    case 6:
-	s = 2 * basePointSize;
-	break;
-    case 7:
-	s = (24 * basePointSize) / 10;
-	break;
-    default:
-	s = basePointSize;
-    }
-    font.setPointSize( s );
-}
-
-#endif // QT_NO_RICHTEXT
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qstylesheet.h b/bibletime/frontend/thirdparty/qt3stuff/qstylesheet.h
deleted file mode 100644
index 929cd81..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qstylesheet.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/****************************************************************************
-** $Id: qstylesheet.h,v 1.5 2002/03/19 01:15:54 joachim Exp $
-**
-** Definition of the QStyleSheet class
-**
-** Created : 990101
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the kernel module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#ifndef QT3_QSTYLESHEET_H
-#define QT3_QSTYLESHEET_H
-
-#ifndef QT_H
-#include "qnamespace.h"
-#include "qstring.h"
-#include "qvaluelist.h"
-#include "qvector.h"
-#include "qdict.h"
-#include "qobject.h"
-#endif // QT_H
-
-#ifndef QT_NO_RICHTEXT
-
-template<class Key, class T> class QMap;
-
-namespace Qt3 {
-
-class QStyleSheet;
-class QTextDocument;
-
-class Q_EXPORT QStyleSheetItem : public Qt
-{
-public:
-    QStyleSheetItem( QStyleSheet* parent, const QString& name );
-    QStyleSheetItem( const QStyleSheetItem & );
-    ~QStyleSheetItem();
-
-    QString name() const;
-
-    QStyleSheet* styleSheet();
-    const QStyleSheet* styleSheet() const;
-
-    enum AdditionalStyleValues { Undefined  = - 1};
-
-    enum DisplayMode {
-	DisplayBlock,
-	DisplayInline,
-	DisplayListItem,
-	DisplayNone
-    };
-
-    DisplayMode displayMode() const;
-    void setDisplayMode(DisplayMode m);
-
-    int alignment() const;
-    void setAlignment( int f);
-
-    int fontWeight() const;
-    void setFontWeight(int w);
-
-    int logicalFontSize() const;
-    void setLogicalFontSize(int s);
-
-    int logicalFontSizeStep() const;
-    void setLogicalFontSizeStep( int s );
-
-    int fontSize() const;
-    void setFontSize(int s);
-
-    QString fontFamily() const;
-    void setFontFamily( const QString& );
-
-    int numberOfColumns() const;
-    void setNumberOfColumns(int ncols);
-
-    QColor color() const;
-    void setColor( const QColor &);
-
-    bool fontItalic() const;
-    void setFontItalic( bool );
-    bool definesFontItalic() const;
-
-    bool fontUnderline() const;
-    void setFontUnderline( bool );
-    bool definesFontUnderline() const;
-
-    bool isAnchor() const;
-    void setAnchor(bool anc);
-
-    enum WhiteSpaceMode { WhiteSpaceNormal, WhiteSpacePre, WhiteSpaceNoWrap };
-    WhiteSpaceMode whiteSpaceMode() const;
-    void setWhiteSpaceMode(WhiteSpaceMode m);
-
-    enum Margin {
-	MarginLeft,
-	MarginRight,
-	MarginTop,
-	MarginBottom,
-	MarginFirstLine,
-	MarginAll,
-	MarginVertical,
-	MarginHorizontal
-    };
-
-    int margin( Margin m) const;
-    void setMargin( Margin, int);
-
-    enum ListStyle {
-	ListDisc,
-	ListCircle,
-	ListSquare,
-	ListDecimal,
-	ListLowerAlpha,
-	ListUpperAlpha
-    };
-
-    ListStyle listStyle() const;
-    void setListStyle( ListStyle );
-
-    QString contexts() const;
-    void setContexts( const QString& );
-    bool allowedInContext( const QStyleSheetItem* ) const;
-
-    bool selfNesting() const;
-    void setSelfNesting( bool );
-
-    void setLineSpacing( int ls );
-    int lineSpacing() const;
-
-private:
-    void init();
-    class Data;
-    Data* d;
-};
-
-
-#if defined(Q_TEMPLATEDLL)
-// MOC_SKIP_BEGIN
-template class Q_EXPORT QDict<QStyleSheetItem>;
-template class Q_EXPORT QValueList< QVector<QStyleSheetItem> >;
-template class Q_EXPORT QVector<QStyleSheetItem>;
-template class Q_EXPORT QValueList<QStyleSheetItem::ListStyle>;
-// MOC_SKIP_END
-#endif
-
-class QTextCustomItem;
-
-class Q_EXPORT QStyleSheet : public QObject
-{
-    Q_OBJECT
-public:
-    QStyleSheet( QObject *parent=0, const char *name=0 );
-    virtual ~QStyleSheet();
-
-    static QStyleSheet* defaultSheet();
-    static void setDefaultSheet( QStyleSheet* );
-
-
-    QStyleSheetItem* item( const QString& name);
-    const QStyleSheetItem* item( const QString& name) const;
-
-    void insert( QStyleSheetItem* item);
-
-    virtual QTextCustomItem* tag( const QString& name,
-			    const QMap<QString, QString> &attr,
-			    const QString& context,
-			    const QMimeSourceFactory& factory,
-			    bool emptyTag, QTextDocument *doc ) const;
-
-    static QString convertFromPlainText( const QString& );
-    static bool mightBeRichText( const QString& );
-
-    virtual void scaleFont( QFont& font, int logicalSize ) const;
-
-    virtual void error( const QString& ) const;
-
-private:
-    void init();
-    QDict<QStyleSheetItem> styles;
-    QStyleSheetItem* nullstyle;
-};
-
-} // namespace
-
-#endif // QT_NO_RICHTEXT
-
-#endif // QSTYLESHEET_H
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qt3stuff.h b/bibletime/frontend/thirdparty/qt3stuff/qt3stuff.h
deleted file mode 100644
index 2443c60..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qt3stuff.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef QT3STUFF_H
-#define QT3STUFF_H
-
-// This file is where the dirty hacks go :)
-#include <qnamespace.h>
-
-namespace Qt3 { // can't be Qt, a class already exists with that name :(
-
-    enum NewFlags {
-        AlignAuto = 0x0000,
-        AlignJustify = 0x0080, // This is NOT the Qt 3 value, but we have to use another one !
-        AlignHorizontal_Mask = Qt::AlignLeft | Qt::AlignRight | Qt::AlignHCenter | AlignJustify,
-        AlignVertical_Mask = Qt::AlignTop | Qt::AlignBottom | Qt::AlignVCenter,
-        WStaticContents = Qt::WNorthWestGravity,
-        WType_Dialog  = 0x00000002,
-        WStyle_Dialog = 0x00000002
-    };
-
-    enum TextFlags {
-	SingleLine	= 0x0080,		// misc. flags
-	DontClip	= 0x0100,
-	ExpandTabs	= 0x0200,
-	ShowPrefix	= 0x0400,
-	WordBreak	= 0x0800,
-	DontPrint	= 0x1000		// internal
-    };
-
-    enum WordWrap {
-	NoWrap 		= 0x0000,
-	WidgetWidth 	= 0x2000,
-	FixedPixelWidth = 0x3000,
-	FixedColumnWidth= 0x4000
-    };
-
-    enum WrapPolicy {
-	AtWordBoundary 	= 0x0000,
-	AtWhiteSpace 	= AtWordBoundary, // deprecated, don't use
-	Anywhere 	= 0x8000
-    };
-
-    /*enum CursorShape {
-	ArrowCursor,
-	UpArrowCursor,
-	CrossCursor,
-	WaitCursor,
-	IbeamCursor,
-	SizeVerCursor,
-	SizeHorCursor,
-	SizeBDiagCursor,
-	SizeFDiagCursor,
-	SizeAllCursor,
-	BlankCursor,
-	SplitVCursor,
-	SplitHCursor,
-	PointingHandCursor,
-	ForbiddenCursor,
-	LastCursor	= ForbiddenCursor,
-	BitmapCursor	= 24
-    };*/
-
-    enum Dock { Unmanaged, TornOff, Top, Bottom, Right, Left, Minimized };
-    // compatibility
-    //typedef Dock ToolBarDock;
-
-    enum DateFormat {
-	TextDate,      // default Qt
-	ISODate,       // ISO 8601
-	LocalDate      // locale dependant
-    };
-
-};
-
-// Called _blah in Qt 2 and Q_blah in Qt 3
-#if defined(_WS_X11)
-#define Q_WS_X11
-#endif
-
-#define Q_ASSERT ASSERT
-
-// Classes renamed in Qt 3
-#define QPtrList QList
-#define QPtrListIterator QListIterator
-#define QPtrVector QVector
-#define QMemArray QArray
-
-#endif // QNAMESPACE_H
-
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qtextedit.cpp b/bibletime/frontend/thirdparty/qt3stuff/qtextedit.cpp
deleted file mode 100644
index 8eb3fc6..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qtextedit.cpp
+++ /dev/null
@@ -1,539 +0,0 @@
-/****************************************************************************
-** $Id: qtextedit.cpp,v 1.5 2002/03/19 01:15:55 joachim Exp $
-**
-** Definition of the QTextEdit class
-**
-** Created : 990101
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the widgets module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include "qtextedit.h"
-#include "qcursor.h"
-
-/*!
-  \class QTextEdit qtextedit.h
-  \brief The QTextEdit widget provides a sophisticated single-page text editor.
-
-  \ingroup basic
-
-  QTextEdit is an advanced WYSIWYG editor supporting rich text
-  formatting. It is optimized to handle large text documents and
-  respond quickly to user input.
-
-  If you create a new an empty QTextEdit, and want to allow the user
-  to edit rich text (HTML), call setTextFormat(Qt::RichText) to be
-  sure that text() returns the formatted text.
-
-  QTextEdit extends QTextView with keyboard and mouse handling for
-  user input and functions to set/get/modify formatting, text, etc.
-
-  As it is derived from QTextView, it supports the same functions to
-  set and load plain and HTML text.
-
-  QTextEdit internally works on paragraphs. A paragraph is a formatted
-  string which is word-wrapped to fit into the width of the
-  widget. Paragraphs are seperated by hard breaks.
-
-  For user input selections are important. To work with selections use
-  setSelection() and QTextView::getSelection(). To set or get the
-  position of the cursor use setCursorPosition() or
-  getCursorPosition().
-
-  To change the current format (the format at the cursor position) or
-  the format of a selection, use setBold(), setItalic(),
-  setUnderline(), setFamily(), setPointSize(), setFont() or
-  setColor(). To change paragraph formatting use setAlignment() or
-  setParagType(). When the cursor is moved, the signals
-  currentFontChanged(), currentColorChanged() and
-  currentAlignmentChanged() are emitted to inform about the format at
-  the cursor position.
-
-  To insert text at the cursor position use insert(). cut(), copy()
-  and paste() can also be done through the API. If the text changes,
-  the textChanged() signal is emitted, and if the user inserts a new
-  line by pressing return/enter returnPressed() is emitted.
-
-  QTextEdit provides command-based undo/redo. To set the depth of the
-  command history use setUndoDepth() - it defaults to 100 steps. To
-  undo or redo the last opetarion call undo() or redo(). The signals
-  undoAvailable() and redoAvailable() inform about when undo or redo
-  operations can be executed.
-
-  Here is a list of key-bindings which are implemented for editing
-
-  <ul>
-  <li><i> Left Arrow </i> Move the cursor one character left
-  <li><i> Right Arrow </i> Move the cursor one character right
-  <li><i> Up Arrow </i> Move the cursor one line up
-  <li><i> Down Arrow </i> Move the cursor one line down
-  <li><i> Page Up </i> Move the cursor one page up
-  <li><i> Page Down </i> Move the cursor one page down
-  <li><i> Backspace </i> Delete the character to the left of the cursor
-  <li><i> Home </i> Move the cursor to the beginning of the line
-  <li><i> End </i> Move the cursor to the end of the line
-  <li><i> Delete </i> Delete the character to the right of the cursor
-  <li><i> Ctrl+A </i> Move the cursor to the beginning of the line
-  <li><i> Ctrl+B </i> Move the cursor one character left
-  <li><i> Ctrl+C </i> Copy the marked text to the clipboard (also
-  <i>Ctrl+Insert</i> under Windows)
-  <li><i> Ctrl+D </i> Delete the character to the right of the cursor
-  <li><i> Ctrl+E </i> Move the cursor to the end of the line
-  <li><i> Ctrl+F </i> Move the cursor one character right
-  <li><i> Ctrl+H </i> Delete the character to the left of the cursor
-  <li><i> Ctrl+K </i> Delete to end of line
-  <li><i> Ctrl+N </i> Move the cursor one line down
-  <li><i> Ctrl+P </i> Move the cursor one line up
-  <li><i> Ctrl+V </i> Paste the clipboard text into line edit (also
-  <i>Shift+Insert</i> under Windows)
-  <li><i> Ctrl+X </i> Cut the marked text, copy to clipboard (also
-  <i>Shift+Delete</i> under Windows)
-  <li><i> Ctrl+Z </i> Undo the last operation
-  <li><i> Ctrl+Y </i> Redo the last operation
-  <li><i> Ctrl+Left Arrow </i> Move the cursor one word left
-  <li><i> Ctrl+Right Arrow </i> Move the cursor one word right
-  <li><i> Ctrl+Up Arrow </i> Move the cursor one word up
-  <li><i> Ctrl+Down Arrow </i> Move the cursor one word down
-  <li><i> Ctrl+Home Arrow </i> Move the cursor to the beginning of the text
-  <li><i> Ctrl+End Arrow </i> Move the cursor to the end of the text
-  </ul>
-
-    To select (mark) text hold down the Shift key whilst pressing one of
-    the movement keystrokes, for example, <i>Shift+Right Arrow</i> will
-    select the character to the right, and <i>Shift+Ctrl+Right Arrow</i>
-    will select the word to the right, etc.
-
-  All other keys with valid ASCII codes insert themselves into the
-  text at the cursor position.
-*/
-
-/*! \enum QTextEdit::KeyboardAction
-
-  This enum is used by doKeyboardAction() to specify which action
-  should be exectuted:
-
-  \value ActionBackspace  Delete the character at the left of the cursor
-
-  \value ActionDelete  Delete the character at the right of the cursor
-
-  \value ActionReturn  Split the paragraph at the cursor position
-
-  \value ActionKill Delete the text until the end of the paragraph, or
-  if the cursor is at the end of the paragraph, join this and the next
-  paragraph.
-*/
-
-/*! \enum QTextEdit::MoveDirection
-
-  This enum is used by moveCursor() to specify into which direction
-  the cursor should be moved:
-
-  \value MoveLeft  Moves the cursor to the left
-
-  \value MoveRight  Moves the cursor to the right
-
-  \value MoveUp  Moves the cursor up one line
-
-  \value MoveDown  Moves the cursor down one line
-
-  \value MoveHome  Moves the cursor to the begin of the line
-
-  \value MoveEnd Moves the cursor to the end of the line
-
-  \value MovePgUp  Moves the cursor one page up
-
-  \value MovePgDown  Moves the cursor one page down
-*/
-
-
-/*! \fn void QTextEdit::getCursorPosition( int &parag, int &index ) const
-
-  This functions sets the \a parag and \a index parameters to the
-  current cursor position.
- */
-
-/*! \fn bool QTextEdit::isModified() const
-
-  This function returns whether the document has been modified by the
-  user.
-*/
-
-/*! \fn bool QTextEdit::italic() const
-
-  Returns whether the current format (the position where the cursor is
-  placed) is italic or not.
-*/
-
-/*! \fn bool QTextEdit::bold() const
-
-  Returns whether the current format (the position where the cursor
-  is placed) is bold or not.
-*/
-
-/*! \fn bool QTextEdit::underline() const
-
-  Returns whether the current format (the position where the cursor
-  is placed) is underlined or not.
-*/
-
-/*! \fn QString QTextEdit::family() const
-
-  Returns the font family of the current format (the position where
-  the cursor is placed).
-*/
-
-/*! \fn int QTextEdit::pointSize() const
-
-  Returns the poit size of the font of the current format (the
-  position where the cursor is placed).
-*/
-
-/*! \fn QColor QTextEdit::color() const
-
-  Returns the color of the current format (the position where the
-  cursor is placed).
-*/
-
-/*! \fn QFont QTextEdit::font() const
-
-  Returns the font of the current format (the position where the
-  cursor is placed).
-*/
-
-/*! \fn int QTextEdit::alignment() const
-
-  Returns the alignment of the paragraph at which the cursor is
-  currently placed.
-*/
-
-/*! \fn bool QTextEdit::isOverwriteMode() const
-
-  Returns TRUE if this editor is in overwrite mode, i.e.  if
-  characters typed replace characters in the editor.
-*/
-
-/*! \fn int QTextEdit::undoDepth() const
-
-  Returns how many steps the undo/redo history can maximally store.
-*/
-
-/*! \fn void QTextEdit::insert( const QString &text, bool indent, bool checkNewLine, bool removeSelected )
-
-  Inserts \a text at the current cursor position. If \a indent is
-  TRUE, the paragraph is re-indented. If \a checkNewLine is TRUE,
-  newline characters in \a text result in hard breaks. Otherwise, the
-  result of newlines is not defined. If \ removeSelected is TRUE,
-  selected text is removed before the text is inserted, else the
-  inserted text gets selected.
-*/
-
-/*! \fn void QTextEdit::setOverwriteMode( bool b )
-
-  Sets overwrite mode if \a b on is TRUE. Overwrite mode means that
-  characters typed replace characters in the editor.
-*/
-
-/*! \fn void QTextEdit::undo()
-
-  Undoes the last operation.
-*/
-
-/*! \fn void QTextEdit::redo()
-
-  Redoes the last operation.
-*/
-
-/*! \fn void QTextEdit::cut()
-
-  Cuts the selected text (if there is any) and puts it on the
-  clipboard.
-*/
-
-/*! \fn void QTextEdit::paste()
-
-  Pastes the text from the clipboard (if there is any) at the current
-  cursor position. Only pastes plain text.
-
-  \sa pasteSubType()
-*/
-
-/*! \fn void QTextEdit::pasteSubType( const QCString &subtype )
-
-  Pastes the text from the clipboard (if there is any) of the format
-  \a subtype (this can be e.g. "plain", "html" ) at the current cursor
-  position.
-*/
-
-/*! \fn void QTextEdit::clear()
-
-  Removes all text.
-
-*/
-
-/*! \fn void QTextEdit::del()
-
-  Deletes the character on the right side of the text cursor. If a
-  text has been marked by the user (e.g. by clicking and dragging) the
-  cursor is put at the beginning of the marked text and the marked
-  text is removed.
-*/
-
-/*! \fn void QTextEdit::indent()
-
-  Re-indents the current paragraph.
-*/
-
-/*! \fn void QTextEdit::setItalic( bool b )
-
-  Sets the current format and the selected text (if there is any) to
-  italic, if \a b is TRUE, otherwise unsets the italic flag.
-*/
-
-/*! \fn void QTextEdit::setBold( bool b )
-
-  Sets the current format and the selected text (if there is any) to
-  bold, if \a b is TRUE, otherwise unsets the bold flag.
-*/
-
-/*! \fn void QTextEdit::setUnderline( bool b )
-
-  Sets the current format and the selected text (if there is any) to
-  underlined, if \a b is TRUE, otherwise unsets the underlined flag.
-*/
-
-/*! \fn void QTextEdit::setFamily( const QString &f )
-
-  Sets the family of the current format and the selected text (if
-  there is any) to \a f.
-*/
-
-/*! \fn void QTextEdit::setPointSize( int s )
-
-  Sets the point size of the current format and the selected text (if
-  there is any) to \a s.
-
-  Note that if \a s is zero or negative, the behaviour of this
-  function is not defined.
-*/
-
-/*! \fn void QTextEdit::setColor( const QColor &c )
-
-  Sets the color of the current format and the selected text (if there
-  is any) to \a c.
-*/
-
-/*! \fn void QTextEdit::setFont( const QFont &f )
-
-  Sets the font of the current format and the selected text (if there
-  is any) to \a f.
-*/
-
-/*! \fn void QTextEdit::setAlignment( int a )
-
-  Sets the alignment of the paragraph, at which the cursor is placed,
-  to \a a.
-*/
-
-/*! \fn void QTextEdit::setParagType( QStyleSheetItem::DisplayMode dm, QStyleSheetItem::ListStyle listStyle )
-
-  Sets the paragraph style of the paragraph at which the cursor is
-  placed to \a dm. If \a dm is QStyleSheetItem::DisplayListItem, the
-  type of the list item is set to \a listStyle.
-*/
-
-/*! \fn void QTextEdit::setCursorPosition( int parag, int index )
-
-  Sets the cursor to the index \a index in the paragraph \a parag.
-*/
-
-/*! \fn void QTextEdit::setSelection( int parag_from, int index_from, int parag_to, int index_to, int selNum )
-
-  Sets a selection which starts at the index \a index_from in the
-  paragraph \a parag_from and ends at index \a index_to in the
-  paragraph \a parag_to.
-
-  Uses the selection settings of selection \a selNum. If this is 0,
-  this is the default selection.
-*/
-
-/*! \fn void QTextEdit::setSelectionAttributes( int selNum, const QColor &back, bool invertText )
-
-  Sets the background color of the selection \a selNum to \a back and
-  specifies whether the text of this selection should be inverted by \a invertText.
-
-*/
-
-/*! \fn void QTextEdit::setModified( bool m )
-
-  Sets the modified flag of the document to \a m.
-*/
-
-/*! \fn void QTextEdit::resetFormat()
-
-  Resets the current format to the default format.
-*/
-
-/*! \fn void QTextEdit::setUndoDepth( int d )
-
-  Sets the number of steps the undo/redo history can maximally store
-  to \a d.
-*/
-
-/*! \fn void QTextEdit::undoAvailable( bool yes )
-
-  This signal is emitted when the availability of undo changes.  If \a
-  yes is TRUE, then undo() will work until undoAvailable( FALSE ) is
-  next emitted.
-*/
-
-/*! \fn void QTextEdit::modificationChanged( bool m )
-
-  This signal is emitted when the modification of the document
-  changed. If \a m is TRUE, the document got modified, else the
-  modification state has been reset to unmodified.
-*/
-
-/*! \fn void QTextEdit::redoAvailable( bool yes )
-
-  This signal is emitted when the availability of redo changes.  If \a
-  yes is TRUE, then redo() will work until redoAvailable( FALSE ) is
-  next emitted.
-*/
-
-/*! \fn void QTextEdit::currentFontChanged( const QFont &f )
-
-  This signal is emitted if the font of the current format (the format
-  at the position where the cursor is placed) has changed.
-
-  \a f contains the new font.
-*/
-
-/*! \fn void QTextEdit::currentColorChanged( const QColor &c )
-
-  This signal is emitted if the color of the current format (the
-  format at the position where the cursor is placed) has changed.
-
-  \a c contains the new color.
-*/
-
-/*! \fn void QTextEdit::currentAlignmentChanged( int a )
-
-  This signal is emitted if the alignment of the current paragraph
-  (the paragraph at which the cursor is placed) has changed.
-
-  \a a contains the new alignment.
-*/
-
-/*! \fn void QTextEdit::cursorPositionChanged( QTextCursor *c )
-
-  This signal is emitted if the position of the cursor changed. \a c
-  points to the text cursor object.
-*/
-
-/*! \fn void QTextEdit::returnPressed()
-
-  This signal is emitted if the user pressed the RETURN or ENTER key.
-*/
-
-/*! \fn void QTextEdit::setFormat( QTextFormat *f, int flags )
-
-  This functions sets the current format and the selected text (if
-  there is any) to \a f. Only the fields of \a f which are specified
-  by the \a flags are used.
-*/
-
-/*! \fn void QTextEdit::ensureCursorVisible()
-
-  Ensures that the cursor is visible by scrolling the view if needed.
-*/
-
-/*! \fn void QTextEdit::placeCursor( const QPoint &pos, QTextCursor *c )
-
-  Places the cursor \a c at the character which is closest to \a pos
-  (in contents coordinates). If \a c is 0, the default text cursor is
-  used.
-*/
-
-/*! \fn void QTextEdit::moveCursor( MoveDirection direction, bool shift, bool control )
-
-  Moves the text cursor into the \a direction. As this is normally
-  used by some keyevent handler, \a shift and \a control specify the
-  state of the key modifiers which have an influence on the cursor
-  moving.
-*/
-
-/*! \overload void QTextEdit::moveCursor( MoveDirection direction, bool control )
-*/
-
-/*! \fn void QTextEdit::removeSelectedText()
-
-  Deletes the text which is currently selected (if there is any
-  selected).
-*/
-
-/*! \fn void QTextEdit::doKeyboardAction( KeyboardAction action )
-
-  Exectutes the keyboard action \a action. This is normally called by
-  a key event handler.
-*/
-
-/*! \fn QTextCursor *QTextEdit::textCursor() const
-
-  Returns the text cursor if the editor. QTextCursor is not in the
-  public API, but for special cases you might use it anyway. But the
-  API of it might change in an incompatible manner in the future.
-*/
-
-/*! \fn bool QTextEdit::getFormat( int parag, int index, QFont &font, QColor &color )
-
-  This function sets \a font to the font and \a color to the color of
-  the character at position \a index in the paragraph \a parag.
-
-  If \a parag or \a index is out of range, FALSE is returned, else
-  TRUE is returned.
-*/
-
-/*! Constructs a QTextEdit. The \a parent and \a name arguments are as
-  for QWidget. */
-
-Qt3::QTextEdit::QTextEdit( QWidget *parent, const char *name )
-    : Qt3::QTextView( parent, name )
-{
-#ifndef QT_NO_CURSOR
-    viewport()->setCursor( ibeamCursor );
-#endif
-}
-
-/*! \reimp */
-
-Qt3::QTextEdit::~QTextEdit()
-{
-}
-
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qtextedit.h b/bibletime/frontend/thirdparty/qt3stuff/qtextedit.h
deleted file mode 100644
index f77a4e4..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qtextedit.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/****************************************************************************
-** $Id: qtextedit.h,v 1.5 2002/03/19 01:15:56 joachim Exp $
-**
-** Definition of the QTextEdit class
-**
-** Created : 990101
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the widgets module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#ifndef QT3_QTEXTEDIT_H
-#define QT3_QTEXTEDIT_H
-
-#ifndef QT_H
-#include "qlist.h"
-#include "qpixmap.h"
-#include "qcolor.h"
-#endif // QT_H
-
-#include "qtextview.h"
-
-#ifndef QT_NO_TEXTEDIT
-
-namespace Qt3 {
-
-class Q_EXPORT QTextEdit : public Qt3::QTextView
-{
-    Q_OBJECT
-    Q_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth )
-    Q_PROPERTY( bool overWriteMode READ isOverwriteMode WRITE setOverwriteMode )
-
-public:
-    QTextEdit(QWidget *parent = 0, const char *name = 0 );
-    ~QTextEdit();
-
-    void getCursorPosition( int &parag, int &index ) const;
-    bool isModified() const;
-    bool italic() const;
-    bool bold() const;
-    bool underline() const;
-    QString family() const;
-    int pointSize() const;
-    QColor color() const;
-    QFont font() const;
-    int alignment() const;
-    bool isOverwriteMode() const;
-    int undoDepth() const;
-    virtual void insert( const QString &text, bool indent = FALSE, bool checkNewLine = TRUE, bool removeSelected = TRUE );
-    virtual bool getFormat( int parag, int index, QFont &font, QColor &color );
-
-public slots:
-    virtual void setOverwriteMode( bool b );
-    virtual void undo();
-    virtual void redo();
-    virtual void cut();
-    virtual void paste();
-    virtual void pasteSubType( const QCString &subtype );
-    virtual void clear();
-    virtual void del();
-    virtual void indent();
-    virtual void setItalic( bool b );
-    virtual void setBold( bool b );
-    virtual void setUnderline( bool b );
-    virtual void setFamily( const QString &f );
-    virtual void setPointSize( int s );
-    virtual void setColor( const QColor &c );
-    virtual void setFont( const QFont &f );
-    virtual void setAlignment( int a );
-    virtual void setParagType( Qt3::QStyleSheetItem::DisplayMode dm, Qt3::QStyleSheetItem::ListStyle listStyle );
-    virtual void setCursorPosition( int parag, int index );
-    virtual void setSelection( int parag_from, int index_from, int parag_to, int index_to, int selNum = 0 );
-    virtual void setSelectionAttributes( int selNum, const QColor &back, bool invertText );
-    virtual void setModified( bool m );
-    virtual void resetFormat();
-    virtual void setUndoDepth( int d );
-    virtual void removeSelectedText();
-
-signals:
-    void undoAvailable( bool yes );
-    void redoAvailable( bool yes );
-    void currentFontChanged( const QFont &f );
-    void currentColorChanged( const QColor &c );
-    void currentAlignmentChanged( int a );
-    void cursorPositionChanged( Qt3::QTextCursor *c );
-    void returnPressed();
-    void modificationChanged( bool m );
-
-protected:
-    enum KeyboardAction { // keep in sync with QTextView
-	ActionBackspace,
-	ActionDelete,
-	ActionReturn,
-	ActionKill
-    };
-
-    enum MoveDirection { // keep in sync with QTextView
-	MoveLeft,
-	MoveRight,
-	MoveUp,
-	MoveDown,
-	MoveHome,
-	MoveEnd,
-	MovePgUp,
-	MovePgDown
-    };
-
-    void setFormat( Qt3::QTextFormat *f, int flags );
-    void ensureCursorVisible();
-    void placeCursor( const QPoint &pos, Qt3::QTextCursor *c = 0 );
-    void moveCursor( MoveDirection direction, bool shift, bool control );
-    void moveCursor( MoveDirection direction, bool control );
-    void doKeyboardAction( KeyboardAction action );
-    Qt3::QTextCursor *textCursor() const;
-
-private:
-    bool isReadOnly() const { return FALSE; }
-    void emitUndoAvailable( bool b ) { emit undoAvailable( b ); }
-    void emitRedoAvailable( bool b ) { emit redoAvailable( b ); }
-    void emitCurrentFontChanged( const QFont &f ) { emit currentFontChanged( f ); }
-    void emitCurrentColorChanged( const QColor &c ) { emit currentColorChanged( c ); }
-    void emitCurrentAlignmentChanged( int a ) { emit currentAlignmentChanged( a ); }
-    void emitCursorPositionChanged( Qt3::QTextCursor *c ) { emit cursorPositionChanged( c ); }
-    void emitReturnPressed() { emit returnPressed(); }
-    void emitModificationChanged( bool m ) { emit modificationChanged( m ); }
-
-private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
-    QTextEdit( const QTextEdit & );
-    QTextEdit& operator=( const QTextEdit & );
-#endif
-};
-
-};
-
-inline void Qt3::QTextEdit::getCursorPosition( int &parag, int &index ) const
-{
-    Qt3::QTextView::getCursorPosition( parag, index );
-}
-
-inline bool Qt3::QTextEdit::isModified() const
-{
-    return Qt3::QTextView::isModified();
-}
-
-inline bool Qt3::QTextEdit::italic() const
-{
-    return Qt3::QTextView::italic();
-}
-
-inline bool Qt3::QTextEdit::bold() const
-{
-    return Qt3::QTextView::bold();
-}
-
-inline bool Qt3::QTextEdit::underline() const
-{
-    return Qt3::QTextView::underline();
-}
-
-inline QString Qt3::QTextEdit::family() const
-{
-    return Qt3::QTextView::family();
-}
-
-inline int Qt3::QTextEdit::pointSize() const
-{
-    return Qt3::QTextView::pointSize();
-}
-
-inline QColor Qt3::QTextEdit::color() const
-{
-    return Qt3::QTextView::color();
-}
-
-inline QFont Qt3::QTextEdit::font() const
-{
-    return Qt3::QTextView::font();
-}
-
-inline int Qt3::QTextEdit::alignment() const
-{
-    return Qt3::QTextView::alignment();
-}
-
-inline bool Qt3::QTextEdit::isOverwriteMode() const
-{
-    return Qt3::QTextView::isOverwriteMode();
-}
-
-inline int Qt3::QTextEdit::undoDepth() const
-{
-    return Qt3::QTextView::undoDepth();
-}
-
-inline void Qt3::QTextEdit::insert( const QString &text, bool indent, bool checkNewLine, bool removeSelected )
-{
-    Qt3::QTextView::insert( text, indent, checkNewLine, removeSelected );
-}
-
-inline void Qt3::QTextEdit::setOverwriteMode( bool b )
-{
-    Qt3::QTextView::setOverwriteMode( b );
-}
-
-inline void Qt3::QTextEdit::undo()
-{
-    Qt3::QTextView::undo();
-}
-
-inline void Qt3::QTextEdit::redo()
-{
-    Qt3::QTextView::redo();
-}
-
-inline void Qt3::QTextEdit::cut()
-{
-    Qt3::QTextView::cut();
-}
-
-inline void Qt3::QTextEdit::paste()
-{
-    Qt3::QTextView::paste();
-}
-
-inline void Qt3::QTextEdit::pasteSubType( const QCString &subtype )
-{
-    Qt3::QTextView::pasteSubType( subtype );
-}
-
-inline void Qt3::QTextEdit::clear()
-{
-    Qt3::QTextView::clear();
-}
-
-inline void Qt3::QTextEdit::del()
-{
-    Qt3::QTextView::del();
-}
-
-inline void Qt3::QTextEdit::indent()
-{
-    Qt3::QTextView::indent();
-}
-
-inline void Qt3::QTextEdit::setItalic( bool b )
-{
-    Qt3::QTextView::setItalic( b );
-}
-
-inline void Qt3::QTextEdit::setBold( bool b )
-{
-    Qt3::QTextView::setBold( b );
-}
-
-inline void Qt3::QTextEdit::setUnderline( bool b )
-{
-    Qt3::QTextView::setUnderline( b );
-}
-
-inline void Qt3::QTextEdit::setFamily( const QString &f )
-{
-    Qt3::QTextView::setFamily( f );
-}
-
-inline void Qt3::QTextEdit::setPointSize( int s )
-{
-    Qt3::QTextView::setPointSize( s );
-}
-
-inline void Qt3::QTextEdit::setColor( const QColor &c )
-{
-    Qt3::QTextView::setColor( c );
-}
-
-inline void Qt3::QTextEdit::setFont( const QFont &f )
-{
-    Qt3::QTextView::setFontInternal( f );
-}
-
-inline void Qt3::QTextEdit::setAlignment( int a )
-{
-    Qt3::QTextView::setAlignment( a );
-}
-
-inline void Qt3::QTextEdit::setParagType( Qt3::QStyleSheetItem::DisplayMode dm, Qt3::QStyleSheetItem::ListStyle listStyle )
-{
-    Qt3::QTextView::setParagType( dm, listStyle );
-}
-
-inline void Qt3::QTextEdit::setCursorPosition( int parag, int index )
-{
-    Qt3::QTextView::setCursorPosition( parag, index );
-}
-
-inline void Qt3::QTextEdit::setSelection( int parag_from, int index_from, int parag_to, int index_to, int selNum )
-{
-    Qt3::QTextView::setSelection( parag_from, index_from, parag_to, index_to, selNum );
-}
-
-inline void Qt3::QTextEdit::setSelectionAttributes( int selNum, const QColor &back, bool invertText )
-{
-    Qt3::QTextView::setSelectionAttributes( selNum, back, invertText );
-}
-
-inline void Qt3::QTextEdit::setModified( bool m )
-{
-    Qt3::QTextView::setModified( m );
-}
-
-inline void Qt3::QTextEdit::resetFormat()
-{
-    Qt3::QTextView::resetFormat();
-}
-
-inline void Qt3::QTextEdit::setUndoDepth( int d )
-{
-    Qt3::QTextView::setUndoDepth( d );
-}
-
-inline void Qt3::QTextEdit::setFormat( Qt3::QTextFormat *f, int flags )
-{
-    Qt3::QTextView::setFormat( f, flags );
-}
-
-inline void Qt3::QTextEdit::ensureCursorVisible()
-{
-    Qt3::QTextView::ensureCursorVisible();
-}
-
-inline void Qt3::QTextEdit::placeCursor( const QPoint &pos, Qt3::QTextCursor *c )
-{
-    Qt3::QTextView::placeCursor( pos, c );
-}
-
-inline void Qt3::QTextEdit::moveCursor( MoveDirection direction, bool shift, bool control )
-{
-    Qt3::QTextView::moveCursor( (MoveDirectionPrivate)direction, shift, control );
-}
-
-inline void Qt3::QTextEdit::moveCursor( MoveDirection direction, bool control )
-{
-    Qt3::QTextView::moveCursor( (MoveDirectionPrivate)direction, control );
-}
-
-inline void Qt3::QTextEdit::removeSelectedText()
-{
-    Qt3::QTextView::removeSelectedText();
-}
-
-inline void Qt3::QTextEdit::doKeyboardAction( KeyboardAction action )
-{
-    Qt3::QTextView::doKeyboardAction( (KeyboardActionPrivate)action );
-}
-
-inline Qt3::QTextCursor *Qt3::QTextEdit::textCursor() const
-{
-    return cursor;
-}
-
-inline bool Qt3::QTextEdit::getFormat( int parag, int index, QFont &font, QColor &color )
-{
-    return Qt3::QTextView::getFormat( parag, index, font, color );
-}
-
-#endif // QT_NO_TEXTEDIT
-
-#endif
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qtextview.cpp b/bibletime/frontend/thirdparty/qt3stuff/qtextview.cpp
deleted file mode 100644
index 528fd0e..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qtextview.cpp
+++ /dev/null
@@ -1,3155 +0,0 @@
-/****************************************************************************
-** $Id: qtextview.cpp,v 1.4 2001/06/15 13:32:21 joachim Exp $
-**
-** Implementation of the QTextView class
-**
-** Created : 990101
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the widgets module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include "qtextview.h"
-#include "qrichtext_p.h"
-#include "qpainter.h"
-#include "qpen.h"
-#include "qbrush.h"
-#include "qpixmap.h"
-#include "qfont.h"
-#include "qcolor.h"
-#include "qsize.h"
-#include "qevent.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qlistbox.h"
-#include "qvbox.h"
-#include "qapplication.h"
-#include "qclipboard.h"
-#include "qcolordialog.h"
-#include "qfontdialog.h"
-#include "qstylesheet.h"
-#include "qdragobject.h"
-#include "qurl.h"
-#include "qcursor.h"
-#include "qregexp.h"
-#include "qpopupmenu.h"
-
-using namespace Qt3;
-
-struct Qt3::QUndoRedoInfoPrivate
-{
-    QTextString text;
-};
-
-class Qt3::QTextViewPrivate
-{
-public:
-    int id[ 7 ];
-};
-
-static bool block_set_alignment = FALSE;
-
-/*!
-  \class QTextView qtextview.h
-  \brief The QTextView class provides a sophisticated rich text viewer.
-  \ingroup basic
-  \ingroup helpsystem
-
-    QTextView is a widget which can show large amounts of read-only text
-    with varying fonts and font attributes, e.g. different point sizes,
-    colors, bold, italic etc. Paragraphs can have different alignments
-    and word-wrap policies. QTextView can also show images (using
-    QMimeSourceFactory), lists and tables. If the text is too large to
-    view within the widget's viewport, scrollbars will appear. The text
-    view can load both plain text and HTML files (a subset of HTML 4 and
-    CSS1 is supported).
-    The rendering style and valid tags are defined by a styleSheet().
-    Currently a subset of HTML 3.2 and 4, and CSS1 is supported, see
-    setStyleSheet() and QStyleSheet for details. The images identified
-    by image tags are displayed if they can be interpreted using the
-    text view's QMimeSourceFactory. (See setMimeSourceFactory() for
-    details.)
-
-    If you want to provide your users with editable rich text use
-    QTextEdit. If you want a text browser with more navigation use
-    QTextBrowser. If you just need to display a small piece of rich text
-    use QSimpleRichText or QLabel.
-
-    Set the text with setText(). You can include rich text directly in
-    code since it is based on HTML tags, e.g.
-    \code
-	textView->setText( "<font color=\"red\">Red</font>" );
-    \endcode
-    You can append text with append(), for example to display an output log.
-
-    By default the text view will try to guess the format of the text
-    (plain text or HTML) and render accordingly, but you can control
-    this with setTextFormat().
-
-    By default the text view wraps words at whitespace at the width of
-    the text view widget. The setWordWrap() function is used to specify
-    the kind of word wrap you want, or \c NoWrap.
-    Call setWordWrap() to set a fixed pixel width \c FixedPixelWidth, or
-    character column (e.g. 80 column) \c FixedColumnWidth with the
-    pixels or columns specified with setWrapColumnOrWidth(). If you use
-    word wrap to the widget's width \c WidgetWidth, you can specify
-    whether to break on whitespace or anywhere with setWrapPolicy().
-
-    The background color is set differently from other widgets, using
-    setPaper(). You specify a brush style which could be a plain color
-    or a complex pixmap. Hypertext links are automatically
-    underlined; this can be changed with setLinkUnderline(). The tab
-    stop width is set with setTabStops(). The zoomIn() and zoomOut()
-    functions can be used to resize the text by increasing (decreasing
-    for zoomOut()) the point size by one point per call. Images are not
-    affected.
-
-    The entire text is returned by text(), and the text of a particular
-    paragraph by text(int).
-
-    The user can select text in the text view using the mouse. If
-    they've selected text hasSelectedText() will return TRUE. The
-    selection's position can be obtained with getSelection(), and the
-    selection itself is returned by selectedText(). The selection can be
-    copied to the clipboard with copy(). The entire text can be selected
-    (or deselected) with selectAll().
-
-    The lines() function returns the number of lines in the text,
-    paragraphs() returns the number of paragraphs. The number of lines
-    within a particular paragraph is returned by linesOfParagraph(). The
-    length of the text in characters is returned by length().
-
-    You can scroll to an anchor in the text, e.g. \c{<a name="anchor">}
-    with scrollToAnchor(). The find() function can be used to find and
-    highlight (select) a given string within the text.
-
-    The user can navigate the text view by using the scrollbars and by
-    clicking hypertext links with the mouse. The following keyboard
-    shortcuts are also supported:
-
-    <ul>
-    <li><i> Up Arrow </i> Move one line up
-    <li><i> Down Arrow </i> Move one line down
-    <li><i> Left Arrow </i> Move one column left
-    <li><i> Right Arrow </i> Move one column right
-    <li><i> Page Up </i> Move one (viewport) page up
-    <li><i> Page Down </i> Move one (viewport) page down
-    <li><i> Home </i> Move to the beginning of the text
-    <li><i> End </i> Move to the end of the text
-    <li><i> Shift+Wheel</i> Scroll the page horizontally (the Wheel is
-    the mouse wheel)
-    <li><i> Ctrl+Wheel</i> Zoom the text
-    <li>
-    </ul>
-
-    The text view may be able to provide some meta-information. The
-    documentTitle() function will return the text from within HTML
-    \c{<title>} tags.
-
-    The text displayed in a text view has \e context. The context is a
-    path which the text view's QMimeSourceFactory uses to resolve the
-    locations of files and images. It is passed to the
-    mimeSourceFactory() when quering data. (See QTextView::QTextView()
-    and context().)
-
-  Note that we do not intend to add a full-featured web browser widget
-  to Qt (because that would easily double Qt's size and only few
-  applications would benefit from it). In particular, the rich text
-  support in Qt is designed to provide a fast, portable and efficient
-  way to add reasonable online help facilities to applications. We
-  will, however, extend it to some degree in future versions of Qt.
-
-*/
-
-/*!  \fn void QTextView::copyAvailable (bool yes)
-
-  This signal is emitted when text is selected or deselected in the text
-  view.
-
-  When text is selected this signal will be emitted with \a yes set to
-  TRUE. If no text has been selected or if the selected text is
-  deselected this signal is emitted with \a yes set to FALSE.
-
-    If \a yes is TRUE, copy() can be used to copy the selection to the
-    clipboard. If \a yes is FALSE copy() does nothing.
-
-    \sa selectionChanged()
-*/
-
-
-/*!  \fn void QTextView::textChanged()
-
-  This signal is emitted whenever the text in the view changes.
-
-  \sa setText() append()
- */
-
-/*!  \fn void QTextView::selectionChanged()
-
-  This signal is emitted whenever the selection changes.
-
-  \sa copyAvailable()
-*/
-
-/*!  \fn QTextDocument *QTextView::document() const
-
-  This function returns the QTextDocument which is used by the text
-  view.
-
-  QTextDocument is not in the public API and its API might change in an
-  incompatible manner in the future.
-*/
-
-/*!  \fn void QTextView::setDocument( QTextDocument *doc )
-
-  This function sets the QTextDocument which should be used by the text
-  view. This can be used, for example, if you want to display a document
-  using multiple views. You would create a QTextDocument and set it to
-  the text views which should display it. You would need to connect to
-  the textChanged() and selectionChanged() signals of all the text views
-  and update them all accordingly (preferably with a slight delay for
-  efficiency reasons).
-
-  QTextDocument is not in the public API and its API might change in an
-  incompatible manner in the future.
-*/
-
-/*!  Constructs an empty QTextView with the usual \a parent and \a
-  name optional arguments.
-*/
-
-QTextView::QTextView( QWidget *parent, const char *name )
-    : QScrollView( parent, name, WNorthWestGravity | WRepaintNoErase | WResizeNoErase ),
-      doc( new QTextDocument( 0 ) ), undoRedoInfo( doc )
-{
-    init();
-}
-
-/*!  Constructs a QTextView displaying the text \a text with
-  context \a context, with the usual \a parent and \a name optional
-  arguments.
-
-    The \a context is a path which the text view's QMimeSourceFactory
-    uses to resolve the locations of files and images. It is passed to
-    the mimeSourceFactory() when quering data.
-
-    For example if the text contains an image tag,
-    \c{<img src="image.png">}, and the context is "path/to/look/in", the
-    QMimeSourceFactory will try to load the image from
-    "path/to/look/in/image.png". If the tag was
-    \c{<img src="/image.png">}, the context will not be used (because
-    QMimeSourceFactory recognizes that we have given an absolute path)
-    and will try to load "/image.png". The context is applied in exactly
-    the same way to \e hrefs, for example,
-    \c{<a href="target.html">Target</a>}, would resolve to
-    "path/to/look/in/target.html".
-
-*/
-
-QTextView::QTextView( const QString& text, const QString& context,
-		      QWidget *parent, const char *name)
-    : QScrollView( parent, name, WNorthWestGravity | WRepaintNoErase | WResizeNoErase ),
-      doc( new QTextDocument( 0 ) ), undoRedoInfo( doc )
-{
-    init();
-    setText( text, context );
-}
-
-/*! \reimp */
-
-QTextView::~QTextView()
-{
-    delete undoRedoInfo.d;
-    undoRedoInfo.d = 0;
-    delete cursor;
-    delete doc;
-    delete d;
-}
-
-void QTextView::init()
-{
-    d = new QTextViewPrivate;
-    connect( doc, SIGNAL( minimumWidthChanged( int ) ),
-	     this, SLOT( setRealWidth( int ) ) );
-
-    mousePressed = FALSE;
-    inDoubleClick = FALSE;
-    modified = FALSE;
-    onLink = QString::null;
-    overWrite = FALSE;
-    wrapMode = WidgetWidth;
-    wrapWidth = -1;
-    wPolicy = AtWhiteSpace;
-    setMode = Auto;
-    inDnD = FALSE;
-
-    doc->setFormatter( new QTextFormatterBreakWords );
-    currentFormat = doc->formatCollection()->defaultFormat();
-    currentAlignment = Qt3::AlignAuto;
-
-    viewport()->setBackgroundMode( PaletteBase );
-    viewport()->setAcceptDrops( TRUE );
-    resizeContents( 0, doc->lastParag() ?
-		    ( doc->lastParag()->paragId() + 1 ) * doc->formatCollection()->defaultFormat()->height() : 0 );
-
-    setKeyCompression( TRUE );
-    viewport()->setMouseTracking( TRUE );
-#ifndef QT_NO_CURSOR
-    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-    cursor = new QTextCursor( doc );
-
-    formatTimer = new QTimer( this );
-    connect( formatTimer, SIGNAL( timeout() ),
-	     this, SLOT( formatMore() ) );
-    lastFormatted = doc->firstParag();
-
-    scrollTimer = new QTimer( this );
-    connect( scrollTimer, SIGNAL( timeout() ),
-	     this, SLOT( doAutoScroll() ) );
-
-    interval = 0;
-    changeIntervalTimer = new QTimer( this );
-    connect( changeIntervalTimer, SIGNAL( timeout() ),
-	     this, SLOT( doChangeInterval() ) );
-
-    cursorVisible = TRUE;
-    blinkTimer = new QTimer( this );
-    connect( blinkTimer, SIGNAL( timeout() ),
-	     this, SLOT( blinkCursor() ) );
-
-#ifndef QT_NO_DRAGANDDROP
-    dragStartTimer = new QTimer( this );
-    connect( dragStartTimer, SIGNAL( timeout() ),
-	     this, SLOT( startDrag() ) );
-#endif
-
-    resizeTimer = new QTimer( this );
-    connect( resizeTimer, SIGNAL( timeout() ),
-	     this, SLOT( doResize() ) );
-
-    formatMore();
-
-    blinkCursorVisible = FALSE;
-
-    connect( this, SIGNAL( textChanged() ),
-	     this, SLOT( setModified() ) );
-    viewport()->setFocusProxy( this );
-    viewport()->setFocusPolicy( WheelFocus );
-    viewport()->installEventFilter( this );
-    installEventFilter( this );
-
-#if 0 // ### background paper test code
-    QBrush *b = new QBrush( red, QPixmap( "/home/reggie/kde2/share/wallpapers/All-Good-People-1.jpg" ) );
-    doc->setPaper( b );
-    QPalette pal( palette() );
-    pal.setBrush( QColorGroup::Base, *b );
-    setPalette( pal );
-#endif
-}
-
-void QTextView::paintDocument( bool drawAll, QPainter *p, int cx, int cy, int cw, int ch )
-{
-    bool drawCur = hasFocus() || viewport()->hasFocus();
-    if ( isReadOnly() || !cursorVisible )
-	drawCur = FALSE;
-    QColorGroup g = colorGroup();
-    if ( doc->paper() )
-	g.setBrush( QColorGroup::Base, *doc->paper() );
-
-    if ( contentsY() == 0 ) {
-	p->fillRect( contentsX(), contentsY(), visibleWidth(), doc->y(),
-		     g.brush( QColorGroup::Base ) );
-    }
-
-    p->setBrushOrigin( -contentsX(), -contentsY() );
-
-    lastFormatted = doc->draw( p, cx, cy, cw, ch, g, !drawAll, drawCur, cursor );
-
-    if ( lastFormatted == doc->lastParag() )
-	resizeContents( contentsWidth(), doc->height() );
-
-    if ( contentsHeight() < visibleHeight() && ( !doc->lastParag() || doc->lastParag()->isValid() ) && drawAll )
-	p->fillRect( 0, contentsHeight(), visibleWidth(),
-		     visibleHeight() - contentsHeight(), g.brush( QColorGroup::Base ) );
-}
-
-/*! \reimp */
-
-void QTextView::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
-{
-    paintDocument( TRUE, p, cx, cy, cw, ch );
-}
-
-/*! \reimp */
-
-bool QTextView::event( QEvent *e )
-{
-    if ( e->type() == QEvent::AccelOverride && !isReadOnly() ) {
-	QKeyEvent* ke = (QKeyEvent*) e;
-	if ( ke->state() & ControlButton ) {
-	    switch ( ke->key() ) {
-	    case Key_A:
-	    case Key_E:
-#if defined (Q_WS_WIN)
-	    case Key_Insert:
-#endif
-	    case Key_X:
-	    case Key_V:
-	    case Key_C:
-	    case Key_Left:
-	    case Key_Right:
-	    case Key_Up:
-	    case Key_Down:
-	    case Key_Home:
-	    case Key_End:
-		ke->accept();
-	    default:
-		break;
-	    }
-	} else {
-	    switch ( ke->key() ) {
-	    case Key_Delete:
-	    case Key_Home:
-	    case Key_End:
-	    case Key_Backspace:
-		ke->accept();
-	    default:
-		break;
-	    }
-	}
-    }
-    return QWidget::event( e );
-}
-
-/*! Provides scrolling and paging.
- */
-
-void QTextView::keyPressEvent( QKeyEvent *e )
-{
-    changeIntervalTimer->stop();
-    interval = 10;
-
-    if ( isReadOnly() ) {
-	handleReadOnlyKeyEvent( e );
-	changeIntervalTimer->start( 100, TRUE );
-	return;
-    }
-
-
-    bool selChanged = FALSE;
-    for ( int i = 1; i < doc->numSelections(); ++i ) // start with 1 as we don't want to remove the Standard-Selection
- 	selChanged = doc->removeSelection( i ) || selChanged;
-
-    if ( selChanged ) {
-	cursor->parag()->document()->nextDoubleBuffered = TRUE;
-	repaintChanged();
-    }
-
-    bool clearUndoRedoInfo = TRUE;
-
-    switch ( e->key() ) {
-    case Key_Left:
-	moveCursor( MoveLeft, e->state() & ShiftButton, e->state() & ControlButton );
-	break;
-    case Key_Right:
-	moveCursor( MoveRight, e->state() & ShiftButton, e->state() & ControlButton );
-	break;
-    case Key_Up:
-	moveCursor( MoveUp, e->state() & ShiftButton, e->state() & ControlButton );
-	break;
-    case Key_Down:
-	moveCursor( MoveDown, e->state() & ShiftButton, e->state() & ControlButton );
-	break;
-    case Key_Home:
-	moveCursor( MoveHome, e->state() & ShiftButton, e->state() & ControlButton );
-	break;
-    case Key_End:
-	moveCursor( MoveEnd, e->state() & ShiftButton, e->state() & ControlButton );
-	break;
-    case Key_Prior:
-	moveCursor( MovePgUp, e->state() & ShiftButton, e->state() & ControlButton );
-	break;
-    case Key_Next:
-	moveCursor( MovePgDown, e->state() & ShiftButton, e->state() & ControlButton );
-	break;
-    case Key_Return: case Key_Enter:
-	doc->removeSelection( QTextDocument::Standard );
-#ifndef QT_NO_CURSOR
-	viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-	clearUndoRedoInfo = FALSE;
-	doKeyboardAction( ActionReturn );
-	emitReturnPressed();
-	break;
-    case Key_Delete:
-	if ( doc->hasSelection( QTextDocument::Standard ) ) {
-	    removeSelectedText();
-	    break;
-	}
-
-	doKeyboardAction( ActionDelete );
-	clearUndoRedoInfo = FALSE;
-
-	break;
-    case Key_Backspace:
-	if ( doc->hasSelection( QTextDocument::Standard ) ) {
-	    removeSelectedText();
-	    break;
-	}
-
-	if ( !cursor->parag()->prev() &&
-	     cursor->atParagStart() )
-	    break;
-
-	doKeyboardAction( ActionBackspace );
-	clearUndoRedoInfo = FALSE;
-
-	break;
-    case Key_F16: // Copy key on Sun keyboards
-	copy();
-	break;
-    case Key_F18:  // Paste key on Sun keyboards
-	paste();
-	break;
-    case Key_F20:  // Cut key on Sun keyboards
-	cut();
-	break;
-    default: {
-	    if ( e->text().length() &&
-//		 !( e->state() & AltButton ) && !( e->state() & MetaButton ) &&
-		 ( !e->ascii() || e->ascii() >= 32 ) ||
-		 ( e->text() == "\t" && !( e->state() & ControlButton ) ) ) {
-		clearUndoRedoInfo = FALSE;
-		if ( e->key() == Key_Tab ) {
-		    if ( cursor->index() == 0 && cursor->parag()->style() &&
-			 cursor->parag()->style()->displayMode() == QStyleSheetItem::DisplayListItem ) {
-			cursor->parag()->incDepth();
-			drawCursor( FALSE );
-			repaintChanged();
-			drawCursor( TRUE );
-			break;
-		    }
-		}
-		if ( cursor->parag()->style() &&
-		     cursor->parag()->style()->displayMode() == QStyleSheetItem::DisplayBlock &&
-		     cursor->index() == 0 && ( e->text() == "-" || e->text() == "*" ) ) {
-		    setParagType( QStyleSheetItem::DisplayListItem, QStyleSheetItem::ListDisc );
-		} else {
-		    insert( e->text(), TRUE, FALSE );
-		}
-		break;
-	    }
-	    if ( e->state() & ControlButton ) {
-		switch ( e->key() ) {
-		case Key_C: case Key_F16: // Copy key on Sun keyboards
-		    copy();
-		    break;
-		case Key_V:
-		    paste();
-		    break;
-		case Key_X:
-		    cut();
-		    break;
-		case Key_I: case Key_T: case Key_Tab:
-		    indent();
-		    break;
-		case Key_A:
-#if defined(Q_WS_X11)
-		    moveCursor( MoveHome, e->state() & ShiftButton, FALSE );
-#else
-		    selectAll( TRUE );
-#endif
-		    break;
-		case Key_B:
-		    moveCursor( MoveLeft, e->state() & ShiftButton, FALSE );
-		    break;
-		case Key_F:
-		    moveCursor( MoveRight, e->state() & ShiftButton, FALSE );
-		    break;
-		case Key_D:
-		    if ( doc->hasSelection( QTextDocument::Standard ) ) {
-			removeSelectedText();
-			break;
-		    }
-		    doKeyboardAction( ActionDelete );
-		    clearUndoRedoInfo = FALSE;
-		    break;
-		case Key_H:
-		    if ( doc->hasSelection( QTextDocument::Standard ) ) {
-			removeSelectedText();
-			break;
-		    }
-		    if ( !cursor->parag()->prev() &&
-			 cursor->atParagStart() )
-			break;
-
-		    doKeyboardAction( ActionBackspace );
-		    clearUndoRedoInfo = FALSE;
-		    break;
-		case Key_E:
-		    moveCursor( MoveEnd, e->state() & ShiftButton, FALSE );
-		    break;
-		case Key_N:
-		    moveCursor( MoveDown, e->state() & ShiftButton, FALSE );
-		    break;
-		case Key_P:
-		    moveCursor( MoveUp, e->state() & ShiftButton, FALSE );
-		    break;
-		case Key_Z:
-		    undo();
-		    break;
-		case Key_Y:
-		    redo();
-		    break;
-		case Key_K:
-		    doKeyboardAction( ActionKill );
-		    break;
-		case Key_Insert:
-#if defined(Q_WS_WIN)
-		    copy();
-#endif
-		    break;
-		}
-		break;
-	    }
-	}
-    }
-
-    emitCursorPositionChanged( cursor );
-    if ( clearUndoRedoInfo )
-	clearUndoRedo();
-    changeIntervalTimer->start( 100, TRUE );
-}
-
-void QTextView::doKeyboardAction( KeyboardActionPrivate action )
-{
-    if ( isReadOnly() )
-	return;
-
-    if ( cursor->nestedDepth() != 0 ) // #### for 3.0, disable editing of tables as this is not advanced enough
-	return;
-
-    lastFormatted = cursor->parag();
-    drawCursor( FALSE );
-
-    switch ( action ) {
-    case ActionDelete:
-	checkUndoRedoInfo( UndoRedoInfo::Delete );
-	if ( !undoRedoInfo.valid() ) {
-	    undoRedoInfo.id = cursor->parag()->paragId();
-	    undoRedoInfo.index = cursor->index();
-	    undoRedoInfo.d->text = QString::null;
-	}
-	undoRedoInfo.d->text += cursor->parag()->at( cursor->index() )->c;
- 	if ( cursor->parag()->at( cursor->index() )->format() ) {
- 	    cursor->parag()->at( cursor->index() )->format()->addRef();
- 	    undoRedoInfo.d->text.at( undoRedoInfo.d->text.length() - 1 ).setFormat( cursor->parag()->at( cursor->index() )->format() );
- 	}
-	if ( cursor->remove() )
-	    undoRedoInfo.d->text += "\n";
-	break;
-    case ActionBackspace:
-	if ( cursor->parag()->style() && cursor->parag()->style()->displayMode() == QStyleSheetItem::DisplayListItem &&
-	     cursor->index() == 0 ) {
-	    cursor->parag()->decDepth();
-	    lastFormatted = cursor->parag();
-	    repaintChanged();
-	    drawCursor( TRUE );
-	    return;
-	}
-	checkUndoRedoInfo( UndoRedoInfo::Delete );
-	if ( !undoRedoInfo.valid() ) {
-	    undoRedoInfo.id = cursor->parag()->paragId();
-	    undoRedoInfo.index = cursor->index();
-	    undoRedoInfo.d->text = QString::null;
-	}
-	cursor->gotoLeft();
-	undoRedoInfo.d->text.prepend( QString( cursor->parag()->at( cursor->index() )->c ) );
- 	if ( cursor->parag()->at( cursor->index() )->format() ) {
- 	    cursor->parag()->at( cursor->index() )->format()->addRef();
- 	    undoRedoInfo.d->text.at( 0 ).setFormat( cursor->parag()->at( cursor->index() )->format() );
- 	}
-	undoRedoInfo.index = cursor->index();
-	if ( cursor->remove() ) {
-	    undoRedoInfo.d->text.remove( 0, 1 );
-	    undoRedoInfo.d->text.prepend( "\n" );
-	    undoRedoInfo.index = cursor->index();
-	    undoRedoInfo.id = cursor->parag()->paragId();
-	}
-	lastFormatted = cursor->parag();
-	break;
-    case ActionReturn:
-	checkUndoRedoInfo( UndoRedoInfo::Return );
-	if ( !undoRedoInfo.valid() ) {
-	    undoRedoInfo.id = cursor->parag()->paragId();
-	    undoRedoInfo.index = cursor->index();
-	    undoRedoInfo.d->text = QString::null;
-	}
-	undoRedoInfo.d->text += "\n";
-	cursor->splitAndInsertEmptyParag();
-	if ( cursor->parag()->prev() )
-	    lastFormatted = cursor->parag()->prev();
-	break;
-    case ActionKill:
-	checkUndoRedoInfo( UndoRedoInfo::Delete );
-	if ( !undoRedoInfo.valid() ) {
-	    undoRedoInfo.id = cursor->parag()->paragId();
-	    undoRedoInfo.index = cursor->index();
-	    undoRedoInfo.d->text = QString::null;
-	}
-	if ( cursor->atParagEnd() ) {
-	    undoRedoInfo.d->text += cursor->parag()->at( cursor->index() )->c;
-	    if ( cursor->parag()->at( cursor->index() )->format() ) {
-		cursor->parag()->at( cursor->index() )->format()->addRef();
-		undoRedoInfo.d->text.at( undoRedoInfo.d->text.length() - 1 ).setFormat( cursor->parag()->at( cursor->index() )->format() );
-	    }
-	    if ( cursor->remove() )
-		undoRedoInfo.d->text += "\n";
-	} else {
-	    int oldLen = undoRedoInfo.d->text.length();
-	    undoRedoInfo.d->text += cursor->parag()->string()->toString().mid( cursor->index() );
-	    for ( int i = cursor->index(); i < cursor->parag()->length(); ++i ) {
-		if ( cursor->parag()->at( i )->format() ) {
-		    cursor->parag()->at( i )->format()->addRef();
-		    undoRedoInfo.d->text.at( oldLen + i - cursor->index() ).setFormat( cursor->parag()->at( i )->format() );
-		}
-	    }
-	    undoRedoInfo.d->text.remove( undoRedoInfo.d->text.length() - 1, 1 );
-	    cursor->killLine();
-	}
-	break;
-    }
-
-    formatMore();
-    repaintChanged();
-    ensureCursorVisible();
-    drawCursor( TRUE );
-
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-
-    updateCurrentFormat();
-    emit textChanged();
-}
-
-void QTextView::readFormats( QTextCursor &c1, QTextCursor &c2, int oldLen, QTextString &text, bool fillStyles )
-{
-    c2.restoreState();
-    c1.restoreState();
-    if ( c1.parag() == c2.parag() ) {
-	for ( int i = c1.index(); i < c2.index(); ++i ) {
-	    if ( c1.parag()->at( i )->format() ) {
-		c1.parag()->at( i )->format()->addRef();
-		text.at( oldLen + i - c1.index() ).setFormat( c1.parag()->at( i )->format() );
-	    }
-	}
-	if ( fillStyles ) {
-	    undoRedoInfo.oldAligns[ 0 ] = c1.parag()->alignment();
-	    undoRedoInfo.oldStyles << c1.parag()->styleSheetItems();
-	    undoRedoInfo.oldListStyles << c1.parag()->listStyle();
-	}
-    } else {
-	int lastIndex = oldLen;
-	int i;
-	for ( i = c1.index(); i < c1.parag()->length(); ++i ) {
-	    if ( c1.parag()->at( i )->format() ) {
-		c1.parag()->at( i )->format()->addRef();
-		text.at( lastIndex ).setFormat( c1.parag()->at( i )->format() );
-		lastIndex++;
-	    }
-	}
-	lastIndex++;
-	QTextParag *p = c1.parag()->next();
-	while ( p && p != c2.parag() ) {
-	    for ( int i = 0; i < p->length(); ++i ) {
-		if ( p->at( i )->format() ) {
-		    p->at( i )->format()->addRef();
-		    text.at( i + lastIndex ).setFormat( p->at( i )->format() );
-		}
-	    }
-	    lastIndex += p->length() + 1;
-	    p = p->next();
-	}
-	for ( i = 0; i < c2.index(); ++i ) {
-	    if ( c2.parag()->at( i )->format() ) {
-		c2.parag()->at( i )->format()->addRef();
-		text.at( i + lastIndex ).setFormat( c2.parag()->at( i )->format() );
-	    }
-	}
-	if ( fillStyles ) {
-	    QTextParag *p = c1.parag();
-	    i = 0;
-	    while ( p ) {
-		if ( i < (int)undoRedoInfo.oldAligns.size() )
-		    undoRedoInfo.oldAligns[ i ] = p->alignment();
-		undoRedoInfo.oldStyles << p->styleSheetItems();
-		undoRedoInfo.oldListStyles << p->listStyle();
-		if ( p == c2.parag() )
-		    break;
-		p = p->next();
-		++i;
-	    }
-	}
-    }
-}
-
-void QTextView::removeSelectedText()
-{
-    if ( isReadOnly() )
-	return;
-
-    for ( int i = 1; i < (int)doc->numSelections(); ++i )
-	doc->removeSelection( i );
-
-    drawCursor( FALSE );
-    checkUndoRedoInfo( UndoRedoInfo::RemoveSelected );
-    if ( !undoRedoInfo.valid() ) {
-	doc->selectionStart( QTextDocument::Standard, undoRedoInfo.id, undoRedoInfo.index );
-	undoRedoInfo.d->text = QString::null;
-    }
-    int oldLen = undoRedoInfo.d->text.length();
-    undoRedoInfo.d->text = doc->selectedText( QTextDocument::Standard );
-    QTextCursor c1 = doc->selectionStartCursor( QTextDocument::Standard );
-    QTextCursor c2 = doc->selectionEndCursor( QTextDocument::Standard );
-    undoRedoInfo.oldAligns.resize( undoRedoInfo.oldAligns.size() + QMAX( 0, c2.parag()->paragId() - c1.parag()->paragId() + 1 ) );
-    readFormats( c1, c2, oldLen, undoRedoInfo.d->text, TRUE );
-    doc->removeSelectedText( QTextDocument::Standard, cursor );
-    ensureCursorVisible();
-    lastFormatted = cursor->parag();
-    formatMore();
-    repaintChanged();
-    ensureCursorVisible();
-    drawCursor( TRUE );
-    clearUndoRedo();
-    emit textChanged();
-#if defined(Q_WS_WIN)
-    // there seems to be a problem with repainting or erasing the area
-    // of the scrollview which is not the contents on windows
-    if ( contentsHeight() < visibleHeight() )
-	viewport()->repaint( 0, contentsHeight(), visibleWidth(), visibleHeight() - contentsHeight(), TRUE );
-#endif
-#ifndef QT_NO_CURSOR
-    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-}
-
-void QTextView::moveCursor( MoveDirectionPrivate direction, bool shift, bool control )
-{
-    drawCursor( FALSE );
-    if ( shift ) {
-	if ( !doc->hasSelection( QTextDocument::Standard ) )
-	    doc->setSelectionStart( QTextDocument::Standard, cursor );
-	moveCursor( direction, control );
-	if ( doc->setSelectionEnd( QTextDocument::Standard, cursor ) ) {
-	    cursor->parag()->document()->nextDoubleBuffered = TRUE;
-	    repaintChanged();
-	} else {
-	    drawCursor( TRUE );
-	}
-	ensureCursorVisible();
-	emit selectionChanged();
-	emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) );
-    } else {
-	bool redraw = doc->removeSelection( QTextDocument::Standard );
-	moveCursor( direction, control );
-	if ( !redraw ) {
-	    ensureCursorVisible();
-	    drawCursor( TRUE );
-	} else {
-	    cursor->parag()->document()->nextDoubleBuffered = TRUE;
-	    repaintChanged();
-	    ensureCursorVisible();
-	    drawCursor( TRUE );
-#ifndef QT_NO_CURSOR
-	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-	}
-	if ( redraw ) {
-	    emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) );
-	    emit selectionChanged();
-	}
-    }
-
-    drawCursor( TRUE );
-    updateCurrentFormat();
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-}
-
-void QTextView::moveCursor( MoveDirectionPrivate direction, bool control )
-{
-    switch ( direction ) {
-    case MoveLeft: {
-	if ( !control )
-	    cursor->gotoLeft();
-	else
-	    cursor->gotoWordLeft();
-    } break;
-    case MoveRight: {
-	if ( !control )
-	    cursor->gotoRight();
-	else
-	    cursor->gotoWordRight();
-    } break;
-    case MoveUp: {
-	if ( !control )
-	    cursor->gotoUp();
-	else
-	    cursor->gotoPageUp( visibleHeight() );
-    } break;
-    case MoveDown: {
-	if ( !control )
-	    cursor->gotoDown();
-	else
-	    cursor->gotoPageDown( visibleHeight() );
-    } break;
-    case MoveHome: {
-	if ( !control )
-	    cursor->gotoLineStart();
-	else
-	    cursor->gotoHome();
-    } break;
-    case MoveEnd: {
-	if ( !control )
-	    cursor->gotoLineEnd();
-	else
-	    cursor->gotoEnd();
-    } break;
-    case MovePgUp:
-	cursor->gotoPageUp( visibleHeight() );
-	break;
-    case MovePgDown:
-	cursor->gotoPageDown( visibleHeight() );
-	break;
-    }
-
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-    updateCurrentFormat();
-}
-
-/*! \reimp */
-
-void QTextView::resizeEvent( QResizeEvent *e )
-{
-    QScrollView::resizeEvent( e );
-#if defined(Q_WS_X11)
-    if ( e->oldSize().width() != e->size().width() )
-#endif
-	doResize();
-}
-
-void QTextView::ensureCursorVisible()
-{
-    lastFormatted = cursor->parag();
-    formatMore();
-    QTextStringChar *chr = cursor->parag()->at( cursor->index() );
-    int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-    int x = cursor->parag()->rect().x() + chr->x + cursor->offsetX();
-    int y = 0; int dummy;
-    cursor->parag()->lineHeightOfChar( cursor->index(), &dummy, &y );
-    y += cursor->parag()->rect().y() + cursor->offsetY();
-    int w = 1;
-    ensureVisible( x, y + h / 2, w, h / 2 + 2 );
-}
-
-void QTextView::drawCursor( bool visible )
-{
-    if ( !cursor->parag() ||
-	 !cursor->parag()->isValid() ||
-	 ( !hasFocus() && !viewport()->hasFocus() && !inDnD ) ||
-	 isReadOnly() )
-	return;
-
-    QPainter p( viewport() );
-    QRect r( cursor->topParag()->rect() );
-    cursor->parag()->setChanged( TRUE );
-    p.translate( -contentsX() + cursor->totalOffsetX(), -contentsY() + cursor->totalOffsetY() );
-    QPixmap *pix = 0;
-    QColorGroup cg( colorGroup() );
-    if ( cursor->parag()->background() )
-	cg.setBrush( QColorGroup::Base, *cursor->parag()->background() );
-    else if ( doc->paper() )
-	cg.setBrush( QColorGroup::Base, *doc->paper() );
-    p.setBrushOrigin( -contentsX(), -contentsY() );
-    cursor->parag()->document()->nextDoubleBuffered = TRUE;
-    if ( !cursor->nestedDepth() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	p.setClipRect( QRect( r.x() - cursor->totalOffsetX() + cursor->x() - 5 - contentsX(),
-			      r.y() - cursor->totalOffsetY() + cursor->y() - contentsY(), 10, h ) );
-	doc->drawParag( &p, cursor->parag(), r.x() - cursor->totalOffsetX() + cursor->x() - 5,
-			r.y() - cursor->totalOffsetY() + cursor->y(), 10, h, pix, cg, visible, cursor );
-    } else {
-	doc->drawParag( &p, cursor->parag(), r.x() - cursor->totalOffsetX(),
-			r.y() - cursor->totalOffsetY(), r.width(), r.height(),
-			pix, cg, visible, cursor );
-    }
-    cursorVisible = visible;
-}
-
-enum {
-    IdUndo = 0,
-    IdRedo = 1,
-    IdCut = 2,
-    IdCopy = 3,
-    IdPaste = 4,
-    IdClear = 5,
-    IdSelectAll = 6
-};
-
-/*! \reimp */
-
-void QTextView::contentsWheelEvent( QWheelEvent *e )
-{
-    if ( isReadOnly() ) {
-	if ( e->state() & ControlButton ) {
-	    if ( e->delta() > 0 )
-		zoomOut();
-	    else if ( e->delta() < 0 )
-		zoomIn();
-	    return;
-	}
-    }
-    QScrollView::contentsWheelEvent( e );
-}
-
-/*! \reimp */
-
-void QTextView::contentsMousePressEvent( QMouseEvent *e )
-{
-    clearUndoRedo();
-    QTextCursor oldCursor = *cursor;
-    QTextCursor c = *cursor;
-    mousePos = e->pos();
-    mightStartDrag = FALSE;
-    pressedLink = QString::null;
-
-    if ( e->button() == LeftButton ) {
-	mousePressed = TRUE;
-	drawCursor( FALSE );
-	placeCursor( e->pos() );
-	ensureCursorVisible();
-
-	if ( isReadOnly() && linksEnabled() ) {
-	    QTextCursor c = *cursor;
-	    placeCursor( e->pos(), &c );
-	    if ( c.parag() && c.parag()->at( c.index() ) &&
-		 c.parag()->at( c.index() )->format()->isAnchor() ) {
-		pressedLink = c.parag()->at( c.index() )->format()->anchorHref();
-	    }
-	}
-
-#ifndef QT_NO_DRAGANDDROP
-	if ( doc->inSelection( QTextDocument::Standard, e->pos() ) ) {
-	    mightStartDrag = TRUE;
-	    drawCursor( TRUE );
-	    dragStartTimer->start( QApplication::startDragTime(), TRUE );
-	    dragStartPos = e->pos();
-	    return;
-	}
-#endif
-
-	bool redraw = FALSE;
-	if ( doc->hasSelection( QTextDocument::Standard ) ) {
-	    emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) );
-	    emit selectionChanged();
-	    if ( !( e->state() & ShiftButton ) ) {
-		redraw = doc->removeSelection( QTextDocument::Standard );
-		doc->setSelectionStart( QTextDocument::Standard, cursor );
-	    } else {
-		redraw = doc->setSelectionEnd( QTextDocument::Standard, cursor ) || redraw;
-	    }
-	} else {
-	    if ( !( e->state() & ShiftButton ) ) {
-		doc->setSelectionStart( QTextDocument::Standard, cursor );
-	    } else {
-		doc->setSelectionStart( QTextDocument::Standard, &c );
-		redraw = doc->setSelectionEnd( QTextDocument::Standard, cursor ) || redraw;
-	    }
-	}
-
-	for ( int i = 1; i < doc->numSelections(); ++i ) // start with 1 as we don't want to remove the Standard-Selection
-	    redraw = doc->removeSelection( i ) || redraw;
-
-	if ( !redraw ) {
-	    drawCursor( TRUE );
-	} else {
-	    repaintChanged();
-#ifndef QT_NO_CURSOR
-	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-	}
-    } else if ( e->button() == MidButton ) {
-#if 0 // QT2HACK
-	if (QApplication::clipboard()->supportsSelection()) {
-#endif
-	    // only do middle-click pasting on systems that have selections (ie. X11)
-#if 0 // QT2HACK
-	    QApplication::clipboard()->setSelectionMode(TRUE);
-#endif
-	    paste();
-#if 0 // QT2HACK
-	    QApplication::clipboard()->setSelectionMode(FALSE);
-	}
-#endif
-    }
-
-    if ( *cursor != oldCursor )
-	updateCurrentFormat();
-}
-
-/*! \reimp */
-
-void QTextView::contentsMouseMoveEvent( QMouseEvent *e )
-{
-    if ( mousePressed ) {
-#ifndef QT_NO_DRAGANDDROP
-	if ( mightStartDrag ) {
-	    dragStartTimer->stop();
-	    if ( ( e->pos() - dragStartPos ).manhattanLength() > QApplication::startDragDistance() )
-		startDrag();
-	    if ( !isReadOnly() )
-		viewport()->setCursor( ibeamCursor );
-	    return;
-	}
-#endif
-	mousePos = e->pos();
-	doAutoScroll();
-	oldMousePos = mousePos;
-    }
-
-    if ( !isReadOnly() && !mousePressed ) {
-	if ( doc->hasSelection( QTextDocument::Standard ) && doc->inSelection( QTextDocument::Standard, e->pos() ) )
-	    viewport()->setCursor( arrowCursor );
-	else
-	    viewport()->setCursor( ibeamCursor );
-    }
-
-    if ( isReadOnly() && linksEnabled() ) {
-	QTextCursor c = *cursor;
-	placeCursor( e->pos(), &c );
-#ifndef QT_NO_NETWORKPROTOCOL
-	if ( c.parag() && c.parag()->at( c.index() ) &&
-	     c.parag()->at( c.index() )->format()->isAnchor() ) {
-#ifndef QT_NO_CURSOR
-	    viewport()->setCursor( pointingHandCursor );
-#endif
-	    onLink = c.parag()->at( c.index() )->format()->anchorHref();
-	    QUrl u( doc->context(), onLink, TRUE );
-	    emitHighlighted( u.toString( FALSE, FALSE ) );
-	} else {
-#ifndef QT_NO_CURSOR
-	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-	    onLink = QString::null;
-	    emitHighlighted( QString::null );
-	}
-#endif
-    }
-}
-
-/*! \reimp */
-
-void QTextView::contentsMouseReleaseEvent( QMouseEvent * )
-{
-    QTextCursor oldCursor = *cursor;
-    if ( scrollTimer->isActive() )
-	scrollTimer->stop();
-#ifndef QT_NO_DRAGANDDROP
-    if ( dragStartTimer->isActive() )
-	dragStartTimer->stop();
-    if ( mightStartDrag ) {
-	selectAll( FALSE );
-	mousePressed = FALSE;
-    }
-#endif
-    if ( mousePressed ) {
-	mousePressed = FALSE;
-#if 0 // QT2HACK
-	if (QApplication::clipboard()->supportsSelection()) {
-	    QApplication::clipboard()->setSelectionMode(TRUE);
-#endif
-	    // only do middle-click selection on systems that support it (ie. X11)
-	    if ( !doc->selectedText( QTextDocument::Standard ).isEmpty() )
-		doc->copySelectedText( QTextDocument::Standard );
-#if 0 // QT2HACK
-	    QApplication::clipboard()->setSelectionMode(FALSE);
-#endif
-	    emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) );
-	    emit selectionChanged();
-#if 0 // QT2HACK
-	}
-#endif
-    }
-    emitCursorPositionChanged( cursor );
-    if ( oldCursor != *cursor )
-	updateCurrentFormat();
-    inDoubleClick = FALSE;
-
-#ifndef QT_NO_NETWORKPROTOCOL
-    if ( !onLink.isEmpty() && onLink == pressedLink && linksEnabled() ) {
-	QUrl u( doc->context(), onLink, TRUE );
-	emitLinkClicked( u.toString( FALSE, FALSE ) );
-    }
-#endif
-    drawCursor( TRUE );
-}
-
-/*! \reimp */
-
-void QTextView::contentsMouseDoubleClickEvent( QMouseEvent * )
-{
-    QTextCursor c1 = *cursor;
-    QTextCursor c2 = *cursor;
-    c1.gotoWordLeft();
-    c2.gotoWordRight();
-
-    doc->setSelectionStart( QTextDocument::Standard, &c1 );
-    doc->setSelectionEnd( QTextDocument::Standard, &c2 );
-
-    *cursor = c2;
-
-    repaintChanged();
-
-    inDoubleClick = TRUE;
-    mousePressed = TRUE;
-}
-
-#ifndef QT_NO_DRAGANDDROP
-
-/*! \reimp */
-
-void QTextView::contentsDragEnterEvent( QDragEnterEvent *e )
-{
-    e->acceptAction();
-    inDnD = TRUE;
-}
-
-/*! \reimp */
-
-void QTextView::contentsDragMoveEvent( QDragMoveEvent *e )
-{
-    drawCursor( FALSE );
-    placeCursor( e->pos(),  cursor );
-    drawCursor( TRUE );
-    e->acceptAction();
-}
-
-/*! \reimp */
-
-void QTextView::contentsDragLeaveEvent( QDragLeaveEvent * )
-{
-    inDnD = FALSE;
-}
-
-/*! \reimp */
-
-void QTextView::contentsDropEvent( QDropEvent *e )
-{
-    if ( isReadOnly() )
-	return;
-    inDnD = FALSE;
-    e->acceptAction();
-    QString text;
-    int i = -1;
-    while ( ( i = text.find( '\r' ) ) != -1 )
-	text.replace( i, 1, "" );
-    if ( QTextDrag::decode( e, text ) ) {
-	if ( ( e->source() == this ||
-	       e->source() == viewport() ) &&
-	     e->action() == QDropEvent::Move ) {
-	    removeSelectedText();
-	} else {
-	    doc->removeSelection( QTextDocument::Standard );
-#ifndef QT_NO_CURSOR
-	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-	}
-	drawCursor( FALSE );
-	placeCursor( e->pos(),  cursor );
-	drawCursor( TRUE );
-	insert( text, FALSE, TRUE, FALSE );
-    }
-}
-
-#endif
-
-#if 0 // QT2HACK
-/*! \reimp */
-void QTextView::contentsContextMenuEvent( QContextMenuEvent *e )
-{
-    clearUndoRedo();
-
-    e->accept();
-    if ( !isReadOnly() ) {
-	QPopupMenu *popup = createPopupMenu();
-	int r = popup->exec( e->globalPos() );
-	delete popup;
-
-	if ( r == d->id[ IdClear ] )
-	    clear();
-	else if ( r == d->id[ IdSelectAll ] )
-	    selectAll();
- 	else if ( r == d->id[ IdUndo ] )
- 	    undo();
- 	else if ( r == d->id[ IdRedo ] )
- 	    redo();
-#ifndef QT_NO_CLIPBOARD
-	else if ( r == d->id[ IdCut ] )
-	    cut();
-	else if ( r == d->id[ IdCopy ] )
-	    copy();
-	else if ( r == d->id[ IdPaste ] )
-	    paste();
-#endif
-    }
-}
-#endif
-
-void QTextView::doAutoScroll()
-{
-    if ( !mousePressed )
-	return;
-
-    QPoint pos( mapFromGlobal( QCursor::pos() ) );
-    drawCursor( FALSE );
-    QTextCursor oldCursor = *cursor;
-    placeCursor( viewportToContents( pos ) );
-    if ( inDoubleClick ) {
-	QTextCursor cl = *cursor;
-	cl.gotoWordLeft();
-	QTextCursor cr = *cursor;
-	cr.gotoWordRight();
-
-	int diff = QABS( oldCursor.parag()->at( oldCursor.index() )->x - mousePos.x() );
-	int ldiff = QABS( cl.parag()->at( cl.index() )->x - mousePos.x() );
-	int rdiff = QABS( cr.parag()->at( cr.index() )->x - mousePos.x() );
-
-
-	if ( cursor->parag()->lineStartOfChar( cursor->index() ) !=
-	     oldCursor.parag()->lineStartOfChar( oldCursor.index() ) )
-	    diff = 0xFFFFFF;
-
-	if ( rdiff < diff && rdiff < ldiff )
-	    *cursor = cr;
-	else if ( ldiff < diff && ldiff < rdiff )
-	    *cursor = cl;
-	else
-	    *cursor = oldCursor;
-
-    }
-    ensureCursorVisible();
-
-    bool redraw = FALSE;
-    if ( doc->hasSelection( QTextDocument::Standard ) ) {
-	redraw = doc->setSelectionEnd( QTextDocument::Standard, cursor ) || redraw;
-    }
-
-    if ( !redraw ) {
-	drawCursor( TRUE );
-    } else {
-	repaintChanged();
-	drawCursor( TRUE );
-    }
-
-    if ( !scrollTimer->isActive() && pos.y() < 0 || pos.y() > height() )
-	scrollTimer->start( 100, FALSE );
-    else if ( scrollTimer->isActive() && pos.y() >= 0 && pos.y() <= height() )
-	scrollTimer->stop();
-}
-
-void QTextView::placeCursor( const QPoint &pos, QTextCursor *c )
-{
-    if ( !c )
-	c = cursor;
-
-    c->restoreState();
-    QTextParag *s = doc->firstParag();
-    c->place( pos,  s );
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-}
-
-void QTextView::formatMore()
-{
-    if ( !lastFormatted )
-	return;
-
-    int bottom = contentsHeight();
-    int lastBottom = -1;
-    int to = !sender() ? 2 : 20;
-    bool firstVisible = FALSE;
-    QRect cr( contentsX(), contentsY(), visibleWidth(), visibleHeight() );
-    for ( int i = 0; ( i < to || firstVisible ) && lastFormatted; ++i ) {
-	lastFormatted->format();
-	if ( i == 0 )
-	    firstVisible = lastFormatted->rect().intersects( cr );
-	else if ( firstVisible )
-	    firstVisible = lastFormatted->rect().intersects( cr );
-	bottom = QMAX( bottom, lastFormatted->rect().top() +
-		       lastFormatted->rect().height() );
-	lastBottom = lastFormatted->rect().top() + lastFormatted->rect().height();
-	lastFormatted = lastFormatted->next();
-	if ( lastFormatted )
-	    lastBottom = -1;
-    }
-
-    if ( bottom > contentsHeight() && !cursor->document()->parent() )
-	resizeContents( contentsWidth(), QMAX( doc->height(), bottom ) );
-    else if ( lastBottom != -1 && lastBottom < contentsHeight() && !cursor->document()->parent() )
-	resizeContents( contentsWidth(), QMAX( doc->height(), lastBottom ) );
-
-    if ( lastFormatted )
-	formatTimer->start( interval, TRUE );
-    else
-	interval = QMAX( 0, interval );
-}
-
-void QTextView::doResize()
-{
-    if ( wrapMode != WidgetWidth )
-	return;
-    doc->setMinimumWidth( -1, 0 );
-    resizeContents( width() - verticalScrollBar()->width(), contentsHeight() );
-    QScrollView::setHScrollBarMode( AlwaysOff );
-    doc->setWidth( visibleWidth() );
-    wrapWidth = visibleWidth();
-    doc->invalidate();
-    viewport()->repaint( FALSE );
-    lastFormatted = doc->firstParag();
-    interval = 0;
-    formatMore();
-}
-
-/* \internal */
-
-void QTextView::doChangeInterval()
-{
-    interval = 0;
-}
-
-/*! \reimp */
-
-bool QTextView::eventFilter( QObject *o, QEvent *e )
-{
-    if ( !o || !e )
-	return TRUE;
-
-    if ( o == this || o == viewport() ) {
-	if ( e->type() == QEvent::FocusIn ) {
-	    blinkTimer->start( QApplication::cursorFlashTime() / 2 );
-	    return TRUE;
-	} else if ( e->type() == QEvent::FocusOut ) {
-	    blinkTimer->stop();
-	    drawCursor( FALSE );
-	    return TRUE;
-	}
-    }
-
-    return QScrollView::eventFilter( o, e );
-}
-
-void QTextView::insert( const QString &text, bool indent, bool checkNewLine, bool removeSelected )
-{
-    if ( cursor->nestedDepth() != 0 ) // #### for 3.0, disable editing of tables as this is not advanced enough
-	return;
-    QTextCursor c2 = *cursor;
-    QString txt( text );
-    drawCursor( FALSE );
-    if ( !isReadOnly() && doc->hasSelection( QTextDocument::Standard ) && removeSelected ) {
-	checkUndoRedoInfo( UndoRedoInfo::RemoveSelected );
-	if ( !undoRedoInfo.valid() ) {
-	    doc->selectionStart( QTextDocument::Standard, undoRedoInfo.id, undoRedoInfo.index );
-	    undoRedoInfo.d->text = QString::null;
-	}
-	undoRedoInfo.d->text = doc->selectedText( QTextDocument::Standard );
-	doc->removeSelectedText( QTextDocument::Standard, cursor );
-    }
-    checkUndoRedoInfo( UndoRedoInfo::Insert );
-    if ( !undoRedoInfo.valid() ) {
-	undoRedoInfo.id = cursor->parag()->paragId();
-	undoRedoInfo.index = cursor->index();
-	undoRedoInfo.d->text = QString::null;
-    }
-    int oldLen = undoRedoInfo.d->text.length();
-    lastFormatted = checkNewLine && cursor->parag()->prev() ?
-		    cursor->parag()->prev() : cursor->parag();
-    int idx = cursor->index();
-    QTextCursor oldCursor = *cursor;
-    cursor->insert( txt, checkNewLine );
-    if ( doc->useFormatCollection() )
-	cursor->parag()->setFormat( idx, txt.length(), currentFormat, TRUE );
-
-    if ( indent && ( txt == "{" || txt == "}" ) )
-	cursor->indent();
-    formatMore();
-    repaintChanged();
-    ensureCursorVisible();
-    drawCursor( TRUE );
-    undoRedoInfo.d->text += txt;
-
-    if ( !doc->preProcessor() ) {
-	for ( int i = 0; i < (int)txt.length(); ++i ) {
-	    if ( txt[ i ] == '\n' )
-		continue;
-	    if ( c2.parag()->at( c2.index() )->format() ) {
-		c2.parag()->at( c2.index() )->format()->addRef();
-		undoRedoInfo.d->text.setFormat( oldLen + i, c2.parag()->at( c2.index() )->format(), TRUE );
-	    }
-	    c2.gotoRight();
-	}
-    }
-
-    emit textChanged();
-    if ( !removeSelected ) {
-	doc->setSelectionStart( QTextDocument::Standard, &oldCursor );
-	doc->setSelectionEnd( QTextDocument::Standard, cursor );
-	repaintChanged();
-    }
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-}
-
-void QTextView::undo()
-{
-    if ( isReadOnly() )
-	return;
-
-    for ( int i = 0; i < (int)doc->numSelections(); ++i )
-	doc->removeSelection( i );
-
-#ifndef QT_NO_CURSOR
-    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-
-    clearUndoRedo();
-    drawCursor( FALSE );
-    QTextCursor *c = doc->undo( cursor );
-    if ( !c ) {
-	drawCursor( TRUE );
-	return;
-    }
-    lastFormatted = 0;
-    ensureCursorVisible();
-    repaintChanged();
-    drawCursor( TRUE );
-    emit textChanged();
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-}
-
-void QTextView::redo()
-{
-    if ( isReadOnly() )
-	return;
-
-    for ( int i = 0; i < (int)doc->numSelections(); ++i )
-	doc->removeSelection( i );
-
-#ifndef QT_NO_CURSOR
-    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-
-    clearUndoRedo();
-    drawCursor( FALSE );
-    QTextCursor *c = doc->redo( cursor );
-    if ( !c ) {
-	drawCursor( TRUE );
-	return;
-    }
-    lastFormatted = 0;
-    ensureCursorVisible();
-    repaintChanged();
-    ensureCursorVisible();
-    drawCursor( TRUE );
-    emit textChanged();
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-}
-
-void QTextView::paste()
-{
-#ifndef QT_NO_CLIPBOARD
-    if ( isReadOnly() )
-	return;
-    pasteSubType( "plain" );
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-#endif
-}
-
-void QTextView::checkUndoRedoInfo( UndoRedoInfo::Type t )
-{
-    if ( undoRedoInfo.valid() && t != undoRedoInfo.type ) {
-	clearUndoRedo();
-    }
-    undoRedoInfo.type = t;
-}
-
-/*! Repaints changed paragraphs.
-
-    Although used extensively internally you shouldn't need to call it
-    yourself.
-*/
-
-void QTextView::repaintChanged()
-{
-    QPainter p( viewport() );
-    p.translate( -contentsX(), -contentsY() );
-    paintDocument( FALSE, &p, contentsX(), contentsY(), visibleWidth(), visibleHeight() );
-}
-
-void QTextView::cut()
-{
-    if ( isReadOnly() )
-	return;
-
-    if ( doc->hasSelection( QTextDocument::Standard ) ) {
-	doc->copySelectedText( QTextDocument::Standard );
-	removeSelectedText();
-    }
-    if ( hasFocus() || viewport()->hasFocus() ) {
-	int h = cursor->parag()->lineHeightOfChar( cursor->index() );
-	QFont f = cursor->parag()->at( cursor->index() )->format()->font();
-	setMicroFocusHint( cursor->x() - contentsX() + frameWidth(),
-			   cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE/*, &f*/ ); // QT2HACK
-    }
-}
-
-/*! Copies any selected text to the clipboard.
-
-    \sa hasSelectedText() copyAvailable()
- */
-
-void QTextView::copy()
-{
-    if ( !doc->selectedText( QTextDocument::Standard ).isEmpty() )
-	doc->copySelectedText( QTextDocument::Standard );
-}
-
-void QTextView::indent()
-{
-    if ( isReadOnly() )
-	return;
-
-    drawCursor( FALSE );
-    if ( !doc->hasSelection( QTextDocument::Standard ) )
-	cursor->indent();
-    else
-	doc->indentSelection( QTextDocument::Standard );
-    repaintChanged();
-    drawCursor( TRUE );
-    emit textChanged();
-}
-
-/*! Reimplemented to allow tabbing through links
- */
-
-bool QTextView::focusNextPrevChild( bool n )
-{
-    if ( !isReadOnly() || !linksEnabled() )
-	return FALSE;
-    bool b = doc->focusNextPrevChild( n );
-    if ( b ) {
-	repaintChanged();
-	makeParagVisible( doc->focusIndicator.parag );
-    }
-    return b;
-}
-
-void QTextView::setFormat( QTextFormat *f, int flags )
-{
-    if ( isReadOnly() )
-	return;
-
-    if ( doc->hasSelection( QTextDocument::Standard ) ) {
-	drawCursor( FALSE );
-	QString str = doc->selectedText( QTextDocument::Standard );
-	QTextCursor c1 = doc->selectionStartCursor( QTextDocument::Standard );
-	QTextCursor c2 = doc->selectionEndCursor( QTextDocument::Standard );
-	clearUndoRedo();
-	undoRedoInfo.type = UndoRedoInfo::Format;
-	undoRedoInfo.id = c1.parag()->paragId();
-	undoRedoInfo.index = c1.index();
-	undoRedoInfo.eid = c2.parag()->paragId();
-	undoRedoInfo.eindex = c2.index();
-	undoRedoInfo.d->text = str;
-	readFormats( c1, c2, 0, undoRedoInfo.d->text );
-	undoRedoInfo.format = f;
-	undoRedoInfo.flags = flags;
-	clearUndoRedo();
-	doc->setFormat( QTextDocument::Standard, f, flags );
-	repaintChanged();
-	formatMore();
-	drawCursor( TRUE );
-	emit textChanged();
-    }
-    if ( currentFormat && currentFormat->key() != f->key() ) {
-	currentFormat->removeRef();
-	currentFormat = doc->formatCollection()->format( f );
-	if ( currentFormat->isMisspelled() ) {
-	    currentFormat->removeRef();
-	    currentFormat = doc->formatCollection()->format( currentFormat->font(), currentFormat->color() );
-	}
-	emitCurrentFontChanged( currentFormat->font() );
-	emitCurrentColorChanged( currentFormat->color() );
-	if ( cursor->index() == cursor->parag()->length() - 1 ) {
-	    currentFormat->addRef();
-	    cursor->parag()->string()->setFormat( cursor->index(), currentFormat, TRUE );
-	}
-    }
-}
-
-/*! \reimp */
-
-void QTextView::setPalette( const QPalette &p )
-{
-    QScrollView::setPalette( p );
-    if ( textFormat() == PlainText ) {
-	QTextFormat *f = doc->formatCollection()->defaultFormat();
-	f->setColor( colorGroup().text() );
-	viewport()->repaint( FALSE );
-    }
-}
-
-void QTextView::setParagType( QStyleSheetItem::DisplayMode dm, QStyleSheetItem::ListStyle listStyle )
-{
-    if ( isReadOnly() )
-	return;
-
-    drawCursor( FALSE );
-    if ( !doc->hasSelection( QTextDocument::Standard ) ) {
-	clearUndoRedo();
-	undoRedoInfo.type = UndoRedoInfo::ParagType;
-	QValueList< QVector<QStyleSheetItem> > oldStyles;
-	undoRedoInfo.oldStyles.clear();
-	undoRedoInfo.oldStyles << cursor->parag()->styleSheetItems();
-	undoRedoInfo.oldListStyles.clear();
-	undoRedoInfo.oldListStyles << cursor->parag()->listStyle();
-	undoRedoInfo.list = dm == QStyleSheetItem::DisplayListItem;
-	undoRedoInfo.listStyle = listStyle;
-	undoRedoInfo.id = cursor->parag()->paragId();
-	undoRedoInfo.eid = cursor->parag()->paragId();
-	undoRedoInfo.d->text = " ";
-	undoRedoInfo.index = 1;
-	clearUndoRedo();
-	cursor->parag()->setList( dm == QStyleSheetItem::DisplayListItem, listStyle );
-	repaintChanged();
-    } else {
-	QTextParag *start = doc->selectionStart( QTextDocument::Standard );
-	QTextParag *end = doc->selectionEnd( QTextDocument::Standard );
-	lastFormatted = start;
-	clearUndoRedo();
-	undoRedoInfo.type = UndoRedoInfo::ParagType;
-	undoRedoInfo.id = start->paragId();
-	undoRedoInfo.eid = end->paragId();
-	undoRedoInfo.list = dm == QStyleSheetItem::DisplayListItem;
-	undoRedoInfo.listStyle = listStyle;
-	undoRedoInfo.oldStyles.clear();
-	undoRedoInfo.oldListStyles.clear();
-	while ( start ) {
-	    undoRedoInfo.oldStyles << start->styleSheetItems();
-	    undoRedoInfo.oldListStyles << start->listStyle();
-	    start->setList( dm == QStyleSheetItem::DisplayListItem, listStyle );
-	    if ( start == end )
-		break;
-	    start = start->next();
-	}
-	undoRedoInfo.d->text = " ";
-	undoRedoInfo.index = 1;
-	clearUndoRedo();
-	repaintChanged();
-	formatMore();
-    }
-    drawCursor( TRUE );
-    emit textChanged();
-}
-
-void QTextView::setAlignment( int a )
-{
-    if ( isReadOnly() || block_set_alignment )
-	return;
-
-    drawCursor( FALSE );
-    if ( !doc->hasSelection( QTextDocument::Standard ) ) {
-	if ( cursor->parag()->alignment() != a ) {
-	    clearUndoRedo();
-	    undoRedoInfo.type = UndoRedoInfo::Alignment;
-	    QArray<int> oa( 1 );
-	    oa[ 0 ] = cursor->parag()->alignment();
-	    undoRedoInfo.oldAligns = oa;
-	    undoRedoInfo.newAlign = a;
-	    undoRedoInfo.id = cursor->parag()->paragId();
-	    undoRedoInfo.eid = cursor->parag()->paragId();
-	    undoRedoInfo.d->text = " ";
-	    undoRedoInfo.index = 1;
-	    clearUndoRedo();
-	    cursor->parag()->setAlignment( a );
-	    repaintChanged();
-	}
-    } else {
-	QTextParag *start = doc->selectionStart( QTextDocument::Standard );
-	QTextParag *end = doc->selectionEnd( QTextDocument::Standard );
-	lastFormatted = start;
-	int len = end->paragId() - start->paragId() + 1;
-	clearUndoRedo();
-	undoRedoInfo.type = UndoRedoInfo::Alignment;
-	undoRedoInfo.id = start->paragId();
-	undoRedoInfo.eid = end->paragId();
-	QArray<int> oa( QMAX( 0, len ) );
-	int i = 0;
-	while ( start ) {
-	    if ( i < (int)oa.size() )
-		oa[ i ] = start->alignment();
-	    start->setAlignment( a );
-	    if ( start == end )
-		break;
-	    start = start->next();
-	    ++i;
-	}
-	undoRedoInfo.oldAligns = oa;
-	undoRedoInfo.newAlign = a;
-	undoRedoInfo.d->text = " ";
-	undoRedoInfo.index = 1;
-	clearUndoRedo();
-	repaintChanged();
-	formatMore();
-    }
-    drawCursor( TRUE );
-    if ( currentAlignment != a ) {
-	currentAlignment = a;
-	emitCurrentAlignmentChanged( currentAlignment );
-    }
-    emit textChanged();
-}
-
-void QTextView::updateCurrentFormat()
-{
-    int i = cursor->index();
-    if ( i > 0 )
-	--i;
-    if ( currentFormat->key() != cursor->parag()->at( i )->format()->key() && doc->useFormatCollection() ) {
-	if ( currentFormat )
-	    currentFormat->removeRef();
-	currentFormat = doc->formatCollection()->format( cursor->parag()->at( i )->format() );
-	if ( currentFormat->isMisspelled() ) {
-	    currentFormat->removeRef();
-	    currentFormat = doc->formatCollection()->format( currentFormat->font(), currentFormat->color() );
-	}
-	emitCurrentFontChanged( currentFormat->font() );
-	emitCurrentColorChanged( currentFormat->color() );
-    }
-
-    if ( currentAlignment != cursor->parag()->alignment() ) {
-	currentAlignment = cursor->parag()->alignment();
-	block_set_alignment = TRUE;
-	emitCurrentAlignmentChanged( currentAlignment );
-	block_set_alignment = FALSE;
-    }
-}
-
-void QTextView::setItalic( bool b )
-{
-    QTextFormat f( *currentFormat );
-    f.setItalic( b );
-    setFormat( &f, QTextFormat::Italic );
-}
-
-void QTextView::setBold( bool b )
-{
-    QTextFormat f( *currentFormat );
-    f.setBold( b );
-    setFormat( &f, QTextFormat::Bold );
-}
-
-void QTextView::setUnderline( bool b )
-{
-    QTextFormat f( *currentFormat );
-    f.setUnderline( b );
-    setFormat( &f, QTextFormat::Underline );
-}
-
-void QTextView::setFamily( const QString &f_ )
-{
-    QTextFormat f( *currentFormat );
-    f.setFamily( f_ );
-    setFormat( &f, QTextFormat::Family );
-}
-
-void QTextView::setPointSize( int s )
-{
-    QTextFormat f( *currentFormat );
-    f.setPointSize( s );
-    setFormat( &f, QTextFormat::Size );
-}
-
-void QTextView::setColor( const QColor &c )
-{
-    QTextFormat f( *currentFormat );
-    f.setColor( c );
-    setFormat( &f, QTextFormat::Color );
-}
-
-void QTextView::setFontInternal( const QFont &f_ )
-{
-    QTextFormat f( *currentFormat );
-    f.setFont( f_ );
-    setFormat( &f, QTextFormat::Font );
-}
-
-/*! Returns the text of the text view.
-
-  If the text view is readonly (i.e. it is a QTextView or
-  QTextBrowser), the text set with setText() or any append() additions
-  is returned.
-
-  If the text view is editable (i.e. it is a QTextEdit), the current
-  text is returned. If textFormat() is \c RichText the text will
-  contain HTML formatting tags.
- */
-
-QString QTextView::text() const
-{
-    if ( isReadOnly() )
-	return doc->originalText();
-    return doc->text();
-}
-
-/*!
-    Returns the text of the paragraph \a para.
-
-    If textFormat() is \c RichText the text will contain HTML
-    formatting tags.
-*/
-
-QString QTextView::text( int para ) const
-{
-    return doc->text( para );
-}
-
-/*!  Changes the text of the view to the string \a text and the
-  context to \a context. Any previous text is deleted.
-
-  \a text may be interpreted either as plain text or as rich text,
-  depending on the textFormat(). The default setting is \c AutoText,
-  i.e. the text view autodetects the format from \a text.
-
-  The optional \a context is a path which the text view's
-  QMimeSourceFactory uses to resolve the locations of files and images.
-  (See QTextView::QTextView().) It is passed to the mimeSourceFactory()
-  when quering data.
-
-  \sa text(), setTextFormat()
-*/
-
-void QTextView::setText( const QString &text, const QString &context )
-{
-    emitUndoAvailable( FALSE );
-    emitRedoAvailable( FALSE );
-    undoRedoInfo.clear();
-    doc->commands()->clear();
-
-    lastFormatted = 0;
-    cursor->restoreState();
-    doc->setText( text, context );
-    doc->setMinimumWidth( -1, 0 );
-    resizeContents( 0, 0 );
-    cursor->setDocument( doc );
-    cursor->setParag( doc->firstParag() );
-    cursor->setIndex( 0 );
-
-    if ( qApp->font().pointSize() != QScrollView::font().pointSize() )
-	setFont( QScrollView::font() );
-
-    viewport()->repaint( FALSE );
-    emit textChanged();
-    formatMore();
-    updateCurrentFormat();
-}
-
-
-/*!  Finds the next occurrence of the string, \a expr, starting from
-    character position \a index within paragraph \a para.
-
-    If \a para and \a index are both 0 the search begins from the start
-    of the text. If \a cs is TRUE the search is case sensitive,
-    otherwise it is case insensitive. If \a wo is TRUE the search looks
-    for whole word matches only; otherwise it searches for any matching
-    text. If \a forward is TRUE (the default) the search works forward
-    from the starting position to the end of the text, otherwise it
-    works backwards to the beginning of the text.
-
-    If \a expr is found the function returns TRUE and overwrites \a para
-    with the number of the paragraph in which the first character of the
-    match was found and \a index with the index position of that
-    character within the \a para.
-
-    If \a expr is not found the function returns FALSE and the contents
-    of \a index and \a para are undefined.
-*/
-
-bool QTextView::find( const QString &expr, bool cs, bool wo, bool forward,
-		      int *para, int *index )
-{
-    drawCursor( FALSE );
-    doc->removeSelection( QTextDocument::Standard );
-#ifndef QT_NO_CURSOR
-    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-    bool found = doc->find( expr, cs, wo, forward, para, index, cursor );
-    ensureCursorVisible();
-    drawCursor( TRUE );
-    repaintChanged();
-    return found;
-}
-
-void QTextView::blinkCursor()
-{
-    if ( !cursorVisible )
-	return;
-    bool cv = cursorVisible;
-    blinkCursorVisible = !blinkCursorVisible;
-    drawCursor( blinkCursorVisible );
-    cursorVisible = cv;
-}
-
-void QTextView::setCursorPosition( int parag, int index )
-{
-    QTextParag *p = doc->paragAt( parag );
-    if ( !p )
-	return;
-
-    if ( index > p->length() - 1 )
-	index = p->length() - 1;
-
-    drawCursor( FALSE );
-    cursor->setParag( p );
-    cursor->setIndex( index );
-    ensureCursorVisible();
-    drawCursor( TRUE );
-}
-
-void QTextView::getCursorPosition( int &parag, int &index ) const
-{
-    parag = cursor->parag()->paragId();
-    index = cursor->index();
-}
-
-void QTextView::setSelection( int parag_from, int index_from,
-			      int parag_to, int index_to, int selNum )
-{
-    if ( selNum > doc->numSelections() - 1 )
-	doc->addSelection( selNum );
-    QTextParag *p1 = doc->paragAt( parag_from );
-    if ( !p1 )
-	return;
-    QTextParag *p2 = doc->paragAt( parag_to );
-    if ( !p2 )
-	return;
-
-    if ( index_from > p1->length() - 1 )
-	index_from = p1->length() - 1;
-    if ( index_to > p2->length() - 1 )
-	index_to = p2->length() - 1;
-
-    drawCursor( FALSE );
-    QTextCursor c = *cursor;
-    c.setParag( p1 );
-    c.setIndex( index_from );
-    cursor->setParag( p2 );
-    cursor->setIndex( index_to );
-    doc->setSelectionStart( selNum, &c );
-    doc->setSelectionEnd( selNum, cursor );
-    repaintChanged();
-    ensureCursorVisible();
-    drawCursor( TRUE );
-}
-
-/*!
-    If there is a selection \a paraFrom is set to the number of the
-    paragraph in which the selection begins and \a paraTo is set to the
-    number of the paragraph in which the selection ends. (They could be
-    the same.) \a indexFrom is set to the index at which the selection
-    begins within \a paraFrom, and \a indexTo is set to the index at
-    which the selection ends within \a paraTo.
-
-    If there is no selection \a paraFrom, \a indexFrom, \a paraTo and
-    \a indexTo are all set to -1.
-
-    The \a selNum is the number of the selection (since multiple
-    selections are supported). It defaults to 0 (the first selection).
-
-    \sa selectedText()
-
-*/
-
-void QTextView::getSelection( int &paraFrom, int &indexFrom,
-			      int &paraTo, int &indexTo, int selNum ) const
-{
-    if ( !doc->hasSelection( selNum ) ) {
-	paraFrom = -1;
-	indexFrom = -1;
-	paraTo = -1;
-	indexTo = -1;
-	return;
-    }
-
-    doc->selectionStart( selNum, paraFrom, indexFrom );
-    doc->selectionEnd( selNum, paraTo, indexTo );
-}
-
-/*!  Sets the text format to \a format. The options are:
-
-  <ul>
-
-  <li> \c PlainText - all characters, except newlines, are displayed
-  verbatim, including spaces. Whenever a newline appears in the text the
-  text view inserts a hard line break and begins a new paragraph.
-
-  <li> \c RichText - rich text rendering. The available styles are
-  defined in the default stylesheet QStyleSheet::defaultSheet().
-
-  <li> \c AutoText - this is the default. The text view autodetects
-  which rendering style is best, \c PlainText or \c RichText. This is
-  done by using the QStyleSheet::mightBeRichText() heuristic.
-
-  </ul>
-*/
-
-void QTextView::setTextFormat( TextFormat format )
-{
-    doc->setTextFormat( format );
-}
-
-/*!  Returns the current text format.
-
-  \sa setTextFormat()
- */
-
-Qt::TextFormat QTextView::textFormat() const
-{
-    return doc->textFormat();
-}
-
-/*! Returns the number of paragraphs in the text.
- */
-
-int QTextView::paragraphs() const
-{
-    return doc->lastParag()->paragId() + 1;
-}
-
-/*! Returns the number of lines in paragraph \a para.
- */
-
-int QTextView::linesOfParagraph( int para ) const
-{
-    QTextParag *p = doc->paragAt( para );
-    if ( !p )
-	return -1;
-    return p->lines();
-}
-
-/*! Returns the number of lines in the text view.
-
-  WARNING: This function may be slow. Lines change all the time during
-  word wrapping, so this function has to iterate over all the paragraphs
-  and get the number of lines from each one individually.
-*/
-
-int QTextView::lines() const
-{
-    QTextParag *p = doc->firstParag();
-    int l = 0;
-    while ( p ) {
-	l += p->lines();
-	p = p->next();
-    }
-
-    return l;
-}
-
-/*!
-    Returns the line number in paragraph \a para that contains the
-    character with index \a index. If there is no such paragraph or no
-    such character (e.g. the index is out of range) -1 is returned.
-*/
-
-int QTextView::lineOfChar( int para, int index )
-{
-    QTextParag *p = doc->paragAt( para );
-    if ( !p )
-	return -1;
-
-    int idx, line;
-    QTextStringChar *c = p->lineStartOfChar( index, &idx, &line );
-    if ( !c )
-	return -1;
-
-    return line;
-}
-
-void QTextView::setModified( bool m )
-{
-    if ( modified != m )
-	emitModificationChanged( m );
-    modified = m;
-    if ( modified ) {
-	disconnect( this, SIGNAL( textChanged() ),
-		    this, SLOT( setModified() ) );
-    } else {
-	connect( this, SIGNAL( textChanged() ),
-		 this, SLOT( setModified() ) );
-    }
-}
-
-bool QTextView::isModified() const
-{
-    return modified;
-}
-
-void QTextView::setModified()
-{
-    setModified( TRUE );
-}
-
-bool QTextView::italic() const
-{
-    return currentFormat->font().italic();
-}
-
-bool QTextView::bold() const
-{
-    return currentFormat->font().bold();
-}
-
-bool QTextView::underline() const
-{
-    return currentFormat->font().underline();
-}
-
-QString QTextView::family() const
-{
-    return currentFormat->font().family();
-}
-
-int QTextView::pointSize() const
-{
-    return currentFormat->font().pointSize();
-}
-
-QColor QTextView::color() const
-{
-    return currentFormat->color();
-}
-
-QFont QTextView::font() const
-{
-    return currentFormat->font();
-}
-
-int QTextView::alignment() const
-{
-    return currentAlignment;
-}
-
-void QTextView::startDrag()
-{
-#ifndef QT_NO_DRAGANDDROP
-    mousePressed = FALSE;
-    inDoubleClick = FALSE;
-    QDragObject *drag = new QTextDrag( doc->selectedText( QTextDocument::Standard ), viewport() );
-    if ( isReadOnly() ) {
-	drag->dragCopy();
-    } else {
-	if ( drag->drag() && QDragObject::target() != this && QDragObject::target() != viewport() ) {
-	    doc->removeSelectedText( QTextDocument::Standard, cursor );
-	    repaintChanged();
-	}
-    }
-#endif
-}
-
-/*!
-    If \a select is TRUE (the default) all the text is selected.
-    If \a select is FALSE any selected text is deselected (i.e. the
-    selection is cleared).
-*/
-
-void QTextView::selectAll( bool select )
-{
-    if ( !select )
-	doc->removeSelection( QTextDocument::Standard );
-    else
-	doc->selectAll( QTextDocument::Standard );
-    repaintChanged();
-    emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) );
-    emit selectionChanged();
-#ifndef QT_NO_CURSOR
-    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
-#endif
-}
-
-void QTextView::UndoRedoInfo::clear()
-{
-    if ( valid() ) {
-	if ( type == Insert || type == Return )
-	    doc->addCommand( new QTextInsertCommand( doc, id, index, d->text.rawData(), oldStyles, oldListStyles, oldAligns ) );
-	else if ( type == Format )
-	    doc->addCommand( new QTextFormatCommand( doc, id, index, eid, eindex, d->text.rawData(), format, flags ) );
-	else if ( type == Alignment )
-	    doc->addCommand( new QTextAlignmentCommand( doc, id, eid, newAlign, oldAligns ) );
-	else if ( type == ParagType )
-	    doc->addCommand( new QTextParagTypeCommand( doc, id, eid, list, listStyle, oldStyles, oldListStyles ) );
-	else if ( type != Invalid )
-	    doc->addCommand( new QTextDeleteCommand( doc, id, index, d->text.rawData(), oldStyles, oldListStyles, oldAligns ) );
-    }
-    d->text = QString::null;
-    id = -1;
-    index = -1;
-    oldStyles.clear();
-    oldListStyles.clear();
-    oldAligns.resize( 0 );
-}
-
-
-void QTextView::del()
-{
-    if ( doc->hasSelection( QTextDocument::Standard ) ) {
-	removeSelectedText();
-	return;
-    }
-
-    doKeyboardAction( ActionDelete );
-}
-
-
-QTextView::UndoRedoInfo::UndoRedoInfo( QTextDocument *dc )
-    : type( Invalid ), doc( dc )
-{
-    d = new QUndoRedoInfoPrivate;
-    d->text = QString::null;
-    id = -1;
-    index = -1;
-}
-
-QTextView::UndoRedoInfo::~UndoRedoInfo()
-{
-    delete d;
-}
-
-bool QTextView::UndoRedoInfo::valid() const
-{
-    return d->text.length() > 0  && id >= 0 && index >= 0;
-}
-
-void QTextView::resetFormat()
-{
-    setAlignment( Qt3::AlignAuto );
-    setParagType( QStyleSheetItem::DisplayBlock, QStyleSheetItem::ListDisc );
-    setFormat( doc->formatCollection()->defaultFormat(), QTextFormat::Format );
-}
-
-/*! Returns the QStyleSheet which is currently used in this text view.
- */
-
-QStyleSheet* QTextView::styleSheet() const
-{
-    return doc->styleSheet();
-}
-
-/*! Sets the stylesheet to use with this text view.
- */
-
-void QTextView::setStyleSheet( QStyleSheet* styleSheet )
-{
-    doc->setStyleSheet( styleSheet );
-}
-
-/*!
-    Sets the background (paper) to be drawn with brush \a pap.
- */
-
-void QTextView::setPaper( const QBrush& pap )
-{
-    doc->setPaper( new QBrush( pap ) );
-    viewport()->setBackgroundColor( pap.color() );
-    viewport()->update();
-}
-
-/*! Returns the brush which is used for the background, or an empty
-  brush if setPaper() has never been called.
-*/
-
-QBrush QTextView::paper() const
-{
-    if ( doc->paper() )
-	return *doc->paper();
-    return QBrush();
-}
-
-/*!
-    If \b is TRUE links will be displayed underlined. If \b is FALSE
-    links will not be displayed underlined.
-
-*/
-
-void QTextView::setLinkUnderline( bool b )
-{
-    doc->setUnderlineLinks( b );
-}
-
-/*! Returns TRUE if links will be displayed underlined, otherwise
- returns FALSE.
- */
-
-bool QTextView::linkUnderline() const
-{
-    return doc->underlineLinks();
-}
-
-/*! Sets the text view's mimesource factory to \a factory. See
-    QMimeSourceFactory for further details.
- */
-
-void QTextView::setMimeSourceFactory( QMimeSourceFactory* factory )
-{
-    doc->setMimeSourceFactory( factory );
-}
-
-/*! Returns the QMimeSourceFactory which is currently used by this
-  text view.
-*/
-
-QMimeSourceFactory* QTextView::mimeSourceFactory() const
-{
-    return doc->mimeSourceFactory();
-}
-
-/*!
-    Returns how many pixels high the text view needs to be to display
-    the text if the text view is \a w pixels wide.
-*/
-
-int QTextView::heightForWidth( int w ) const
-{
-    int oldw = doc->width();
-    doc->doLayout( 0, w );
-    int h = doc->height();
-    doc->setWidth( oldw );
-    doc->invalidate();
-    ( (QTextView*)this )->formatMore();
-    return h;
-}
-
-/*! Appends the text \a text at the end of the text view.
- */
-
-void QTextView::append( const QString &text )
-{
-    doc->removeSelection( QTextDocument::Standard );
-    TextFormat f = doc->textFormat();
-    if ( f == AutoText ) {
-	if ( QStyleSheet::mightBeRichText( text ) )
-	    f = RichText;
-	else
-	    f = PlainText;
-    }
-    if ( f == PlainText ) {
-	QTextCursor oldc( *cursor );
-	cursor->gotoEnd();
-	insert( text, FALSE, TRUE );
-	*cursor = oldc;
-    } else if ( f == RichText ) {
-	doc->setRichTextInternal( text );
-	repaintChanged();
-    }
-}
-
-/*! Returns TRUE if some text is selected, otherwise returns FALSE.
- */
-
-bool QTextView::hasSelectedText() const
-{
-    return doc->hasSelection( QTextDocument::Standard );
-}
-
-/*!
-   Returns the selected text or an empty string if there is no currently
-   selected text.
-
-   The text is always returned as \c PlainText regardless of the text
-   format. In a future release of Qt an HTML subset may be returned
-   depending on the text format.
- */
-
-QString QTextView::selectedText() const
-{
-    return doc->selectedText( QTextDocument::Standard );
-}
-
-void QTextView::handleReadOnlyKeyEvent( QKeyEvent *e )
-{
-    switch( e->key() ) {
-    case Key_Down:
-	setContentsPos( contentsX(), contentsY() + 10 );
-	break;
-    case Key_Up:
-	setContentsPos( contentsX(), contentsY() - 10 );
-	break;
-    case Key_Left:
-	setContentsPos( contentsX() - 10, contentsY() );
-	break;
-    case Key_Right:
-	setContentsPos( contentsX() + 10, contentsY() );
-	break;
-    case Key_PageUp:
-	setContentsPos( contentsX(), contentsY() - visibleHeight() );
-	break;
-    case Key_PageDown:
-	setContentsPos( contentsX(), contentsY() + visibleHeight() );
-	break;
-    case Key_Home:
-	setContentsPos( contentsX(), 0 );
-	break;
-    case Key_End:
-	setContentsPos( contentsX(), contentsHeight() - visibleHeight() );
-	break;
-#ifndef QT_NO_NETWORKPROTOCOL
-    case Key_Return:
-    case Key_Enter:
-    case Key_Space: {
-	if ( !doc->focusIndicator.href.isEmpty() ) {
-	    QUrl u( doc->context(), doc->focusIndicator.href, TRUE );
-	    emitLinkClicked( u.toString( FALSE, FALSE ) );
-	}
-    } break;
-#endif
-    default:
-	break;
-    }
-}
-
-/*!  Returns the context of the view.
-
-    The context is a path which the text view's QMimeSourceFactory
-    uses to resolve the locations of files and images.
-
-  \sa text(), setText()
-*/
-
-QString QTextView::context() const
-{
-    return doc->context();
-}
-
-/*!  Returns the document title parsed from the text.
-
-    For \c PlainText the title will be an empty string. For \c RichText
-    the title will be the text between the \c{<title>} tags, if present,
-    otherwise an empty string.
-
-*/
-
-QString QTextView::documentTitle() const
-{
-    return doc->attributes()[ "title" ];
-}
-
-void QTextView::makeParagVisible( QTextParag *p )
-{
-    setContentsPos( contentsX(), QMIN( p->rect().y(), contentsHeight() - visibleHeight() ) );
-}
-
-/*! Scrolls the text view to make the anchor called \a name visible, if
- it can be found in the document. An anchor is defined using the HTML
- anchor tag, e.g. \c{<a name="target">}.
-*/
-
-void QTextView::scrollToAnchor( const QString& name )
-{
-    if ( name.isEmpty() )
-	return;
-
-    QTextParag *p = doc->firstParag();
-
-    if ( !doc->lastParag()->isValid() ) {
-	while ( p ) {
-	    if ( !p->isValid() )
-		p->format();
-	    p = p->next();
-	}
-	resizeContents( contentsWidth(), doc->height() );
-    }
-
-    p = doc->firstParag();
-    while ( p ) {
-	for ( int i = 0; i < p->length(); ++i ) {
-	    if ( p->at( i )->format()->isAnchor() &&
-		 p->at( i )->format()->anchorName() == name ) {
-		makeParagVisible( p );
-		return;
-	    }
-	}
-	p = p->next();
-    }
-}
-
-/*! If there is an anchor at position \a pos (in contents
-  coordinates), its name is returned, otherwise an empty string is
-  returned.
-*/
-
-QString QTextView::anchorAt( const QPoint& pos )
-{
-    QTextCursor c( doc );
-    placeCursor( pos, &c );
-    return c.parag()->at( c.index() )->format()->anchorHref();
-}
-
-void QTextView::setRealWidth( int w )
-{
-    w = QMAX( w, visibleWidth() - verticalScrollBar()->width() );
-    resizeContents( w, contentsHeight() );
-    QScrollView::setHScrollBarMode( setMode );
-}
-
-/*!
-    Updates all the rendering styles used to display the text. Call this
-    function after you change the styleSheet().
-*/
-
-void QTextView::updateStyles()
-{
-    doc->updateStyles();
-}
-
-void QTextView::setDocument( QTextDocument *dc )
-{
-    if ( dc == doc )
-	return;
-    doc = dc;
-    cursor->setDocument( doc );
-    clearUndoRedo();
-    lastFormatted = 0;
-}
-
-#ifndef QT_NO_CLIPBOARD
-
-/*!
-  Copies text in MIME subtype \a subtype from the clipboard (if there is
-  any) into the text view at the current text cursor position.
-  Any selected (marked) text is first deleted.
-*/
-void QTextView::pasteSubType( const QCString& subtype )
-{
-    QCString st = subtype;
-    QString t = QApplication::clipboard()->text(st);
-    if ( !t.isEmpty() ) {
-#if defined(Q_OS_WIN32)
-	// Need to convert CRLF to NL
-	QRegExp crlf( QString::fromLatin1("\r\n") );
-	t.replace( crlf, QChar('\n') );
-#endif
-	for ( int i=0; (uint) i<t.length(); i++ ) {
-	    if ( t[ i ] < ' ' && t[ i ] != '\n' && t[ i ] != '\t' )
-		t[ i ] = ' ';
-	}
-	if ( !t.isEmpty() )
-	    insert( t, FALSE, TRUE );
-    }
-}
-
-#ifndef QT_NO_MIMECLIPBOARD
-/*!
-  Prompts the user to choose a type from a list of text types available,
-  then copies text from the clipboard (if there is any) into the text
-  view at the current text cursor position. Any selected (marked) text
-  is first deleted.
-*/
-void QTextView::pasteSpecial( const QPoint& pt )
-{
-    QCString st = pickSpecial( QApplication::clipboard()->data(), TRUE, pt );
-    if ( !st.isEmpty() )
-	pasteSubType( st );
-}
-#endif
-#ifndef QT_NO_MIME
-QCString QTextView::pickSpecial( QMimeSource* ms, bool always_ask, const QPoint& pt )
-{
-    if ( ms )  {
-	QPopupMenu popup( this );
-	QString fmt;
-	int n = 0;
-	QDict<void> done;
-	for (int i = 0; !( fmt = ms->format( i ) ).isNull(); i++) {
-	    int semi = fmt.find( ";" );
-	    if ( semi >= 0 )
-		fmt = fmt.left( semi );
-	    if ( fmt.left( 5 ) == "text/" ) {
-		fmt = fmt.mid( 5 );
-		if ( !done.find( fmt ) ) {
-		    done.insert( fmt,(void*)1 );
-		    popup.insertItem( fmt, i );
-		    n++;
-		}
-	    }
-	}
-	if ( n ) {
-	    int i = n ==1 && !always_ask ? popup.idAt( 0 ) : popup.exec( pt );
-	    if ( i >= 0 )
-		return popup.text(i).latin1();
-	}
-    }
-    return QCString();
-}
-#endif // QT_NO_MIME
-#endif // QT_NO_CLIPBOARD
-
-/*! \enum QTextView::WordWrap
-
-  This enum describes the QTextView's word wrap modes.  The following
-  values are valid:
-
-  \value NoWrap  Do not wrap the text.
-
-  \value WidgetWidth Wrap the text at the current width of the
-  widget (this is the default). Wrapping is at whitespace by default;
-  this can be changed with setWrapPolicy().
-
-  \value FixedPixelWidth Wrap at a fixed number of pixels from the
-  widget's left side. The number of pixels is set with
-  wrapColumnOrWidth().
-
-  \value FixedColumnWidth Wrap at a fixed number of character columns
-  from the widget's left side. The number of characters is set with
-  wrapColumnOrWidth().
-  This is useful whenever you need formatted text that can also be
-  displayed gracefully on devices with monospaced fonts, for example a
-  standard VT100 terminal, where you might set wrapColumnOrWidth() to
-  80.
-
- \sa setWordWrap()
-*/
-
-/*!  Sets the word wrap mode.
-
-    The default mode is \c WidgetWidth which causes words to be wrapped
-    at the right edge of the widget. Wrapping occurs at spaces, keeping
-    whole words intact. If you want wrapping to occur within words use
-    setWrapPolicy(). If you set a wrap mode of \c FixedPixelWidth or \c
-    FixedColumnWidth you should also call setWrapColumnOrWidth() to set
-    the width you want.
-
-  \sa wordWrap(), setWrapColumnOrWidth(), setWrapPolicy()
-*/
-
-void QTextView::setWordWrap( WordWrap mode )
-{
-    wrapMode = mode;
-    switch ( mode ) {
-    case NoWrap:
-	document()->formatter()->setWrapEnabled( FALSE );
-	document()->formatter()->setWrapAtColumn( -1 );
-	break;
-    case WidgetWidth:
-	document()->formatter()->setWrapEnabled( TRUE );
-	document()->formatter()->setWrapAtColumn( -1 );
-	doResize();
-	break;
-    case FixedPixelWidth:
-	document()->formatter()->setWrapEnabled( TRUE );
-	document()->formatter()->setWrapAtColumn( -1 );
-	setWrapColumnOrWidth( wrapWidth );
-	break;
-    case FixedColumnWidth:
-	document()->formatter()->setWrapEnabled( TRUE );
-	document()->formatter()->setWrapAtColumn( wrapWidth );
-	setWrapColumnOrWidth( wrapWidth );
-	break;
-    }
-}
-
-/*!  Returns the current word wrap mode.
-
-  \sa setWordWrap()
- */
-QTextView::WordWrap QTextView::wordWrap() const
-{
-    return wrapMode;
-}
-
-/*!
-    If the wrap mode is \c FixedPixelWidth, the \a value is the number
-    of pixels from the left edge of the widget at which text should be
-    wrapped. If the wrap mode is \c FixedColumnWidth, the \a value is
-    the column number (in character columns) from the left edge of the
-    widget at which text should be wrapped.
-
-  \sa setWordWrap()
- */
-
-void QTextView::setWrapColumnOrWidth( int value )
-{
-    wrapWidth = value;
-    if ( wrapMode == FixedColumnWidth ) {
-	document()->formatter()->setWrapAtColumn( wrapWidth );
-    } else {
-	document()->formatter()->setWrapAtColumn( -1 );
-	resizeContents( wrapWidth, contentsHeight() );
-	doc->setWidth( wrapWidth );
-	doc->invalidate();
-	viewport()->repaint( FALSE );
-	lastFormatted = doc->firstParag();
-	interval = 0;
-	formatMore();
-    }
-}
-
-/*!
-    If the wrap mode is \c FixedPixelWidth, returns the number of pixels
-    from the left edge of the widget at which text is wrapped. If the
-    wrap mode is \c FixedColumnWidth, returns the column number (in
-    character columns) from the left edge of the widget at which text is
-    wrapped.
-
-  \sa setWordWrap(), setWrapColumnOrWidth()
- */
-int QTextView::wrapColumnOrWidth() const
-{
-    return wrapWidth;
-}
-
-
-/*! \enum QTextView::WrapPolicy
-
-  Defines where text can be wrapped in word wrap mode.
-
-  The following values are valid:
-  \value AtWhiteSpace  Break lines at whitespace, e.g. spaces or
-  newlines.
-  \value Anywhere  Break anywhere, including within words.
-
-   \sa setWrapPolicy()
-*/
-
-/*!  Defines where text can be wrapped when word wrap mode is not \a
-    NoWrap. The choices are \c AtWhiteSpace (the default) and \c
-    Anywhere.
-
-  \sa setWordWrap(), wrapPolicy()
- */
-
-void QTextView::setWrapPolicy( WrapPolicy policy )
-{
-    if ( wPolicy == policy )
-	return;
-    QTextFormatter *formatter;
-    if ( policy == AtWhiteSpace )
-	formatter = new QTextFormatterBreakWords;
-    else
-	formatter = new QTextFormatterBreakInWords;
-    formatter->setWrapAtColumn( document()->formatter()->wrapAtColumn() );
-    formatter->setWrapEnabled( document()->formatter()->isWrapEnabled() );
-    document()->setFormatter( formatter );
-    doc->invalidate();
-    viewport()->repaint( FALSE );
-    lastFormatted = doc->firstParag();
-    interval = 0;
-    formatMore();
-}
-
-/*!
-
-  Returns the current word wrap policy.
-
-  \sa setWrapPolicy()
- */
-QTextView::WrapPolicy QTextView::wrapPolicy() const
-{
-    return wPolicy;
-}
-
-/*! Deletes the contents of the text view.
- */
-
-void QTextView::clear()
-{
-    cursor->restoreState();
-    doc->clear( TRUE );
-    cursor->setDocument( doc );
-    cursor->setParag( doc->firstParag() );
-    cursor->setIndex( 0 );
-    viewport()->repaint( FALSE );
-}
-
-int QTextView::undoDepth() const
-{
-    return document()->undoDepth();
-}
-
-/*! Returns the number of characters of the text.
- */
-
-int QTextView::length() const
-{
-    return document()->length();
-}
-
-/*! Returns the tab width used by the text view.
- */
-
-int QTextView::tabStopWidth() const
-{
-    return document()->tabStopWidth();
-}
-
-void QTextView::setUndoDepth( int d )
-{
-    document()->setUndoDepth( d );
-}
-
-/*! Sets the tab width used by the text view to \a ts.
- */
-
-void QTextView::setTabStops( int ts )
-{
-    document()->setTabStops( ts );
-}
-
-/*! \reimp */
-
-void  QTextView::setHScrollBarMode( ScrollBarMode sm )
-{
-    setMode = sm;
-}
-
-/*! \reimp */
-
-QSize QTextView::sizeHint() const
-{
-    // ### calculate a reasonable one
-    return QSize( 100, 100 );
-}
-
-void QTextView::clearUndoRedo()
-{
-    undoRedoInfo.clear();
-    emitUndoAvailable( doc->commands()->isUndoAvailable() );
-    emitRedoAvailable( doc->commands()->isRedoAvailable() );
-}
-
-bool QTextView::getFormat( int parag, int index, QFont &font, QColor &color )
-{
-    QTextParag *p = doc->paragAt( parag );
-    if ( !p )
-	return FALSE;
-    if ( index < 0 || index >= p->length() )
-	return FALSE;
-    font = p->at( index )->format()->font();
-    color = p->at( index )->format()->color();
-    return TRUE;
-}
-
-/*! This function is called to create the popup menu which is shown
-  when the user clicks on the text view with the right mouse button. If
-  you want to create a custom popup menu, reimplement this function
-  and return the created popup menu. Ownership is transferred to
-  the caller.
-*/
-
-QPopupMenu *QTextView::createPopupMenu()
-{
-    QPopupMenu *popup = new QPopupMenu( this );
-    d->id[ IdUndo ] = popup->insertItem( tr( "Undo" ) );
-    d->id[ IdRedo ] = popup->insertItem( tr( "Redo" ) );
-    popup->insertSeparator();
-#ifndef QT_NO_CLIPBOARD
-    d->id[ IdCut ] = popup->insertItem( tr( "Cut" ) );
-    d->id[ IdCopy ] = popup->insertItem( tr( "Copy" ) );
-    d->id[ IdPaste ] = popup->insertItem( tr( "Paste" ) );
-#endif
-    d->id[ IdClear ] = popup->insertItem( tr( "Clear" ) );
-    popup->insertSeparator();
-    d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) );
-    popup->setItemEnabled( d->id[ IdUndo ], !isReadOnly() && doc->commands()->isUndoAvailable() );
-    popup->setItemEnabled( d->id[ IdRedo ], !isReadOnly() && doc->commands()->isRedoAvailable() );
-#ifndef QT_NO_CLIPBOARD
-    popup->setItemEnabled( d->id[ IdCut ], !isReadOnly() && doc->hasSelection( QTextDocument::Standard ) );
-    popup->setItemEnabled( d->id[ IdCopy ], doc->hasSelection( QTextDocument::Standard ) );
-    popup->setItemEnabled( d->id[ IdPaste ], !isReadOnly() && !QApplication::clipboard()->text().isEmpty() );
-#endif
-    popup->setItemEnabled( d->id[ IdClear ], !isReadOnly() && !text().isEmpty() );
-    popup->setItemEnabled( d->id[ IdSelectAll ], (bool)text().length() );
-    return popup;
-}
-
-/*! \reimp */
-
-void QTextView::setFont( const QFont &f )
-{
-    QScrollView::setFont( f );
-    doc->setMinimumWidth( -1, 0 );
-
-    // ### that is a bit hacky
-    static short diff = 1;
-    diff *= -1;
-    doc->setWidth( visibleWidth() + diff );
-
-    doc->updateFontSizes( f.pointSize() );
-    lastFormatted = doc->firstParag();
-    formatMore();
-    repaintChanged();
-}
-
-/*! \fn zoomIn()
-
-    Zooms in on the text by by making the standard font size one
-    point larger and recalculating all font sizes. This does not change
-    the size of images.
-
-*/
-
-/*! \fn zoomOut()
-
-    Zooms out on the text by by making the standard font size one
-    point smaller and recalculating all font sizes. This does not change
-    the size of images.
-
-*/
-
-
-/*!
-    Zooms in on the text by by making the standard font size \a range
-    points larger and recalculating all font sizes. This does not change
-    the size of images.
-*/
-
-void QTextView::zoomIn( int range )
-{
-    QFont f( QScrollView::font() );
-    f.setPointSize( f.pointSize() + range );
-    setFont( f );
-}
-
-/*! Zooms out on the text by making the standard font size \a range
-    points smaller and recalculating all font sizes. This does not
-    change the size of images.
-*/
-
-void QTextView::zoomOut( int range )
-{
-    QFont f( QScrollView::font() );
-    f.setPointSize( QMAX( 1, f.pointSize() - range ) );
-    setFont( f );
-}
-
-/* As the engine of QTextView is optimized for large amounts text, it
-   is not sure that after e.g. calling setText() the whole document is
-   formatted, as only the visible part is formatted immediately, and
-   the rest delayed or on demand if needed.
-
-   If you need some information (like contentsHeight() to get the
-   height of the document) to be correct after e.g. calling setText(),
-   call this function to ensure that the whole document has been
-   formatted properly.
-*/
-
-void QTextView::sync()
-{
-    if ( !lastFormatted )
-	return;
-    QTextParag *p = lastFormatted;
-    while ( p ) {
-	p->format();
-	p = p->next();
-    }
-    resizeContents( contentsWidth(), doc->height() );
-}
-
-/*! \reimp */
-
-void QTextView::setEnabled( bool b )
-{
-    QScrollView::setEnabled( b );
-    if ( textFormat() == PlainText ) {
-	QTextFormat *f = doc->formatCollection()->defaultFormat();
-	f->setColor( colorGroup().text() );
-	viewport()->repaint( FALSE );
-    }
-}
-
-void QTextView::setSelectionAttributes( int selNum, const QColor &back, bool invertText )
-{
-    if ( selNum < 1 )
-	return;
-    if ( selNum > doc->numSelections() )
-	doc->addSelection( selNum );
-    doc->setSelectionColor( selNum, back );
-    doc->setInvertSelectionText( selNum, invertText );
-}
diff --git a/bibletime/frontend/thirdparty/qt3stuff/qtextview.h b/bibletime/frontend/thirdparty/qt3stuff/qtextview.h
deleted file mode 100644
index b4d4c03..0000000
--- a/bibletime/frontend/thirdparty/qt3stuff/qtextview.h
+++ /dev/null
@@ -1,377 +0,0 @@
-/****************************************************************************
-** $Id: qtextview.h,v 1.6 2002/03/19 01:15:56 joachim Exp $
-**
-** Definition of the QTextView class
-**
-** Created : 990101
-**
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of the widgets module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#ifndef QT3_QTEXTVIEW_H
-#define QT3_QTEXTVIEW_H
-
-#ifndef QT_H
-#include "qscrollview.h"
-#include "qstylesheet.h"
-#include "qpainter.h"
-#include "qvector.h"
-#include "qvaluelist.h"
-#endif // QT_H
-
-class QPainter;
-class QKeyEvent;
-class QResizeEvent;
-class QMouseEvent;
-class QTimer;
-class QFont;
-class QColor;
-class QPopupMenu;
-
-namespace Qt3 {
-		class QTextEdit;
-		
-    class QTextString;
-    class QTextCommand;
-    class QTextParag;
-    class QTextFormat;
-    class QTextDocument;
-    class QTextCursor;
-    class QTextViewPrivate;
-    class QTextBrowser;
-    struct QUndoRedoInfoPrivate;
-
-class Q_EXPORT QTextView : public QScrollView
-{
-    friend class QTextEdit;
-    friend class QTextBrowser;
-
-    Q_OBJECT
-    Q_ENUMS( WordWrap WrapPolicy )
-    Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
-    Q_PROPERTY( QString text READ text WRITE setText )
-    Q_PROPERTY( QBrush paper READ paper WRITE setPaper )
-    Q_PROPERTY( bool linkUnderline READ linkUnderline WRITE setLinkUnderline )
-    Q_PROPERTY( QString documentTitle READ documentTitle )
-    Q_PROPERTY( int length READ length )
-    Q_PROPERTY( WordWrap wordWrap READ wordWrap WRITE setWordWrap )
-    Q_PROPERTY( int wrapColumnOrWidth READ wrapColumnOrWidth WRITE setWrapColumnOrWidth )
-    Q_PROPERTY( WrapPolicy wrapPolicy READ wrapPolicy WRITE setWrapPolicy )
-
-public:
-    enum WordWrap {
-	NoWrap,
-	WidgetWidth,
-	FixedPixelWidth,
-	FixedColumnWidth
-    };
-
-    enum WrapPolicy {
-	AtWhiteSpace,
-	Anywhere
-    };
-
-    QTextView( const QString& text, const QString& context = QString::null,
-	       QWidget *parent=0, const char *name=0);
-    QTextView( QWidget *parent = 0, const char *name = 0 );
-    virtual ~QTextView();
-    void setPalette( const QPalette & );
-    void setFont( const QFont &f );
-
-    QString text() const;
-    QString text( int para ) const;
-    TextFormat textFormat() const;
-    QString context() const;
-    QString documentTitle() const;
-
-    void getSelection( int &paraFrom, int &indexFrom,
-		    int &paraTo, int &indexTo, int selNum = 0 ) const;
-    virtual bool find( const QString &expr, bool cs, bool wo, bool forward = TRUE,
-		       int *para = 0, int *index = 0 );
-
-    void append( const QString& text );
-
-    int paragraphs() const;
-    int lines() const;
-    int linesOfParagraph( int para ) const;
-    int lineOfChar( int para, int chr );
-    int length() const;
-
-    Qt3::QStyleSheet* styleSheet() const;
-    QMimeSourceFactory* mimeSourceFactory() const;
-
-    QBrush paper() const;
-    bool linkUnderline() const;
-
-    int heightForWidth( int w ) const;
-
-    bool hasSelectedText() const;
-    QString selectedText() const;
-
-    WordWrap wordWrap() const;
-    int wrapColumnOrWidth() const;
-    WrapPolicy wrapPolicy() const;
-
-    int tabStopWidth() const;
-    void setHScrollBarMode( ScrollBarMode );
-
-    QString anchorAt( const QPoint& pos );
-
-    QSize sizeHint() const;
-
-public slots:
-    void setEnabled( bool );
-    virtual void setMimeSourceFactory( QMimeSourceFactory* factory );
-    virtual void setStyleSheet( Qt3::QStyleSheet* styleSheet );
-    virtual void scrollToAnchor( const QString& name );
-    virtual void setPaper( const QBrush& pap );
-    virtual void setLinkUnderline( bool );
-
-    virtual void setWordWrap( WordWrap mode );
-    virtual void setWrapColumnOrWidth( int );
-    virtual void setWrapPolicy( WrapPolicy policy );
-
-    virtual void copy();
-
-    void setText( const QString &txt ) { setText( txt, QString::null ); }
-    virtual void setTextFormat( TextFormat f );
-    virtual void setText( const QString &txt, const QString &context );
-
-    virtual void selectAll( bool select = TRUE );
-    virtual void setTabStops( int ts );
-    virtual void zoomIn( int range );
-    virtual void zoomOut( int range );
-    virtual void zoomIn() { zoomIn( 1 ); }
-    virtual void zoomOut() { zoomOut( 1 ); }
-
-    virtual void sync();
-
-signals:
-    void textChanged();
-    void selectionChanged();
-    void copyAvailable( bool );
-
-protected:
-    void repaintChanged();
-    void updateStyles();
-    void drawContents( QPainter *p, int cx, int cy, int cw, int ch );
-    bool event( QEvent *e );
-    void keyPressEvent( QKeyEvent *e );
-    void resizeEvent( QResizeEvent *e );
-    void contentsMousePressEvent( QMouseEvent *e );
-    void contentsMouseMoveEvent( QMouseEvent *e );
-    void contentsMouseReleaseEvent( QMouseEvent *e );
-    void contentsMouseDoubleClickEvent( QMouseEvent *e );
-    void contentsWheelEvent( QWheelEvent *e );
-#ifndef QT_NO_DRAGANDDROP
-    void contentsDragEnterEvent( QDragEnterEvent *e );
-    void contentsDragMoveEvent( QDragMoveEvent *e );
-    void contentsDragLeaveEvent( QDragLeaveEvent *e );
-    void contentsDropEvent( QDropEvent *e );
-#endif
-    // void contentsContextMenuEvent( QContextMenuEvent *e ); QT2HACK
-    bool eventFilter( QObject *o, QEvent *e );
-    bool focusNextPrevChild( bool next );
-    QTextDocument *document() const;
-    void setDocument( QTextDocument *doc );
-    virtual QPopupMenu *createPopupMenu();
-
-protected slots:
-    virtual void doChangeInterval();
-
-private slots:
-    void formatMore();
-    void doResize();
-    void doAutoScroll();
-    void blinkCursor();
-    void setModified();
-    void startDrag();
-    void setRealWidth( int w );
-
-private:
-    struct Q_EXPORT UndoRedoInfo {
-	enum Type { Invalid, Insert, Delete, Backspace, Return, RemoveSelected, Format, Alignment, ParagType };
-
-	UndoRedoInfo( QTextDocument *dc );
-	~UndoRedoInfo();
-	void clear();
-	bool valid() const;
-
-    	QUndoRedoInfoPrivate *d;
-	int id;
-	int index;
-	int eid;
-	int eindex;
-	QTextFormat *format;
-	int flags;
-	Type type;
-	QTextDocument *doc;
-	QArray<int> oldAligns;
-	int newAlign;
-	bool list;
-	Qt3::QStyleSheetItem::ListStyle listStyle;
-	QValueList< QVector<Qt3::QStyleSheetItem> > oldStyles;
-	QValueList<Qt3::QStyleSheetItem::ListStyle> oldListStyles;
-    };
-
-    enum KeyboardActionPrivate { // keep in sync with QTextEdit
-	ActionBackspace,
-	ActionDelete,
-	ActionReturn,
-	ActionKill
-    };
-
-    enum MoveDirectionPrivate { // keep in sync with QTextEdit
-	MoveLeft,
-	MoveRight,
-	MoveUp,
-	MoveDown,
-	MoveHome,
-	MoveEnd,
-	MovePgUp,
-	MovePgDown
-    };
-
-private:
-    virtual bool isReadOnly() const { return TRUE; }
-    virtual bool linksEnabled() const { return FALSE; }
-    void init();
-    void drawCursor( bool visible );
-    void checkUndoRedoInfo( UndoRedoInfo::Type t );
-    void updateCurrentFormat();
-    void handleReadOnlyKeyEvent( QKeyEvent *e );
-    void makeParagVisible( QTextParag *p );
-#ifndef QT_NO_MIME
-    QCString pickSpecial(QMimeSource* ms, bool always_ask, const QPoint&);
-#endif
-#ifndef QT_NO_MIMECLIPBOARD
-    void pasteSpecial(const QPoint&);
-#endif
-
-private: // these are functions which actually do editing stuff, but
- // are implemented here as it is easier to implement viewing and
- // editing in the same class. In QTextEdit these functions are made
- // public
-    virtual void emitUndoAvailable( bool ) {}
-    virtual void emitRedoAvailable( bool ) {}
-    virtual void emitCurrentFontChanged( const QFont & ) {}
-    virtual void emitCurrentColorChanged( const QColor & ) {}
-    virtual void emitCurrentAlignmentChanged( int ) {}
-    virtual void emitCursorPositionChanged( QTextCursor * ) {}
-    virtual void emitReturnPressed() {}
-    virtual void emitHighlighted( const QString & ) {}
-    virtual void emitLinkClicked( const QString & ) {}
-    virtual void emitModificationChanged( bool ) {}
-
-    void getCursorPosition( int &parag, int &index ) const;
-    bool isModified() const;
-    bool italic() const;
-    bool bold() const;
-    bool underline() const;
-    QString family() const;
-    int pointSize() const;
-    QColor color() const;
-    QFont font() const;
-    int alignment() const;
-    void setOverwriteMode( bool b ) { overWrite = b; }
-    bool isOverwriteMode() const { return overWrite; }
-    int undoDepth() const;
-    void undo();
-    void redo();
-    void cut();
-    void paste();
-    void del();
-    void clear();
-    void pasteSubType( const QCString &subtype );
-    void indent();
-    void setItalic( bool b );
-    void setBold( bool b );
-    void setUnderline( bool b );
-    void setFamily( const QString &f );
-    void setPointSize( int s );
-    void setColor( const QColor &c );
-    void setFontInternal( const QFont &f );
-    void setAlignment( int );
-    void setParagType( QStyleSheetItem::DisplayMode, QStyleSheetItem::ListStyle listStyle );
-    void setCursorPosition( int parag, int index );
-    void setSelection( int parag_from, int index_from,
-			       int parag_to, int index_to, int selNum = 0 );
-    void setSelectionAttributes( int selNum, const QColor &back, bool invertText );
-    void setModified( bool m );
-    void resetFormat();
-    void setUndoDepth( int d );
-    void setFormat( QTextFormat *f, int flags );
-    void ensureCursorVisible();
-    void placeCursor( const QPoint &pos, QTextCursor *c = 0 );
-    void moveCursor( MoveDirectionPrivate direction, bool shift, bool control );
-    void moveCursor( MoveDirectionPrivate direction, bool control );
-    void removeSelectedText();
-    void doKeyboardAction( KeyboardActionPrivate action );
-    void insert( const QString &text, bool indent = FALSE, bool checkNewLine = TRUE, bool removeSelected = TRUE );
-    void readFormats( QTextCursor &c1, QTextCursor &c2, int oldLen, QTextString &text, bool fillStyles = FALSE );
-    void clearUndoRedo();
-    bool getFormat( int parag, int index, QFont &font, QColor &color );
-    void paintDocument( bool drawAll, QPainter *p, int cx = -1, int cy = -1, int cw = -1, int ch = -1 );
-
-private:
-    QTextDocument *doc;
-    QTextCursor *cursor;
-    bool mousePressed;
-    QTimer *formatTimer, *scrollTimer, *changeIntervalTimer, *blinkTimer, *dragStartTimer, *resizeTimer;
-    QTextParag *lastFormatted;
-    int interval;
-    UndoRedoInfo undoRedoInfo;
-    QTextFormat *currentFormat;
-    int currentAlignment;
-    bool inDoubleClick;
-    QPoint oldMousePos, mousePos;
-    bool cursorVisible, blinkCursorVisible;
-    bool readOnly, modified, mightStartDrag;
-    QPoint dragStartPos;
-    QString onLink;
-    bool overWrite;
-    WordWrap wrapMode;
-    WrapPolicy wPolicy;
-    int wrapWidth;
-    QScrollView::ScrollBarMode setMode;
-    QString pressedLink;
-    QTextViewPrivate *d;
-    bool inDnD;
-
-};
-
-inline QTextDocument *QTextView::document() const
-{
-    return doc;
-}
-
-}; // namespace
-
-#endif
diff --git a/bibletime/main.cpp b/bibletime/main.cpp
index 2fa844b..e3a13f5 100644
--- a/bibletime/main.cpp
+++ b/bibletime/main.cpp
@@ -16,8 +16,8 @@
 ***************************************************************************/
 
 	
-/* $Header: /cvsroot/bibletime/bibletime/bibletime/main.cpp,v 1.61 2002/03/31 23:01:01 joachim Exp $ */
-/* $Revision: 1.61 $ */
+/* $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>
@@ -25,21 +25,27 @@
 #include <signal.h>
 
 //own includes
-#include "resource.h"
+#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/chtmldialog.h"
 #include "frontend/cbtconfig.h"
 
+//Qt includes
+#include <qdir.h>
+
 //KDE includes
 #include <kcmdlineargs.h>
 #include <kcrash.h>
 #include <kglobal.h>
-#include <kapp.h>
-#include <kstddirs.h>
+#include <kapplication.h>
+#include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kaboutdata.h>
 #include <klocale.h>
@@ -47,7 +53,7 @@
 #include <kmessagebox.h>
 
 bool showDebugMessages = false;
-BibleTime* bibletime = 0;
+BibleTime* bibletime_ptr = 0;
 
 void myMessageOutput( QtMsgType type, const char *msg ) {	
 	//we use this messagehandler to switch debugging off in final releases
@@ -57,6 +63,7 @@ void myMessageOutput( QtMsgType type, const char *msg ) {
 				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:
@@ -73,10 +80,18 @@ extern "C" {
 		setSignalHandler(SIG_DFL);
 		fprintf(stderr, "*** BibleTime got signal %d (Exiting)\n", sigId);
 		// try to cleanup all windows
-		if (bibletime) {
-			bibletime->saveSettings();
+    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-startprofile\n");
+please use the option --ignore-session\n");
 		}
 		::exit(-1); //exit BibleTime
 	}
@@ -85,10 +100,18 @@ please use the option --ignore-startprofile\n");
 	static void crashHandler(int sigId) {
 		setSignalHandler(SIG_DFL);
 		fprintf(stderr, "*** BibleTime got signal %d (Crashing). Trying to save settings.\n", sigId);
-		if (bibletime) {
-			bibletime->saveSettings();
+    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-startprofile\n");		
+please use the option --ignore-session\n");
 		}
 		// Return to DrKonqi.
 	}
@@ -108,113 +131,134 @@ int main(int argc, char* argv[]) {
 	static KCmdLineOptions options[] =
 	{
 		{"debug", I18N_NOOP("Enable debug messages"),0},
-		{"ignore-startprofile", I18N_NOOP("Ignore the startup profile saved after the last BibleTime execution."),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 2"),
+		I18N_NOOP("Bible study tool for KDE"),
 		KAboutData::License_GPL_V2,
-		I18N_NOOP("(c)1999-2002, The BibleTime Team"),
-		I18N_NOOP("BibleTime is an easy to use but powerful Bible study tool for KDE 2.\n\nWe are looking for translators and handbook authors.\nIf you'd like to join use send an eMail to info@bibletime.de."),
-		"http://www.bibletime.de/",
-		"info@bibletime.de"
+		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"
 	);
-	
-	//we could so change this to a file reading function (including commented out people
-	//coders
-	// active developers (sorted by name)                                                                                     	
-	aboutData.addAuthor("Joachim Ansorg", I18N_NOOP("Project coordinator"), "jansorg@gmx.de",					"");
-	aboutData.addAuthor("Martin Gruner", 	I18N_NOOP("Frontend, backend"), 	"mg.pub@gmx.net", 				"");
-	aboutData.addAuthor("Mark Lybarger", 	I18N_NOOP("Searchdialog"), 				"mlybarge@insight.rr.com","");
+
+  /***********************************************
+  *    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", "");
+//	aboutData.addAuthor("Tim Brodie", 	  I18N_NOOP("Installation manager"),"tbrodie@displayworksinc.com", "");
 
-	//artwork (sorted by name)
-	aboutData.addAuthor("Timothy R. Butler", I18N_NOOP("Icons, startlogo, banners"), "tbutler@uninetsolutions.com", "www.uninetsolutions.com");
-		
-	//documentation (sorted by name)
-	aboutData.addAuthor("Fred Saalbach", I18N_NOOP("Handbook"), "saalbach@sybercom.net", "");		
-	
-	//translators (sorted by language)
-	aboutData.addAuthor("Michal Rovnan�k",		I18N_NOOP("Translation into Czech"), 			"Michal.Rovnanik@seznam.cz", 	"");	
-	aboutData.addAuthor("Birger Langkjer", 		I18N_NOOP("Translation into Danish"), 		"birger.langkjer@image.dk", 	"");
-	aboutData.addAuthor("Kees van Veen", 			I18N_NOOP("Translation into Dutch"), 			"cvn@interchain.nl", 					"");
-//	aboutData.addAuthor("Mario Bertrand", 	  I18N_NOOP("Translation into French"), 		"mbert@tbrq.org", 						"");
-	aboutData.addAuthor("Mathias Bavay", 	  	I18N_NOOP("Translation into French"), 		"mathias.bavay@free.fr", 						"");
-	aboutData.addAuthor("Balint Sandor", 			I18N_NOOP("Translation into Hungarian"), 	"balintsa@freemail.hu", 			"");
-	aboutData.addAuthor("Beda Szukics",				I18N_NOOP("Translation into Italian"), 		"bszukics@bluewin.ch", 				"");
-	aboutData.addAuthor("Silvio Bacchetta",		I18N_NOOP("Translation into Italian"), 		"sorgilazzaro@tiscalinet.it", "");
-	aboutData.addAuthor("Espen Trydal", 			I18N_NOOP("Translation into Norwegian"), 	"etrydal@postkassa.no", 			"");
-	aboutData.addAuthor("Benedykt P. Barszcz",I18N_NOOP("Translation into Polish"), 		"kb2qzv@box43.gnet.pl", 			"");	
-	aboutData.addAuthor("Nuno Bareto", 				I18N_NOOP("Translation into Portoguese"), "nbarr@oninet.pt", 						"");	
-	aboutData.addAuthor("Yuriy Salimovskyy", 	I18N_NOOP("Translation into Russian"), 		"y2000@pisem.net",						"");	
-	aboutData.addAuthor("Zdeno Podobny", 			I18N_NOOP("Translation into Slovak"), 		"zdpo@post.sk", 							"");	
-	aboutData.addAuthor("Eduardo Sanchez", 		I18N_NOOP("Translation into Spanish"), 		"csanche2@calvin.edu", 				"");
-
-	//credits (sorted by name)
-	aboutData.addCredit("Bob Harman", I18N_NOOP("Bible study HowTo"), "N_Cov_Church@compuserve.com", "");
-	 	
-	KCmdLineArgs::init(argc, argv, &aboutData); 	
-	KCmdLineArgs::addCmdLineOptions ( options );
-	
+  /***********************************************
+  *        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
 
-	KApplication app;
+	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"))
+	if (args->isSet("debug")) {
 		showDebugMessages = true;
+  }
 
-	if (kapp->isRestored()){
-		for(int n = 1; KMainWindow::canBeRestored(n); n++)
+  //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);	
+*/
+		const bool showIt = CBTConfig::get(CBTConfig::logo);
 
 		if(showIt) {
 			KStartupLogo::createSplash();
-			KStartupLogo::showSplash();				
+			KStartupLogo::showSplash();
 			KStartupLogo::setStatusMessage( i18n("Starting BibleTime") + QString::fromLatin1("...") );
 		}
-		
-		bibletime = new BibleTime();
 
-		if (showIt) {
-			KStartupLogo::hideSplash();
-			KStartupLogo::deleteSplash();	  		  	
-		}
+    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) {
-			CBTConfig::set(CBTConfig::bibletimeVersion, VERSION);
-			CHTMLDialog dlg(HELPDIALOG_FIRST_START);
-			dlg.exec();
+      KStartupLogo::hideSplash();
+
+      CBTConfig::set(CBTConfig::bibletimeVersion, VERSION);
 			bibletime->slotSettingsOptions();
-		}			
+		}
 
 		//The tip of the day
-		if (CBTConfig::get(CBTConfig::tips))
+		if (CBTConfig::get(CBTConfig::tips)) {
+      KStartupLogo::hideSplash();
 			bibletime->slotHelpTipOfDay();
+    }
 
-		bibletime->show();			
-		
-		// restore the workspace
-		if (CBTConfig::get(CBTConfig::restoreWorkspace) && !args->isSet("ignore-startprofile"))
-			bibletime->restoreWorkspace();
-
-		setSignalHandler(signalHandler);		
-		
-		const int ret = app.exec();
-		CPointers::deleteBackend();
-		return ret;
-	}
+    // 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
new file mode 100644
index 0000000..59dce74
--- /dev/null
+++ b/bibletime/pics/16x16/Makefile.am
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 0000000..4bd05a2
--- /dev/null
+++ b/bibletime/pics/16x16/Makefile.in
@@ -0,0 +1,550 @@
+# 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
new file mode 100644
index 0000000..59e09c2
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_bible.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_bible_add.png b/bibletime/pics/16x16/hi16-action-bt_bible_add.png
new file mode 100644
index 0000000..a90a655
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_bible_add.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_bible_locked.png b/bibletime/pics/16x16/hi16-action-bt_bible_locked.png
new file mode 100644
index 0000000..060626f
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_bible_locked.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_book.png b/bibletime/pics/16x16/hi16-action-bt_book.png
new file mode 100644
index 0000000..0ec5e3b
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_book.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_book_add.png b/bibletime/pics/16x16/hi16-action-bt_book_add.png
new file mode 100644
index 0000000..ac5fb3f
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_book_add.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_book_locked.png b/bibletime/pics/16x16/hi16-action-bt_book_locked.png
new file mode 100644
index 0000000..83784a8
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_book_locked.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_cascade.png b/bibletime/pics/16x16/hi16-action-bt_cascade.png
new file mode 100644
index 0000000..d2d4002
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_cascade.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png b/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png
new file mode 100644
index 0000000..a16ad9a
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary.png b/bibletime/pics/16x16/hi16-action-bt_commentary.png
new file mode 100644
index 0000000..b9f198e
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_commentary.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary_add.png b/bibletime/pics/16x16/hi16-action-bt_commentary_add.png
new file mode 100644
index 0000000..af1e044
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_commentary_add.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png b/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png
new file mode 100644
index 0000000..9b019dc
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_displayconfig.png b/bibletime/pics/16x16/hi16-action-bt_displayconfig.png
new file mode 100755
index 0000000..735af2f
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_displayconfig.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png b/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png
new file mode 100644
index 0000000..85c7e98
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon.png b/bibletime/pics/16x16/hi16-action-bt_lexicon.png
new file mode 100644
index 0000000..4a0fe15
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_lexicon.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png b/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png
new file mode 100644
index 0000000..78a0ba2
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png b/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png
new file mode 100644
index 0000000..ff7d87f
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_startconfig.png b/bibletime/pics/16x16/hi16-action-bt_startconfig.png
new file mode 100644
index 0000000..21e4865
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_startconfig.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_swordconfig.png b/bibletime/pics/16x16/hi16-action-bt_swordconfig.png
new file mode 100644
index 0000000..3c33de6
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_swordconfig.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_sync.png b/bibletime/pics/16x16/hi16-action-bt_sync.png
new file mode 100644
index 0000000..6820542
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_sync.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_tile.png b/bibletime/pics/16x16/hi16-action-bt_tile.png
new file mode 100644
index 0000000..10854d8
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_tile.png
diff --git a/bibletime/pics/16x16/hi16-action-bt_tile_auto.png b/bibletime/pics/16x16/hi16-action-bt_tile_auto.png
new file mode 100644
index 0000000..f4ab245
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-action-bt_tile_auto.png
diff --git a/bibletime/pics/16x16/hi16-app-bibletime.png b/bibletime/pics/16x16/hi16-app-bibletime.png
new file mode 100644
index 0000000..1fe6a4d
--- /dev/null
+++ b/bibletime/pics/16x16/hi16-app-bibletime.png
diff --git a/bibletime/pics/22x22/Makefile.am b/bibletime/pics/22x22/Makefile.am
new file mode 100644
index 0000000..7b920ef
--- /dev/null
+++ b/bibletime/pics/22x22/Makefile.am
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 0000000..62502d2
--- /dev/null
+++ b/bibletime/pics/22x22/Makefile.in
@@ -0,0 +1,552 @@
+# 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
new file mode 100644
index 0000000..20c9785
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_bible.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_bible_add.png b/bibletime/pics/22x22/hi22-action-bt_bible_add.png
new file mode 100644
index 0000000..7684364
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_bible_add.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_bible_locked.png b/bibletime/pics/22x22/hi22-action-bt_bible_locked.png
new file mode 100644
index 0000000..c88f9f7
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_bible_locked.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_book.png b/bibletime/pics/22x22/hi22-action-bt_book.png
new file mode 100644
index 0000000..7d50365
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_book.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_book_add.png b/bibletime/pics/22x22/hi22-action-bt_book_add.png
new file mode 100644
index 0000000..60d345f
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_book_add.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_book_locked.png b/bibletime/pics/22x22/hi22-action-bt_book_locked.png
new file mode 100644
index 0000000..8c0861a
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_book_locked.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_cascade.png b/bibletime/pics/22x22/hi22-action-bt_cascade.png
new file mode 100644
index 0000000..07068c6
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_cascade.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png b/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png
new file mode 100644
index 0000000..8b3a0a8
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary.png b/bibletime/pics/22x22/hi22-action-bt_commentary.png
new file mode 100644
index 0000000..4711ca2
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_commentary.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary_add.png b/bibletime/pics/22x22/hi22-action-bt_commentary_add.png
new file mode 100644
index 0000000..d58bb17
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_commentary_add.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png b/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png
new file mode 100644
index 0000000..b9b3615
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_displayconfig.png b/bibletime/pics/22x22/hi22-action-bt_displayconfig.png
new file mode 100755
index 0000000..eaa67d1
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_displayconfig.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png b/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png
new file mode 100644
index 0000000..5eada70
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon.png b/bibletime/pics/22x22/hi22-action-bt_lexicon.png
new file mode 100644
index 0000000..437cb50
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_lexicon.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png b/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png
new file mode 100644
index 0000000..924ea64
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png b/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png
new file mode 100644
index 0000000..0b3fa30
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_parallel.png b/bibletime/pics/22x22/hi22-action-bt_parallel.png
index b1d3ea1..b1d3ea1 100644
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_parallel.png
+++ b/bibletime/pics/22x22/hi22-action-bt_parallel.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_startconfig.png b/bibletime/pics/22x22/hi22-action-bt_startconfig.png
new file mode 100644
index 0000000..6f4b900
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_startconfig.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_swordconfig.png b/bibletime/pics/22x22/hi22-action-bt_swordconfig.png
new file mode 100644
index 0000000..4c87bb5
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_swordconfig.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_sync.png b/bibletime/pics/22x22/hi22-action-bt_sync.png
new file mode 100644
index 0000000..71f6df7
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_sync.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_tile.png b/bibletime/pics/22x22/hi22-action-bt_tile.png
new file mode 100644
index 0000000..01d406d
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_tile.png
diff --git a/bibletime/pics/22x22/hi22-action-bt_tile_auto.png b/bibletime/pics/22x22/hi22-action-bt_tile_auto.png
new file mode 100644
index 0000000..e826540
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-action-bt_tile_auto.png
diff --git a/bibletime/pics/22x22/hi22-app-bibletime.png b/bibletime/pics/22x22/hi22-app-bibletime.png
new file mode 100644
index 0000000..acf2585
--- /dev/null
+++ b/bibletime/pics/22x22/hi22-app-bibletime.png
diff --git a/bibletime/pics/32x32/Makefile.am b/bibletime/pics/32x32/Makefile.am
new file mode 100644
index 0000000..1de62e7
--- /dev/null
+++ b/bibletime/pics/32x32/Makefile.am
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 0000000..5cf523e
--- /dev/null
+++ b/bibletime/pics/32x32/Makefile.in
@@ -0,0 +1,550 @@
+# 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
new file mode 100644
index 0000000..b949de7
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_bible.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_bible_add.png b/bibletime/pics/32x32/hi32-action-bt_bible_add.png
new file mode 100644
index 0000000..48c63e8
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_bible_add.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_bible_locked.png b/bibletime/pics/32x32/hi32-action-bt_bible_locked.png
new file mode 100644
index 0000000..259e08f
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_bible_locked.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_book.png b/bibletime/pics/32x32/hi32-action-bt_book.png
new file mode 100644
index 0000000..84887db
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_book.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_book_add.png b/bibletime/pics/32x32/hi32-action-bt_book_add.png
new file mode 100644
index 0000000..8d35be9
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_book_add.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_book_locked.png b/bibletime/pics/32x32/hi32-action-bt_book_locked.png
new file mode 100644
index 0000000..ce746b8
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_book_locked.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_cascade.png b/bibletime/pics/32x32/hi32-action-bt_cascade.png
new file mode 100644
index 0000000..070f5d1
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_cascade.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png b/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png
new file mode 100644
index 0000000..4171ffc
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary.png b/bibletime/pics/32x32/hi32-action-bt_commentary.png
new file mode 100644
index 0000000..fa29810
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_commentary.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary_add.png b/bibletime/pics/32x32/hi32-action-bt_commentary_add.png
new file mode 100644
index 0000000..18b31a8
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_commentary_add.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png b/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png
new file mode 100644
index 0000000..f615a88
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_displayconfig.png b/bibletime/pics/32x32/hi32-action-bt_displayconfig.png
new file mode 100755
index 0000000..2478bf9
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_displayconfig.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png b/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png
new file mode 100644
index 0000000..91f97a2
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon.png b/bibletime/pics/32x32/hi32-action-bt_lexicon.png
new file mode 100644
index 0000000..0357308
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_lexicon.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png b/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png
new file mode 100644
index 0000000..9c8ad16
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png b/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png
new file mode 100644
index 0000000..e239f7f
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_startconfig.png b/bibletime/pics/32x32/hi32-action-bt_startconfig.png
new file mode 100644
index 0000000..c64200d
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_startconfig.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_swordconfig.png b/bibletime/pics/32x32/hi32-action-bt_swordconfig.png
new file mode 100644
index 0000000..b8f3d30
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_swordconfig.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_sync.png b/bibletime/pics/32x32/hi32-action-bt_sync.png
new file mode 100644
index 0000000..25fdb0f
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_sync.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_tile.png b/bibletime/pics/32x32/hi32-action-bt_tile.png
new file mode 100644
index 0000000..3cab67e
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_tile.png
diff --git a/bibletime/pics/32x32/hi32-action-bt_tile_auto.png b/bibletime/pics/32x32/hi32-action-bt_tile_auto.png
new file mode 100644
index 0000000..e92e26d
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-action-bt_tile_auto.png
diff --git a/bibletime/pics/32x32/hi32-app-bibletime.png b/bibletime/pics/32x32/hi32-app-bibletime.png
new file mode 100644
index 0000000..7dcbc90
--- /dev/null
+++ b/bibletime/pics/32x32/hi32-app-bibletime.png
diff --git a/bibletime/pics/48x48/Makefile.am b/bibletime/pics/48x48/Makefile.am
new file mode 100644
index 0000000..fc06707
--- /dev/null
+++ b/bibletime/pics/48x48/Makefile.am
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 0000000..ee72a31
--- /dev/null
+++ b/bibletime/pics/48x48/Makefile.in
@@ -0,0 +1,550 @@
+# 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
new file mode 100644
index 0000000..d813bd7
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_bible.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_bible_add.png b/bibletime/pics/48x48/hi48-action-bt_bible_add.png
new file mode 100644
index 0000000..c16456b
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_bible_add.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_bible_locked.png b/bibletime/pics/48x48/hi48-action-bt_bible_locked.png
new file mode 100644
index 0000000..1333584
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_bible_locked.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_book.png b/bibletime/pics/48x48/hi48-action-bt_book.png
new file mode 100644
index 0000000..b3f5fb0
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_book.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_book_add.png b/bibletime/pics/48x48/hi48-action-bt_book_add.png
new file mode 100644
index 0000000..4fe4cd4
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_book_add.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_book_locked.png b/bibletime/pics/48x48/hi48-action-bt_book_locked.png
new file mode 100644
index 0000000..c76f2a0
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_book_locked.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_cascade.png b/bibletime/pics/48x48/hi48-action-bt_cascade.png
new file mode 100644
index 0000000..0ea1fe8
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_cascade.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png b/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png
new file mode 100644
index 0000000..6dfc9f5
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary.png b/bibletime/pics/48x48/hi48-action-bt_commentary.png
new file mode 100644
index 0000000..966b0c6
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_commentary.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary_add.png b/bibletime/pics/48x48/hi48-action-bt_commentary_add.png
new file mode 100644
index 0000000..3fb2cdd
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_commentary_add.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png b/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png
new file mode 100644
index 0000000..8dd23fb
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_displayconfig.png b/bibletime/pics/48x48/hi48-action-bt_displayconfig.png
new file mode 100644
index 0000000..adb2706
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_displayconfig.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png b/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png
new file mode 100644
index 0000000..30384fd
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon.png b/bibletime/pics/48x48/hi48-action-bt_lexicon.png
new file mode 100644
index 0000000..623c564
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_lexicon.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png b/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png
new file mode 100644
index 0000000..9d2cfaf
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png b/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png
new file mode 100644
index 0000000..dbdafbe
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_startconfig.png b/bibletime/pics/48x48/hi48-action-bt_startconfig.png
new file mode 100644
index 0000000..805bf8b
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_startconfig.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_swordconfig.png b/bibletime/pics/48x48/hi48-action-bt_swordconfig.png
new file mode 100644
index 0000000..fb518ed
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_swordconfig.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_sync.png b/bibletime/pics/48x48/hi48-action-bt_sync.png
new file mode 100644
index 0000000..3dcf17a
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_sync.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_tile.png b/bibletime/pics/48x48/hi48-action-bt_tile.png
new file mode 100644
index 0000000..f49a7b4
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_tile.png
diff --git a/bibletime/pics/48x48/hi48-action-bt_tile_auto.png b/bibletime/pics/48x48/hi48-action-bt_tile_auto.png
new file mode 100644
index 0000000..02436d9
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-action-bt_tile_auto.png
diff --git a/bibletime/pics/48x48/hi48-app-bibletime.png b/bibletime/pics/48x48/hi48-app-bibletime.png
new file mode 100644
index 0000000..768f3b9
--- /dev/null
+++ b/bibletime/pics/48x48/hi48-app-bibletime.png
diff --git a/bibletime/pics/64x64/Makefile.am b/bibletime/pics/64x64/Makefile.am
new file mode 100644
index 0000000..02a3ff1
--- /dev/null
+++ b/bibletime/pics/64x64/Makefile.am
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 0000000..2f84515
--- /dev/null
+++ b/bibletime/pics/64x64/Makefile.in
@@ -0,0 +1,507 @@
+# 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
new file mode 100644
index 0000000..05b859d
--- /dev/null
+++ b/bibletime/pics/64x64/hi64-app-bibletime.png
diff --git a/bibletime/pics/Makefile.am b/bibletime/pics/Makefile.am
index 055a752..670547f 100644
--- a/bibletime/pics/Makefile.am
+++ b/bibletime/pics/Makefile.am
@@ -1,29 +1,27 @@
 SUBDIRS = \
-lowcolor \
-highcolor \
+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) $$file $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	chmod 644 $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
+		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; \
+	@for file in $(BIBLETIME_PICS); do \
+		echo Removing $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
+		rm -f $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
 	done
-
-KDE_ICON = AUTO
-
diff --git a/bibletime/pics/Makefile.in b/bibletime/pics/Makefile.in
index 60a434a..6ea267e 100644
--- a/bibletime/pics/Makefile.in
+++ b/bibletime/pics/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,61 +229,102 @@ 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@
-micodir = @micodir@
+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@
-
-SUBDIRS =  lowcolor highcolor .
+xdg_appsdir = @xdg_appsdir@
+xdg_directorydir = @xdg_directorydir@
+xdg_menudir = @xdg_menudir@
+SUBDIRS = \
+16x16 \
+22x22 \
+32x32 \
+48x48 \
+64x64 \
+.
 
 
-BIBLETIME_PICS =  startuplogo.png
+BIBLETIME_PICS = \
+startuplogo.png
 
 
 EXTRA_DIST = $(BIBLETIME_PICS)
-
-KDE_ICON = AUTO
+subdir = bibletime/pics
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=gen_am.sh startuplogo.png startuplogo.xcf 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
+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-redirect
+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
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/Makefile
+$(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
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+clean-libtool:
+	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -264,13 +332,8 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -290,13 +353,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -312,183 +380,298 @@ 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)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+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
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-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)
 
-subdir = bibletime/pics
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
 check-am: all-am
 check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
 
-install-data-am: install-data-local
+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
-install: install-recursive
-uninstall-am: uninstall-local
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
 
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
+	@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
 
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
+#>- clean-am: clean-generic clean-libtool mostlyclean-am
+#>+ 1
+clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-local install-data-am install-data install-am \
-install uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+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) $$file $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	chmod 644 $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
+		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; \
+	@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:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  bibletime/pics/Makefile
 	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/Makefile.in
 
 
-#>+ 2
+#>+ 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
-#>+ 2
+
+#>+ 3
+final-install:
+	$(MAKE) install-am
+
+#>+ 3
 no-final:
 	$(MAKE) all-am
+
+#>+ 3
+no-final-install:
+	$(MAKE) install-am
+
 #>+ 3
 cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common 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.sh b/bibletime/pics/gen_am.sh
deleted file mode 100755
index 7a2540b..0000000
--- a/bibletime/pics/gen_am.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# gen_am.sh script
-#
-# (C) 2001 The BibleTime team
-# released under the GPL
-#
-# This script creates the Makefile.am files in the
-# bibletime/pics/*color/ and bibletime/pics/*color/*x* directories.
-#
-# It will not change the bibletime/pics/Makefile.am!
-
-# change to the dir the script is located in
-cd `dirname $0`
-
-export HEADER="\n"\
-"# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh\n"\
-"# please do not edit this file but rather run the script to update\n"
-
-# create Makefile.am's in /bibletime/pics/*color/ directories
-#
-for I1 in `ls -d *color`; do
-
-  echo creating $I1/Makefile.am
-  ( # output to Makefile.am
-  echo -e $HEADER
-
-  echo -n "SUBDIRS = "
-  for I2 in `ls -d $I1/*x*`; do
-    echo -n `basename $I2`" "
-  done
-  echo
-  ) > $I1/Makefile.am
-
-done
-
-
-# create Makefile.am's in /bibletime/pics/*color/*x* directories
-#
-for I1 in `ls -d *color/*x*`; do
-
-  echo creating $I1/Makefile.am
-  ( # output to Makefile.am  
-  echo -e $HEADER
-
-  echo "KDE_ICON = AUTO"
-  echo "EXTRA_DIST=\\"
-  for I2 in `ls -d $I1/*.png`; do
-    echo -n `basename $I2`" "
-  done
-  echo
-  ) > $I1/Makefile.am
-
-done
diff --git a/bibletime/pics/gen_am_pics.pl b/bibletime/pics/gen_am_pics.pl
new file mode 100644
index 0000000..f36a474
--- /dev/null
+++ b/bibletime/pics/gen_am_pics.pl
@@ -0,0 +1,39 @@
+#!/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/highcolor/16x16/Makefile.am b/bibletime/pics/highcolor/16x16/Makefile.am
deleted file mode 100644
index 46127d5..0000000
--- a/bibletime/pics/highcolor/16x16/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-KDE_ICON = AUTO
-EXTRA_DIST=\
-hi16-action-bt_bible.png hi16-action-bt_bible_add.png hi16-action-bt_bible_locked.png hi16-action-bt_book.png hi16-action-bt_book_add.png hi16-action-bt_book_locked.png hi16-action-bt_cascade.png hi16-action-bt_cascade_auto.png hi16-action-bt_commentary.png hi16-action-bt_commentary_add.png hi16-action-bt_commentary_locked.png hi16-action-bt_displayconfig.png hi16-action-bt_lexicon.png hi16-action-bt_lexicon_add.png hi16-action-bt_lexicon_locked.png hi16-action-bt_startconfig.png hi16-action-bt_swordconfig.png hi16-action-bt_tile.png hi16-action-bt_tile_auto.png hi16-app-bibletime.png 
diff --git a/bibletime/pics/highcolor/16x16/Makefile.in b/bibletime/pics/highcolor/16x16/Makefile.in
deleted file mode 100644
index 5d7b1a5..0000000
--- a/bibletime/pics/highcolor/16x16/Makefile.in
+++ /dev/null
@@ -1,416 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_ICON = AUTO
-EXTRA_DIST =  hi16-action-bt_bible.png hi16-action-bt_bible_add.png hi16-action-bt_bible_locked.png hi16-action-bt_book.png hi16-action-bt_book_add.png hi16-action-bt_book_locked.png hi16-action-bt_cascade.png hi16-action-bt_cascade_auto.png hi16-action-bt_commentary.png hi16-action-bt_commentary_add.png hi16-action-bt_commentary_locked.png hi16-action-bt_displayconfig.png hi16-action-bt_lexicon.png hi16-action-bt_lexicon_add.png hi16-action-bt_lexicon_locked.png hi16-action-bt_startconfig.png hi16-action-bt_swordconfig.png hi16-action-bt_tile.png hi16-action-bt_tile_auto.png hi16-app-bibletime.png 
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/16x16/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/16x16/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/16x16/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/highcolor/16x16
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/highcolor/16x16/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-#>- uninstall-am:
-#>+ 1
-uninstall-am: uninstall-kde-icons 
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 46
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible.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.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book.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_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade.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_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary.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_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon.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_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile_auto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/hi16-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/bibletime.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible.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.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary.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_lexicon.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_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/bibletime.png
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/16x16/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/16x16/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_bible.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_bible.png
deleted file mode 100644
index d9dbe6f..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_bible_add.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_bible_add.png
deleted file mode 100644
index 6fbd5cc..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_bible_locked.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_bible_locked.png
deleted file mode 100644
index 6721084..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_book.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_book.png
deleted file mode 100644
index fa419cc..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_book_add.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_book_add.png
deleted file mode 100644
index 0ea0d91..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_book_locked.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_book_locked.png
deleted file mode 100644
index 076f998..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_cascade.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_cascade.png
deleted file mode 100644
index 98e81c9..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_cascade_auto.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_cascade_auto.png
deleted file mode 100644
index fcb3ebc..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary.png
deleted file mode 100644
index 1b1846b..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary_add.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary_add.png
deleted file mode 100644
index 3c8d9b3..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary_locked.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary_locked.png
deleted file mode 100644
index 6c93b61..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_displayconfig.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_displayconfig.png
deleted file mode 100644
index ac25642..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon.png
deleted file mode 100644
index 45a402f..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon_add.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon_add.png
deleted file mode 100644
index 949c28f..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon_locked.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon_locked.png
deleted file mode 100644
index 34928bb..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_startconfig.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_startconfig.png
deleted file mode 100644
index 3f66b6e..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_swordconfig.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_swordconfig.png
deleted file mode 100644
index 4783af8..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_tile.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_tile.png
deleted file mode 100644
index b466f5b..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-action-bt_tile_auto.png b/bibletime/pics/highcolor/16x16/hi16-action-bt_tile_auto.png
deleted file mode 100644
index 80eafdd..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/16x16/hi16-app-bibletime.png b/bibletime/pics/highcolor/16x16/hi16-app-bibletime.png
deleted file mode 100644
index 99ca1a1..0000000
--- a/bibletime/pics/highcolor/16x16/hi16-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/Makefile.am b/bibletime/pics/highcolor/22x22/Makefile.am
deleted file mode 100644
index 3874b15..0000000
--- a/bibletime/pics/highcolor/22x22/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-KDE_ICON = AUTO
-EXTRA_DIST=\
-hi22-action-bt_bible.png hi22-action-bt_bible_add.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_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 
diff --git a/bibletime/pics/highcolor/22x22/Makefile.in b/bibletime/pics/highcolor/22x22/Makefile.in
deleted file mode 100644
index 128e280..0000000
--- a/bibletime/pics/highcolor/22x22/Makefile.in
+++ /dev/null
@@ -1,423 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_ICON = AUTO
-EXTRA_DIST =  hi22-action-bt_bible.png hi22-action-bt_bible_add.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_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 
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=hi22-action-bt_bible_locked.html 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/22x22/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/22x22/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/22x22/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/highcolor/22x22
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/highcolor/22x22/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-#>- uninstall-am:
-#>+ 1
-uninstall-am: uninstall-kde-icons 
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 48
-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_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_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_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_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
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/22x22/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/22x22/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_bible.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_bible.png
deleted file mode 100644
index f3b8e18..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_bible_add.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_bible_add.png
deleted file mode 100644
index b865b2b..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_bible_locked.html b/bibletime/pics/highcolor/22x22/hi22-action-bt_bible_locked.html
deleted file mode 100644
index de76d8b..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_bible_locked.html
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_book.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_book.png
deleted file mode 100644
index 59051ce..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_book_add.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_book_add.png
deleted file mode 100644
index 75aec6d..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_book_locked.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_book_locked.png
deleted file mode 100644
index 80ccc5f..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_cascade.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_cascade.png
deleted file mode 100644
index b837d36..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_cascade_auto.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_cascade_auto.png
deleted file mode 100644
index db66d54..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary.png
deleted file mode 100644
index 810ccc9..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary_add.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary_add.png
deleted file mode 100644
index c3f05e2..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary_locked.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary_locked.png
deleted file mode 100644
index 8e2603a..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_displayconfig.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_displayconfig.png
deleted file mode 100644
index 56982b2..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon.png
deleted file mode 100644
index cd7935f..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon_add.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon_add.png
deleted file mode 100644
index 06fb28d..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon_locked.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon_locked.png
deleted file mode 100644
index 6ce5fa8..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_startconfig.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_startconfig.png
deleted file mode 100644
index 494cbb8..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_swordconfig.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_swordconfig.png
deleted file mode 100644
index ebec174..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_sync.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_sync.png
deleted file mode 100644
index 3c0a52d..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_tile.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_tile.png
deleted file mode 100644
index 344d4a9..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-action-bt_tile_auto.png b/bibletime/pics/highcolor/22x22/hi22-action-bt_tile_auto.png
deleted file mode 100644
index 807b018..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/22x22/hi22-app-bibletime.png b/bibletime/pics/highcolor/22x22/hi22-app-bibletime.png
deleted file mode 100644
index 7c32279..0000000
--- a/bibletime/pics/highcolor/22x22/hi22-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/32x32/Makefile.am b/bibletime/pics/highcolor/32x32/Makefile.am
deleted file mode 100644
index 243eddc..0000000
--- a/bibletime/pics/highcolor/32x32/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-KDE_ICON = AUTO
-EXTRA_DIST=\
-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_lexicon.png hi32-action-bt_lexicon_add.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_tile.png hi32-action-bt_tile_auto.png hi32-app-bibletime.png 
diff --git a/bibletime/pics/highcolor/32x32/Makefile.in b/bibletime/pics/highcolor/32x32/Makefile.in
deleted file mode 100644
index c3c9611..0000000
--- a/bibletime/pics/highcolor/32x32/Makefile.in
+++ /dev/null
@@ -1,408 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_ICON = AUTO
-EXTRA_DIST =  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_lexicon.png hi32-action-bt_lexicon_add.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_tile.png hi32-action-bt_tile_auto.png hi32-app-bibletime.png 
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/32x32/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/32x32/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/32x32/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/highcolor/32x32
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/highcolor/32x32/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-#>- uninstall-am:
-#>+ 1
-uninstall-am: uninstall-kde-icons 
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 38
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions
-	$(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_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_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
-
-uninstall-kde-icons:
-	-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_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_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/bibletime.png
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/32x32/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/32x32/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_cascade.png b/bibletime/pics/highcolor/32x32/hi32-action-bt_cascade.png
deleted file mode 100644
index 263ad5f..0000000
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_cascade_auto.png b/bibletime/pics/highcolor/32x32/hi32-action-bt_cascade_auto.png
deleted file mode 100644
index d0a8461..0000000
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_tile.png b/bibletime/pics/highcolor/32x32/hi32-action-bt_tile.png
deleted file mode 100644
index 5dfd05f..0000000
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_tile_auto.png b/bibletime/pics/highcolor/32x32/hi32-action-bt_tile_auto.png
deleted file mode 100644
index 842d9ee..0000000
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/32x32/hi32-app-bibletime.png b/bibletime/pics/highcolor/32x32/hi32-app-bibletime.png
deleted file mode 100644
index 91d58f5..0000000
--- a/bibletime/pics/highcolor/32x32/hi32-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/Makefile.am b/bibletime/pics/highcolor/48x48/Makefile.am
deleted file mode 100644
index b301e25..0000000
--- a/bibletime/pics/highcolor/48x48/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-KDE_ICON = AUTO
-EXTRA_DIST=\
-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_commentary.png hi48-action-bt_commentary_add.png hi48-action-bt_displayconfig.png hi48-action-bt_lexicon.png hi48-action-bt_lexicon_add.png hi48-action-bt_startconfig.png hi48-action-bt_swordconfig.png hi48-app-bibletime.png 
diff --git a/bibletime/pics/highcolor/48x48/Makefile.in b/bibletime/pics/highcolor/48x48/Makefile.in
deleted file mode 100644
index 62248ea..0000000
--- a/bibletime/pics/highcolor/48x48/Makefile.in
+++ /dev/null
@@ -1,400 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_ICON = AUTO
-EXTRA_DIST =  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_commentary.png hi48-action-bt_commentary_add.png hi48-action-bt_displayconfig.png hi48-action-bt_lexicon.png hi48-action-bt_lexicon_add.png hi48-action-bt_startconfig.png hi48-action-bt_swordconfig.png hi48-app-bibletime.png 
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/48x48/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/48x48/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/48x48/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/highcolor/48x48
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/highcolor/48x48/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-#>- uninstall-am:
-#>+ 1
-uninstall-am: uninstall-kde-icons 
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 30
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions
-	$(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_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_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
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/hi48-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/bibletime.png
-
-uninstall-kde-icons:
-	-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_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_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/apps/bibletime.png
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/48x48/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/48x48/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_bible.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_bible.png
deleted file mode 100644
index 406d2ed..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_bible_add.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_bible_add.png
deleted file mode 100644
index 61c1a88..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_book.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_book.png
deleted file mode 100644
index 061d43e..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_book_add.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_book_add.png
deleted file mode 100644
index ec0d339..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_commentary.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_commentary.png
deleted file mode 100644
index f9ba3bb..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_commentary_add.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_commentary_add.png
deleted file mode 100644
index ca4b80d..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_displayconfig.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_displayconfig.png
deleted file mode 100644
index 0851db7..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_lexicon.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_lexicon.png
deleted file mode 100644
index 69de751..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_lexicon_add.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_lexicon_add.png
deleted file mode 100644
index 4d5e504..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_startconfig.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_startconfig.png
deleted file mode 100644
index 1dcc07c..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-action-bt_swordconfig.png b/bibletime/pics/highcolor/48x48/hi48-action-bt_swordconfig.png
deleted file mode 100644
index d79084d..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/48x48/hi48-app-bibletime.png b/bibletime/pics/highcolor/48x48/hi48-app-bibletime.png
deleted file mode 100644
index ff90bb5..0000000
--- a/bibletime/pics/highcolor/48x48/hi48-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/highcolor/Makefile.am b/bibletime/pics/highcolor/Makefile.am
deleted file mode 100644
index c36147d..0000000
--- a/bibletime/pics/highcolor/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-SUBDIRS = 16x16 22x22 32x32 48x48 
diff --git a/bibletime/pics/highcolor/Makefile.in b/bibletime/pics/highcolor/Makefile.in
deleted file mode 100644
index 343843c..0000000
--- a/bibletime/pics/highcolor/Makefile.in
+++ /dev/null
@@ -1,467 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = 16x16 22x22 32x32 48x48 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/highcolor
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/highcolor/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/highcolor/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/highcolor/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/lowcolor/16x16/Makefile.am b/bibletime/pics/lowcolor/16x16/Makefile.am
deleted file mode 100644
index 0e7bf8f..0000000
--- a/bibletime/pics/lowcolor/16x16/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-KDE_ICON = AUTO
-EXTRA_DIST=\
-lo16-action-bt_bible.png lo16-action-bt_bible_locked.png lo16-action-bt_bookmark.png lo16-action-bt_bookmark_change.png lo16-action-bt_bookmark_export.png lo16-action-bt_bookmark_import.png lo16-action-bt_bookmark_new.png lo16-action-bt_cascade.png lo16-action-bt_cascade_auto.png lo16-action-bt_commentary.png lo16-action-bt_commentary_locked.png lo16-action-bt_folder.png lo16-action-bt_folder_change.png lo16-action-bt_folder_new.png lo16-action-bt_folder_open.png lo16-action-bt_lexicon.png lo16-action-bt_lexicon_locked.png lo16-action-bt_search.png lo16-action-bt_tile.png lo16-action-bt_tile_auto.png lo16-action-bt_verseref.png lo16-app-bibletime.png 
diff --git a/bibletime/pics/lowcolor/16x16/Makefile.in b/bibletime/pics/lowcolor/16x16/Makefile.in
deleted file mode 100644
index 86d21ff..0000000
--- a/bibletime/pics/lowcolor/16x16/Makefile.in
+++ /dev/null
@@ -1,420 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_ICON = AUTO
-EXTRA_DIST =  lo16-action-bt_bible.png lo16-action-bt_bible_locked.png lo16-action-bt_bookmark.png lo16-action-bt_bookmark_change.png lo16-action-bt_bookmark_export.png lo16-action-bt_bookmark_import.png lo16-action-bt_bookmark_new.png lo16-action-bt_cascade.png lo16-action-bt_cascade_auto.png lo16-action-bt_commentary.png lo16-action-bt_commentary_locked.png lo16-action-bt_folder.png lo16-action-bt_folder_change.png lo16-action-bt_folder_new.png lo16-action-bt_folder_open.png lo16-action-bt_lexicon.png lo16-action-bt_lexicon_locked.png lo16-action-bt_search.png lo16-action-bt_tile.png lo16-action-bt_tile_auto.png lo16-action-bt_verseref.png lo16-app-bibletime.png 
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/16x16/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/16x16/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/lowcolor/16x16/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/lowcolor/16x16
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/lowcolor/16x16/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-#>- uninstall-am:
-#>+ 1
-uninstall-am: uninstall-kde-icons 
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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)/locolor/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_bible.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bible_locked.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_bookmark.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_bookmark_change.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark_change.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_bookmark_export.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark_export.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_bookmark_import.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark_import.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_bookmark_new.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark_new.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_folder.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_folder.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_folder_change.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_folder_change.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_folder_new.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_folder_new.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_folder_open.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_folder_open.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_search.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_search.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_tile.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_tile_auto.png
-	$(INSTALL_DATA) $(srcdir)/lo16-action-bt_verseref.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_verseref.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/lo16-app-bibletime.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/bibletime.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bible_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark_change.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark_export.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark_import.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_bookmark_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_folder.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_folder_change.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_folder_new.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_folder_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_search.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/bt_verseref.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/bibletime.png
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/16x16/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/lowcolor/16x16/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bible.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_bible.png
deleted file mode 100644
index 14b16bf..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bible_locked.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_bible_locked.png
deleted file mode 100644
index 785b5f6..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark.png
deleted file mode 100644
index 35488c7..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_change.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_change.png
deleted file mode 100644
index 7677f2c..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_change.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_export.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_export.png
deleted file mode 100644
index 17edfd4..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_export.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_import.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_import.png
deleted file mode 100644
index 7065829..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_import.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_new.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_new.png
deleted file mode 100644
index c286cfc..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_bookmark_new.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_cascade.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_cascade.png
deleted file mode 100644
index 98e81c9..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_cascade_auto.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_cascade_auto.png
deleted file mode 100644
index fcb3ebc..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_commentary.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_commentary.png
deleted file mode 100644
index 54348d4..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_commentary_locked.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_commentary_locked.png
deleted file mode 100644
index 0369182..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder.png
deleted file mode 100644
index c7aea04..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_change.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_change.png
deleted file mode 100644
index c7aea04..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_change.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_new.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_new.png
deleted file mode 100644
index ba7b6c9..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_new.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_open.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_open.png
deleted file mode 100644
index d838b76..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_folder_open.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_lexicon.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_lexicon.png
deleted file mode 100644
index 1a5c363..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_lexicon_locked.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_lexicon_locked.png
deleted file mode 100644
index 00626db..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_search.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_search.png
deleted file mode 100644
index fb43c80..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_search.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_tile.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_tile.png
deleted file mode 100644
index b466f5b..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_tile_auto.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_tile_auto.png
deleted file mode 100644
index 80eafdd..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-action-bt_verseref.png b/bibletime/pics/lowcolor/16x16/lo16-action-bt_verseref.png
deleted file mode 100644
index 8e05bd8..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-action-bt_verseref.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/16x16/lo16-app-bibletime.png b/bibletime/pics/lowcolor/16x16/lo16-app-bibletime.png
deleted file mode 100644
index 08f046e..0000000
--- a/bibletime/pics/lowcolor/16x16/lo16-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/22x22/Makefile.am b/bibletime/pics/lowcolor/22x22/Makefile.am
deleted file mode 100644
index a24a189..0000000
--- a/bibletime/pics/lowcolor/22x22/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-KDE_ICON = AUTO
-EXTRA_DIST=\
-lo22-action-bt_cascade.png lo22-action-bt_cascade_auto.png lo22-action-bt_tile.png lo22-action-bt_tile_auto.png 
diff --git a/bibletime/pics/lowcolor/22x22/Makefile.in b/bibletime/pics/lowcolor/22x22/Makefile.in
deleted file mode 100644
index adac6eb..0000000
--- a/bibletime/pics/lowcolor/22x22/Makefile.in
+++ /dev/null
@@ -1,383 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_ICON = AUTO
-EXTRA_DIST =  lo22-action-bt_cascade.png lo22-action-bt_cascade_auto.png lo22-action-bt_tile.png lo22-action-bt_tile_auto.png 
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/22x22/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/22x22/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/lowcolor/22x22/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/lowcolor/22x22
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/lowcolor/22x22/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-#>- uninstall-am:
-#>+ 1
-uninstall-am: uninstall-kde-icons 
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 13
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/lo22-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/lo22-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/lo22-action-bt_tile.png $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/lo22-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/bt_tile_auto.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/bt_tile_auto.png
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/22x22/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/lowcolor/22x22/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/lowcolor/22x22/lo22-action-bt_cascade.png b/bibletime/pics/lowcolor/22x22/lo22-action-bt_cascade.png
deleted file mode 100644
index b837d36..0000000
--- a/bibletime/pics/lowcolor/22x22/lo22-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/22x22/lo22-action-bt_cascade_auto.png b/bibletime/pics/lowcolor/22x22/lo22-action-bt_cascade_auto.png
deleted file mode 100644
index db66d54..0000000
--- a/bibletime/pics/lowcolor/22x22/lo22-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/22x22/lo22-action-bt_tile.png b/bibletime/pics/lowcolor/22x22/lo22-action-bt_tile.png
deleted file mode 100644
index 344d4a9..0000000
--- a/bibletime/pics/lowcolor/22x22/lo22-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/22x22/lo22-action-bt_tile_auto.png b/bibletime/pics/lowcolor/22x22/lo22-action-bt_tile_auto.png
deleted file mode 100644
index 807b018..0000000
--- a/bibletime/pics/lowcolor/22x22/lo22-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/32x32/Makefile.am b/bibletime/pics/lowcolor/32x32/Makefile.am
deleted file mode 100644
index ce312f0..0000000
--- a/bibletime/pics/lowcolor/32x32/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-KDE_ICON = AUTO
-EXTRA_DIST=\
-lo32-action-bt_tile.png lo32-action-bt_tile_auto.png lo32-app-bibletime.png 
diff --git a/bibletime/pics/lowcolor/32x32/Makefile.in b/bibletime/pics/lowcolor/32x32/Makefile.in
deleted file mode 100644
index 263a372..0000000
--- a/bibletime/pics/lowcolor/32x32/Makefile.in
+++ /dev/null
@@ -1,382 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-KDE_ICON = AUTO
-EXTRA_DIST =  lo32-action-bt_tile.png lo32-action-bt_tile_auto.png lo32-app-bibletime.png 
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/32x32/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/32x32/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/lowcolor/32x32/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/lowcolor/32x32
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/lowcolor/32x32/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-#>- uninstall-am:
-#>+ 1
-uninstall-am: uninstall-kde-icons 
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 12
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/lo32-action-bt_tile.png $(DESTDIR)$(kde_icondir)/locolor/32x32/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/lo32-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/locolor/32x32/actions/bt_tile_auto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/lo32-app-bibletime.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/bibletime.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/bibletime.png
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/32x32/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/lowcolor/32x32/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/lowcolor/32x32/lo32-action-bt_tile.png b/bibletime/pics/lowcolor/32x32/lo32-action-bt_tile.png
deleted file mode 100644
index f45a245..0000000
--- a/bibletime/pics/lowcolor/32x32/lo32-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/32x32/lo32-action-bt_tile_auto.png b/bibletime/pics/lowcolor/32x32/lo32-action-bt_tile_auto.png
deleted file mode 100644
index 767f284..0000000
--- a/bibletime/pics/lowcolor/32x32/lo32-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/32x32/lo32-app-bibletime.png b/bibletime/pics/lowcolor/32x32/lo32-app-bibletime.png
deleted file mode 100644
index 9c9347f..0000000
--- a/bibletime/pics/lowcolor/32x32/lo32-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/lowcolor/Makefile.am b/bibletime/pics/lowcolor/Makefile.am
deleted file mode 100644
index 31bfd6f..0000000
--- a/bibletime/pics/lowcolor/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-SUBDIRS = 16x16 22x22 32x32 
diff --git a/bibletime/pics/lowcolor/Makefile.in b/bibletime/pics/lowcolor/Makefile.in
deleted file mode 100644
index 500b888..0000000
--- a/bibletime/pics/lowcolor/Makefile.in
+++ /dev/null
@@ -1,467 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-# this Makefile.am was automatically generated by bibletime/pics/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-SUBDIRS = 16x16 22x22 32x32 
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/lowcolor/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/pics/lowcolor
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/pics/lowcolor/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/lowcolor/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/lowcolor/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/pics/startuplogo.png b/bibletime/pics/startuplogo.png
index 54f1697..ff7db20 100644
--- a/bibletime/pics/startuplogo.png
+++ b/bibletime/pics/startuplogo.png
diff --git a/bibletime/pics/startuplogo.xcf b/bibletime/pics/startuplogo.xcf
deleted file mode 100644
index 0a4ce34..0000000
--- a/bibletime/pics/startuplogo.xcf
+++ /dev/null
diff --git a/bibletime/pics/startuplogo.xcf.bz2 b/bibletime/pics/startuplogo.xcf.bz2
new file mode 100644
index 0000000..d1e2518
--- /dev/null
+++ b/bibletime/pics/startuplogo.xcf.bz2
diff --git a/bibletime/printing/Makefile.am b/bibletime/printing/Makefile.am
index 719cbea..76e33d5 100644
--- a/bibletime/printing/Makefile.am
+++ b/bibletime/printing/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = style-data
-
 INCLUDES = $(all_includes)
 
 libprinting_a_METASOURCES = AUTO
diff --git a/bibletime/printing/Makefile.in b/bibletime/printing/Makefile.in
index be29687..0806ddb 100644
--- a/bibletime/printing/Makefile.in
+++ b/bibletime/printing/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,152 +229,208 @@ 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@
-micodir = @micodir@
+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@
-
-SUBDIRS = style-data
-
+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
+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
+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 = ../../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libprinting_a_LIBADD = 
-#>- libprinting_a_OBJECTS =  cstylelist.$(OBJEXT) cprintitemlist.$(OBJEXT) \
-#>- cprintitem.$(OBJEXT) cstyle.$(OBJEXT) cstyleeditordialog.$(OBJEXT) \
-#>- cprinter.$(OBJEXT) cprintdialogpages.$(OBJEXT)
+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 cstyleeditordialog.moc.o cprinter.moc.o cprintitemlist.moc.o cprintdialogpages.moc.o  \
-libprinting_a_meta_unload.o 
+	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)
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 1
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-#>+ 1
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=cstyle.h cprinter.h cstylelist.h cprintdialogpages.h cstyleeditordialog.h cprintitem.h cprintitemlist.h 
-
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-
-TAR = tar
-GZIP_ENV = --best
-#>- DEP_FILES =  .deps/cprintdialogpages.P .deps/cprinter.P \
-#>- .deps/cprintitem.P .deps/cprintitemlist.P .deps/cstyle.P \
-#>- .deps/cstyleeditordialog.P .deps/cstylelist.P
-#>+ 8
-@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cstylelist.moc.P $(DEPDIR)/cstyleeditordialog.moc.P $(DEPDIR)/cprinter.moc.P $(DEPDIR)/cprintitemlist.moc.P $(DEPDIR)/cprintdialogpages.moc.P $(DEPDIR)/libprinting_a_meta_unload.P  $(DEPDIR)/libprinting_a.all_cpp.P \
-	  .deps/cprintdialogpages.P .deps/cprinter.P \
-.deps/cprintitem.P .deps/cprintitemlist.P .deps/cstyle.P \
-.deps/cstyleeditordialog.P .deps/cstylelist.P
-@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cstylelist.moc.P $(DEPDIR)/cstyleeditordialog.moc.P $(DEPDIR)/cprinter.moc.P $(DEPDIR)/cprintitemlist.moc.P $(DEPDIR)/cprintdialogpages.moc.P $(DEPDIR)/libprinting_a_meta_unload.P   .deps/cprintdialogpages.P .deps/cprinter.P \
-.deps/cprintitem.P .deps/cprintitemlist.P .deps/cstyle.P \
-.deps/cstyleeditordialog.P .deps/cstylelist.P
 
+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)
-OBJECTS = $(libprinting_a_OBJECTS)
 
-#>- all: all-redirect
+#>- all: all-am
 #>+ 1
-all: docs-am  all-redirect
+all: docs-am  all-am
+
 .SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/printing/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/printing/Makefile
+.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: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
+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)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+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 *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
+@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@
 
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
 
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.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
@@ -356,277 +439,188 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 
-maintainer-clean-libtool:
-
-libprinting.a: $(libprinting_a_OBJECTS) $(libprinting_a_DEPENDENCIES)
-	-rm -f libprinting.a
-	$(AR) cru libprinting.a $(libprinting_a_OBJECTS) $(libprinting_a_LIBADD)
-	$(RANLIB) libprinting.a
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.obj:
-	$(CXXCOMPILE) -c `cygpath -w $<`
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
-
-# 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.
-
-@SET_MAKE@
+ETAGS = etags
+ETAGSFLAGS =
 
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	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; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && 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 = ctags
+CTAGSFLAGS =
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+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
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-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)
 
-subdir = bibletime/printing
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/printing/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    || cp -p $$d/$$file $(distdir)/$$file \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-
-%.o: %.cpp
-	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.cpp
-	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
 check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
+check: check-am
+all-am: Makefile $(LIBRARIES)
 
-install-data-am:
-install-data: install-data-recursive
+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
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
+	@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-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-#>- 		clean-depend clean-generic mostlyclean-am
+#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+#>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-moc-classes clean-final   clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
 
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
+distclean: distclean-am
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-libtool distclean-tags
 
-distclean: distclean-recursive
+dvi: dvi-am
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+dvi-am:
+
+info: info-am
 
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+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.
@@ -636,76 +630,116 @@ mostlyclean distclean maintainer-clean
 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
 
-#>+ 3
-cprintitemlist.moc.cpp: $(srcdir)/cprintitemlist.h
-	$(MOC) $(srcdir)/cprintitemlist.h -o cprintitemlist.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 cstyleeditordialog.moc.cpp cprinter.moc.cpp cprintitemlist.moc.cpp cprintdialogpages.moc.cpp
+	-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:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/printing/Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  bibletime/printing/Makefile
 	cd $(top_srcdir) && perl admin/am_edit bibletime/printing/Makefile.in
 
 
-#>+ 10
-libprinting_a_meta_unload.cpp:  cstylelist.moc.cpp cstyleeditordialog.moc.cpp cprintitemlist.moc.cpp cprinter.moc.cpp cprintdialogpages.moc.cpp
-	@echo 'creating libprinting_a_meta_unload.cpp'
-	@-rm -f libprinting_a_meta_unload.cpp
-	@echo 'static const char * _metalist_libprinting_a[] = {' > libprinting_a_meta_unload.cpp
-	@cat  cstylelist.moc.cpp cstyleeditordialog.moc.cpp cprintitemlist.moc.cpp cprinter.moc.cpp cprintdialogpages.moc.cpp | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libprinting_a_meta_unload.cpp
-	@echo '0};' >> libprinting_a_meta_unload.cpp
-	@echo '#include <kunload.h>' >> libprinting_a_meta_unload.cpp
-	@echo '_UNLOAD(libprinting_a)' >> libprinting_a_meta_unload.cpp
-
+#>+ 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
 
-#>+ 3
-clean-moc-classes:
-	-rm -f  libprinting_a_meta_unload.cpp
 
 #>+ 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 libprinting_a_meta_unload.cpp  cstylelist.moc.cpp cstyleeditordialog.moc.cpp cprinter.moc.cpp cprintitemlist.moc.cpp cprintdialogpages.moc.cpp
+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 libprinting_a_meta_unload.cpp  cstylelist.moc.cpp cstyleeditordialog.moc.cpp cprinter.moc.cpp cprintitemlist.moc.cpp cprintdialogpages.moc.cpp; do \
+	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; \
+	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
 
-#>+ 2
+#>+ 3
 final:
 	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_final_OBJECTS)" all-am
-#>+ 2
+
+#>+ 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) -f $(top_srcdir)/admin/Makefile.common 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
index 625f604..3602169 100644
--- a/bibletime/printing/cprintdialogpages.cpp
+++ b/bibletime/printing/cprintdialogpages.cpp
@@ -20,9 +20,8 @@
 #include "cprintdialogpages.h"
 #include "cprintitemlist.h"
 #include "cprintitem.h"
-#include "tooltipdef.h"
-#include "resource.h"
-#include "whatsthisdef.h"
+
+#include "util/cresmgr.h"
 
 //QT includes
 #include <qbuttongroup.h>
@@ -34,9 +33,11 @@
 #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) {
@@ -45,21 +46,21 @@ CStyleListPage::CStyleListPage(CPrinter* printer, QWidget *parent, const char *n
 //  QFrame *page = addPage( i18n("Layout"), i18n("Layout specific settings") );
   QVBoxLayout *topLayout = new QVBoxLayout( this, 5, 5 );
   	
-  QButtonGroup *group = new QButtonGroup( i18n("Margins (in millimeter)"), this );
-  QWhatsThis::add(group, WT_PD_LAYOUT_BORDER);
+  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 name[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") };
+  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], name[i], group );
+    QLabel *label = new QLabel( m_marginSpin[i], designation[i], group );
     label->setFixedHeight( m_marginSpin[i]->sizeHint().height() );
     label->setFixedWidth( label->sizeHint().width() );
 
@@ -74,17 +75,18 @@ CStyleListPage::CStyleListPage(CPrinter* printer, QWidget *parent, const char *n
       gbox->addWidget( m_marginSpin[i], i-1, 4, AlignLeft );
     }
   }
-  QWhatsThis::add(m_marginSpin[0], WT_PD_LAYOUT_BORDER_TOP);
-  QWhatsThis::add(m_marginSpin[1], WT_PD_LAYOUT_BORDER_BOTTOM);
-  QWhatsThis::add(m_marginSpin[2], WT_PD_LAYOUT_BORDER_LEFT);
-  QWhatsThis::add(m_marginSpin[3], WT_PD_LAYOUT_BORDER_RIGHT);
+  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);
 
-  QToolTip::add(m_marginSpin[0], TT_PD_LAYOUT_BORDER_TOP);
-  QToolTip::add(m_marginSpin[1], TT_PD_LAYOUT_BORDER_BOTTOM);
-  QToolTip::add(m_marginSpin[2], TT_PD_LAYOUT_BORDER_LEFT);
-  QToolTip::add(m_marginSpin[3], TT_PD_LAYOUT_BORDER_RIGHT);
 
-  gbox->activate();	
+  gbox->activate();
   group->setFixedHeight( group->sizeHint().height() );
   //set minimum borders
   m_marginSpin[0]->setRange(0, 100);	//upper margin
@@ -95,35 +97,32 @@ CStyleListPage::CStyleListPage(CPrinter* printer, QWidget *parent, const char *n
   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("List of style items:"), this);
+//	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->setOnIconSet( SmallIcon(ICON_FILE_NEW));
-	m_newStyleButton->setOffIconSet( SmallIcon(ICON_FILE_NEW));	
-	QToolTip::add(m_newStyleButton, TT_PD_LAYOUT_STYLE_NEW);	
-	QWhatsThis::add(m_newStyleButton, WT_PD_LAYOUT_STYLE_NEW);	
+	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->setOnIconSet( SmallIcon(ICON_FILE_DELETE));
-	m_deleteStyleButton->setOffIconSet( SmallIcon(ICON_FILE_DELETE));	
-	QToolTip::add(m_deleteStyleButton, TT_PD_LAYOUT_STYLE_DELETE);	
-	QWhatsThis::add(m_deleteStyleButton, WT_PD_LAYOUT_STYLE_DELETE);		
+
+	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->setOnIconSet( SmallIcon(ICON_EDIT));
-	m_editStyleButton->setOffIconSet( SmallIcon(ICON_EDIT));	
-	QToolTip::add(m_editStyleButton, TT_PD_LAYOUT_STYLE_EDIT);	
-	QWhatsThis::add(m_editStyleButton, WT_PD_LAYOUT_STYLE_EDIT);		
+	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 );
@@ -141,12 +140,12 @@ CStyleListPage::~CStyleListPage() {
 
 }
 
-void  CStyleListPage::getOptions (QMap<QString, QString>& opts, bool incldef) {
-	qWarning("CStyleListPage::getOptions (const QMap<QString,QString>& opts, bool)");
+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());
+//	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());
@@ -166,7 +165,7 @@ void  CStyleListPage::setOptions (const QMap<QString,QString>& opts) {
 	m_marginSpin[3]->setValue( option.toInt() );
 }
 
-bool  CStyleListPage::isValid (QString& errorMessage) {
+bool  CStyleListPage::isValid(QString& /*errorMessage*/) {
 	return true;
 }
 
@@ -196,11 +195,11 @@ CPrintItemListPage::CPrintItemListPage(CPrinter* printer, QWidget *parent, const
   QLabel*	label = 0;
 
   m_styleComboBox = new QComboBox( this, "styleComboBox" );
-	QToolTip::add(m_styleComboBox, TT_PD_ENTRIES_STYLE_COMBO);
-	QWhatsThis::add(m_styleComboBox, WT_PD_ENTRIES_STYLE_COMBO);
+	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("Choose a style"), this);
+  label = new QLabel( m_styleComboBox, i18n("Use style:"), this);
   QHBoxLayout*	hboxLayout = new QHBoxLayout( 0, 5, 5 );
   hboxLayout->addWidget( label );
   hboxLayout->addWidget( m_styleComboBox );
@@ -208,35 +207,32 @@ CPrintItemListPage::CPrintItemListPage(CPrinter* printer, QWidget *parent, const
 
   hboxLayout = new QHBoxLayout( 0, 5, 5 );
 
-  m_printItemList = new CPrintItemList( &(m_printer->printQueue()), this, "CPrintItemList1");
-	QToolTip::add(m_printItemList, TT_PD_ENTRIES_PI_LIST);
-	QWhatsThis::add(m_printItemList, WT_PD_ENTRIES_PI_LIST);
+  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 which should be printed:"), this);
+  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->setOnIconSet( SmallIcon("up"));
-	m_moveUpButton->setOffIconSet( SmallIcon("up"));	
-	QToolTip::add(m_moveUpButton, TT_PD_ENTRIES_PI_MOVE_UP);
-	QWhatsThis::add(m_moveUpButton, WT_PD_ENTRIES_PI_MOVE_UP);	
+ 	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->setOnIconSet( SmallIcon("down"));
-	m_moveDownButton->setOffIconSet( SmallIcon("down"));	
-	QToolTip::add(m_moveDownButton, TT_PD_ENTRIES_PI_MOVE_DOWN);
-	QWhatsThis::add(m_moveDownButton, WT_PD_ENTRIES_PI_MOVE_DOWN);
+ 	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->setOnIconSet( SmallIcon("edittrash"));
-	m_deleteButton->setOffIconSet( SmallIcon("edittrash"));	
-	QToolTip::add(m_deleteButton, TT_PD_ENTRIES_PI_DELETE);
-	QWhatsThis::add(m_deleteButton, WT_PD_ENTRIES_PI_DELETE);		
+	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);
@@ -255,15 +251,15 @@ CPrintItemListPage::~CPrintItemListPage() {
 
 }
 
-void CPrintItemListPage::getOptions (QMap<QString, QString>& opts, bool incldef) {
+void CPrintItemListPage::getOptions (QMap<QString, QString>& /*opts*/, bool /*incldef*/) {
 
 }
 
-void CPrintItemListPage::setOptions (const QMap<QString,QString>& opts) {
+void CPrintItemListPage::setOptions (const QMap<QString,QString>& /*opts*/) {
 
 }
 
-bool CPrintItemListPage::isValid(QString& errorMessage) {
+bool CPrintItemListPage::isValid(QString& /*errorMessage*/) {
 	return true;
 }
 
diff --git a/bibletime/printing/cprintdialogpages.h b/bibletime/printing/cprintdialogpages.h
index bf5e483..27bb7c2 100644
--- a/bibletime/printing/cprintdialogpages.h
+++ b/bibletime/printing/cprintdialogpages.h
@@ -20,6 +20,7 @@
 
 //Qt includes
 #include <qwidget.h>
+#include <qtoolbutton.h>
 
 //KDE includes
 #include <kdeprint/kprintdialogpage.h>
diff --git a/bibletime/printing/cprinter.cpp b/bibletime/printing/cprinter.cpp
index ce465f6..632e54a 100644
--- a/bibletime/printing/cprinter.cpp
+++ b/bibletime/printing/cprinter.cpp
@@ -27,9 +27,9 @@
 #include <kconfig.h>
 #include <kprocess.h>
 #include <kconfigbase.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 #include <klocale.h>
-#include <kapp.h>
+#include <kapplication.h>
 
 //Qt includes
 #include <qfile.h>
@@ -39,7 +39,47 @@
 #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);			
@@ -111,7 +151,8 @@ void CPrinter::setup( QWidget* parent ){
 
 /** Starts printing the items. */
 void CPrinter::print(){
-	emit printingStarted();
+  emit printingStarted();
+  
 	QPainter p;
 	if (!p.begin(this)) {
 		p.end();
@@ -125,19 +166,25 @@ void CPrinter::print(){
 	emit percentCompleted(0);
 	
 	for (int copy = 0; copy < copies && !aborted(); copy++) {	//make numCopies() copies of the pages
-		copyFrac = (float(copies))/ (float)(copy+1);
+		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)
+				if ((int)((float)pos / (float)count *(float)100 * copyFrac) > lastPercent) {
 					emit percentCompleted(++lastPercent);
+        }
 			}
 		};
-		if (!aborted() && (copy+1 < copies) )
+		if (!aborted() && (copy+1 < copies) ) {
 			newPage();	//new pages seperate copies
+    }
 	}
-	emit printingFinished();	
+
+  //clean up
+  p.end(); //send the data to the printer
+  emit printingFinished();
 	clearQueue();//delete all items
 }
 
@@ -161,7 +208,7 @@ void CPrinter::clearQueue(){
 }
 
 /** Returns the print queue object. */
-ListCPrintItem& CPrinter::printQueue() {
+ListCPrintItem& CPrinter::queue() {
 	return m_queue;
 }
 
@@ -189,10 +236,46 @@ 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( new CStyle(m_styleSaveLocation + *it) ); //automatically load from file		
+		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);
@@ -201,7 +284,8 @@ void CPrinter::setupStyles(){
 			d = QDir( *path );
 			QStringList files = d.entryList("*.xml");
 			for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-				CStyle* newStyle = new CStyle(*path + *it);
+				CStyle* newStyle = new CStyle();
+        newStyle->loadFromFile(*path + *it);
 				
 				bool found = false;				
 				for(m_styleList.first(); m_styleList.current() && !found; m_styleList.next()) {
@@ -213,6 +297,9 @@ void CPrinter::setupStyles(){
 				if (!found) {
 					m_styleList.append( newStyle );
 				}
+        else {
+          delete newStyle;
+        };
 			}		
 		}
 	}
@@ -227,7 +314,7 @@ void CPrinter::saveStyles(){
 	}
 	
 	for (m_styleList.first(); m_styleList.current(); m_styleList.next()) {
-		m_styleList.current()->save(  m_styleSaveLocation + QString::fromLatin1("printing-style-%1").arg(m_styleList.at()) + ".xml" );
+		m_styleList.current()->saveToFile(  m_styleSaveLocation + QString::fromLatin1("printing-style-%1").arg(m_styleList.at()) + ".xml" );
 	}
 }
 
@@ -318,22 +405,12 @@ void CPrinter::setupStandardStyle(){
 	}
 }
 
-/** returns the vertical position of the printer's painter. */
-const int CPrinter::verticalPos() const {
-	return m_pagePosition.rect.y();
-}
-
 /** 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. */
-void CPrinter::emitStylesChanged(){
-	emit sigStylesChanged();
-}
-
-/** 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
index 1b8301a..0037699 100644
--- a/bibletime/printing/cprinter.h
+++ b/bibletime/printing/cprinter.h
@@ -19,7 +19,7 @@
 #define CPRINTER_H
 
 //BibleTime includes
-#include "frontend/cpointers.h"
+#include "util/cpointers.h"
 #include "cprintitemlist.h"
 #include "cprintitem.h"
 #include "cstylelist.h"
@@ -101,7 +101,7 @@ public:
   /**
  	* Returns the print queue object.
  	*/
-  ListCPrintItem& printQueue();
+  ListCPrintItem& queue();
   /**
  	* Appends items to the printing queue.
  	*/
@@ -179,7 +179,12 @@ private:
 	} m_cachedPage;
 	
 	bool m_addedItem;
-	
+
+  struct {
+    QString standardStyle;
+    QString bwStyle;
+  } m_styleData;
+	 	
 	QString m_styleSaveLocation;
 	QString m_styleDir;
 	
@@ -216,4 +221,15 @@ signals: // Signals
   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
index c189c83..6091090 100644
--- a/bibletime/printing/cprintitem.cpp
+++ b/bibletime/printing/cprintitem.cpp
@@ -22,7 +22,8 @@
 #include "backend/cswordmoduleinfo.h"
 #include "backend/cswordversekey.h"
 #include "backend/cswordldkey.h"
-#include "backend/chtmlentrydisplay.h"
+#include "backend/cswordtreekey.h"
+//#include "backend/chtmlentrydisplay.h"
 #include "frontend/cbtconfig.h"
 #include "util/scoped_resource.h"
 
@@ -58,10 +59,16 @@ CStyle* const CPrintItem::ListViewItem::style() const {
 };
 
 
-CPrintItem::CPrintItem(CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description,const CSwordBackend::DisplayOptionsBool displayOptions, const CSwordBackend::FilterOptionsBool 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)
+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;
@@ -99,13 +106,27 @@ const QString& CPrintItem::moduleText() {
 		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=\"-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->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>+"), "");	
@@ -117,7 +138,7 @@ void CPrintItem::setStyle( CStyle* newStyle ) {
 	m_style = newStyle;
 }
 
-CStyle*const CPrintItem::style() const {
+CStyle* const CPrintItem::style() const {
 	return m_style;
 }
 
@@ -147,6 +168,7 @@ void CPrintItem::updateListViewItem(){
 }
 
 /**  */
+
 QListViewItem* const CPrintItem::listViewItem() const {
 	return m_listViewItem;
 }
@@ -180,7 +202,6 @@ void CPrintItem::draw(QPainter* p, CPrinter* printer){
 	QPen pen;
 	QBrush brush;
 
-	const bool isUnicode 	= (m_module && m_module->isUnicode());
 	const int leftMargin 	= printer->pageMargins().left;
 	const int upperMargin = printer->pageMargins().top;	
 	const QRect pageSize =  printer->contentSize();
@@ -207,9 +228,6 @@ void CPrintItem::draw(QPainter* p, CPrinter* printer){
 		bgColor = format->color( CStyle::Format::Background );
 		pen.setColor(fgColor);
 		font = format->font();
-		if (isUnicode) { //enable unicode
-			font.setCharSet( QFont::Unicode );
-		}
 		
 		frame = format->frame();
 		frameThickness = frame ? frame->thickness() : 0;		
@@ -268,7 +286,7 @@ void CPrintItem::draw(QPainter* p, CPrinter* printer){
 			br = boundingRect;	// the rect for the border		
 			/**
 			* we have to substract frameThickness/2,
-			* because QPainter paints one half outline and the other part inside the rectangle.
+			* because QPainter paints one half outside and the other part inside the rectangle.
 			*/
 			const int halfWidth = (int)((float)frameThickness/2);
 
@@ -309,8 +327,7 @@ void CPrintItem::draw(QPainter* p, CPrinter* printer){
 		else if (type == CStyle::ModuleText) {		
 			p->save();
 			
-			if (isUnicode)
-				font = CBTConfig::get( CBTConfig::unicode );
+			font = CBTConfig::get( m_module->language() ).second;
 
 			if (alignment == CStyle::Format::Center)		
 				text = QString::fromLatin1("<CENTER>%1</CENTER>").arg(text);
diff --git a/bibletime/printing/cprintitem.h b/bibletime/printing/cprintitem.h
index f60572e..81b33a3 100644
--- a/bibletime/printing/cprintitem.h
+++ b/bibletime/printing/cprintitem.h
@@ -24,7 +24,7 @@
 //Qt includes
 #include <qobject.h>
 #include <qguardedptr.h>
-#include <qlist.h>
+#include <qptrlist.h>
 #include <qlistview.h>
 
 class CSwordKey;
@@ -34,7 +34,7 @@ class CPrinter;
 class CPrintItem;
 class CPrintItemList;
 
-typedef QList<CPrintItem> ListCPrintItem;
+typedef QPtrList<CPrintItem> ListCPrintItem;
 
 /**
 	* The class which implements the printable items.
@@ -51,7 +51,7 @@ public:
 			CPrintItem* m_printItem;
   };
 	
-	CPrintItem(CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description = QString::null, const CSwordBackend::DisplayOptionsBool displayOptions = CBTConfig::getDisplayOptionDefaults(),const CSwordBackend::FilterOptionsBool filterOptions = CBTConfig::getFilterOptionDefaults() );
+	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.
  	*/
@@ -96,8 +96,8 @@ private: // Protected attributes
   CSwordModuleInfo* m_module;
   QListViewItem* m_listViewItem;
 
-  CSwordBackend::DisplayOptionsBool m_displayOptions;
-  CSwordBackend::FilterOptionsBool m_filterOptions;
+  CSwordBackend::DisplayOptions m_displayOptions;
+  CSwordBackend::FilterOptions m_filterOptions;
 };
 
 #endif
diff --git a/bibletime/printing/cprintitemlist.cpp b/bibletime/printing/cprintitemlist.cpp
index 665777f..3bd6ad6 100644
--- a/bibletime/printing/cprintitemlist.cpp
+++ b/bibletime/printing/cprintitemlist.cpp
@@ -45,7 +45,10 @@ void CPrintItemList::initView(){
 	addColumn(i18n("From"), -1);
 	addColumn(i18n("To"), -1);	
 	addColumn(i18n("Style"), -1);	
-	
+
+  //disable sorting for all columns
+  setSorting(-1);    
+  	
 	setSelectionMode( QListView::Extended );
 }
 
@@ -70,7 +73,7 @@ void CPrintItemList::setItems( ListCPrintItem* itemList ){
 
 /** Deletes the current item. */
 void CPrintItemList::deleteSelectedItems(){
-	QList<QListViewItem> items = selectedItems();	
+	QPtrList<QListViewItem> items = selectedItems();	
 	if (!items.count())
 		return;
 	const bool autoDelete = items.autoDelete();
@@ -80,7 +83,9 @@ void CPrintItemList::deleteSelectedItems(){
 		if ( CPrintItem::ListViewItem* item = dynamic_cast<CPrintItem::ListViewItem*>(items.current()) ) {
 			if (!(p = item->printItem()))
 				continue;
-			m_items->removeRef(p);			
+      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;
@@ -90,7 +95,7 @@ void CPrintItemList::deleteSelectedItems(){
 
 /** Moves the item one item up. */
 void CPrintItemList::moveUp(){
-	QList<QListViewItem> items = selectedItems();
+	QPtrList<QListViewItem> items = selectedItems();
 	for (items.first(); items.current(); items.next()) {
 		QListViewItem* current = items.current();
 		if (current && current->itemAbove() &&  current->itemAbove()->itemAbove()) {
@@ -101,7 +106,7 @@ void CPrintItemList::moveUp(){
 
 /** Moves the selected entry one entry down. */
 void CPrintItemList::moveDown(){
-	QList<QListViewItem> items = selectedItems();
+	QPtrList<QListViewItem> items = selectedItems();
 	for (items.last(); items.current(); items.prev()) {
 		QListViewItem* current = items.current();
 		if (current && current->itemBelow()) {
@@ -114,7 +119,7 @@ void CPrintItemList::moveDown(){
 void CPrintItemList::applyStyleToSelected( CStyle* style){
 	CPrintItem* printItem;
 	CPrintItem::ListViewItem* item;
-	QList<QListViewItem> list = selectedItems();
+	QPtrList<QListViewItem> list = selectedItems();
 	for ( QListViewItem* i = list.first(); i; i = list.next()) {
 		if ((item = dynamic_cast<CPrintItem::ListViewItem*>(i))) {
 			printItem = item->printItem();
diff --git a/bibletime/printing/cprintitemlist.h b/bibletime/printing/cprintitemlist.h
index a0d7060..fc1cf8f 100644
--- a/bibletime/printing/cprintitemlist.h
+++ b/bibletime/printing/cprintitemlist.h
@@ -19,7 +19,7 @@
 #define CPRINTITEMLIST_H
 
 #include <qwidget.h>
-#include <qlist.h>
+#include <qptrlist.h>
 #include <klistview.h>
 
 #include "cprintitem.h"
diff --git a/bibletime/printing/cstyle.cpp b/bibletime/printing/cstyle.cpp
index ac01aa6..b460fc8 100644
--- a/bibletime/printing/cstyle.cpp
+++ b/bibletime/printing/cstyle.cpp
@@ -20,7 +20,7 @@
 
 
 //Qt includes
-#include <qapp.h>
+#include <qapplication.h>
 #include <qdom.h>
 #include <qfile.h>
 #include <qlistview.h>
@@ -177,17 +177,17 @@ CStyle::CStyle() :
 {
 
 	//dummy command to translate names of standard styles
-	i18n("Standard");
-	i18n("Colored style for larger test portions");
-	i18n("Black&White for larger test portions");
+//	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 name") );
+	setStyleName( i18n("Unknown") );
 };
 
-CStyle::CStyle( const QString filename ) :
+CStyle::CStyle( const QString text ) :
 	m_headerFormat(new Format(CStyle::Header)),
 	m_descriptionFormat(new Format(CStyle::Description)),
 	m_moduleTextFormat(new Format(CStyle::ModuleText))
@@ -195,10 +195,13 @@ CStyle::CStyle( const QString filename ) :
 	m_listViewItem = 0;
 	m_isHeaderFormatEnabled = m_isDescriptionFormatEnabled = m_isModuleTextFormatEnabled = true;
 	
-	load(filename);	
+	loadFromText(text);	
 }
 
 CStyle::~CStyle(){
+  delete m_headerFormat;
+  delete m_descriptionFormat;
+  delete m_moduleTextFormat;
 }
 
 /** Returns the proper CStyleFormat for the given type. */
@@ -216,20 +219,6 @@ CStyle::Format* const CStyle::formatForType( const CStyle::StyleType type) {
 }
 
 /** Set the printing of the header (true enables it). */
-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;
-	}
-}
-
-/** Set the printing of the header (true enables it). */
 void CStyle::setFormatTypeEnabled( const CStyle::StyleType type, const bool setEnabled) {
 	switch (type) {
 		case Header:
@@ -293,37 +282,42 @@ void CStyle::deleteListViewItem(){
 	m_listViewItem = 0;
 }
 
-/** Loads the profile from a XML file. */
-const bool CStyle::load(const QString& filename){
-/**
-* 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>
-*/
+/** 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;
 	}
 	
-	QDomDocument doc;		
 	if (file.open(IO_ReadOnly)) {	
 		QTextStream t(&file);
 		t.setEncoding(QTextStream::UnicodeUTF8);		
-		doc.setContent( t.read() );
+		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") {
@@ -376,14 +370,13 @@ const bool CStyle::load(const QString& filename){
 			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;
-			const QFont::CharSet charset = object.hasAttribute("charset") ? static_cast<QFont::CharSet>(object.attribute("charset").toInt()) : QApplication::font().charSet();
 			
 			if (family.isEmpty())
 				family = QApplication::font().family();
 			if (!size)
 				size = QApplication::font().pointSize();
 			
-			p->setFont( QFont(family, size, weight, italic, charset) );			
+			p->setFont( QFont(family, size, weight, italic) );			
 		}	
 
 		object = elem.namedItem("FRAME").toElement();
@@ -405,7 +398,7 @@ const bool CStyle::load(const QString& filename){
 	return true;
 }
 
-const bool CStyle::save( const QString& filename ){
+const bool CStyle::saveToFile( const QString& filename ){
 /* Saved file should look like this:
 
  <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE DOC >
@@ -467,7 +460,6 @@ const bool CStyle::save( const QString& filename ){
 		object.setAttribute("pointsize", font.pointSize());		
 		object.setAttribute("weight", font.weight());
 		object.setAttribute("italic", font.italic());
-		object.setAttribute("charset", static_cast<int>(font.charSet()));		
 		elem.appendChild(object);
 						
 		object = doc.createElement("FRAME");		
diff --git a/bibletime/printing/cstyle.h b/bibletime/printing/cstyle.h
index a642e90..9ad385f 100644
--- a/bibletime/printing/cstyle.h
+++ b/bibletime/printing/cstyle.h
@@ -20,7 +20,7 @@
 
 //Qt includes
 #include <qlistview.h>
-#include <qlist.h>
+#include <qptrlist.h>
 
 
 #ifndef CSTYLE_H
@@ -33,7 +33,7 @@ class CStyle;
 class QListViewItem;
 class QListView;
 
-typedef QList<CStyle> StyleItemList;
+typedef QPtrList<CStyle> StyleItemList;
 
 /** The class containing the properties requiredfor prinitng styles.
   * @author The BibleTime team
@@ -51,7 +51,7 @@ public:
 	/**	
   * A class which contains methods to support a format for the CStyle class.
   *	@author The BibleTime team
-  * @version $Id: cstyle.h,v 1.12 2002/04/07 13:44:11 joachim Exp $
+  * @version $Id: cstyle.h,v 1.17 2003/02/20 21:52:08 mgruner Exp $
   */
   class Format {
   public:
@@ -177,13 +177,14 @@ public:
  	*/
   void deleteListViewItem();
   /**
-  * Loads the profile from a XML file.
+  * Loads the style from a XML file.
   */
-  const bool load(const QString& file);
+  const bool loadFromText(const QString& text);
+  const bool loadFromFile(const QString& file);
   /**
   * Saves the style to the XML file.
   */
-  const bool save( const QString& file );
+  const bool saveToFile( const QString& file );
 
 protected:
 	friend class CPrinter;
@@ -197,7 +198,7 @@ private:
 	
 	QString	m_name;
 	
-	Format* m_headerFormat;
+  Format* m_headerFormat;
 	Format* m_descriptionFormat;		
 	Format* m_moduleTextFormat;
 	
@@ -208,4 +209,18 @@ private:
 	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
index be19ccd..9f2dbc3 100644
--- a/bibletime/printing/cstyleeditordialog.cpp
+++ b/bibletime/printing/cstyleeditordialog.cpp
@@ -37,7 +37,7 @@
 #include <qspinbox.h>
 
 CStyleEditorDialog::CStyleEditorDialog(CStyle* style, QWidget *parent, const char *name )
-	: KDialogBase(parent,name, true, i18n("style editor")) {
+	: KDialogBase(parent,name, true, i18n("Style editor")) {
 	m_style = style;
 	m_formatEnabled =  false;
 	
@@ -60,7 +60,7 @@ void CStyleEditorDialog::initView(){
 	
 	QHBoxLayout *hboxLayout = new QHBoxLayout(0, 5, 5);
   m_styleNameEdit = new QLineEdit( mainWidget );
-	label = new QLabel(m_styleNameEdit, i18n("Name of style:"), this);
+	label = new QLabel(m_styleNameEdit, i18n("Name:"), this);
 	hboxLayout->addWidget(label);
 	hboxLayout->addWidget(m_styleNameEdit);	
 
@@ -68,7 +68,7 @@ void CStyleEditorDialog::initView(){
 
 	hboxLayout = new QHBoxLayout(0, 5, 5);	
   m_styleTypeChooser = new KComboBox( mainWidget, "styleTypeChooser" );
-  label = new QLabel( m_styleTypeChooser, i18n("Choose the part of the style:"), mainWidget );
+  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") );
@@ -151,7 +151,7 @@ void CStyleEditorDialog::initView(){
   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 (in point):") );
+  label->setText( i18n("Line thickness (pt):") );
   hboxLayout->addWidget(label);
 	hboxLayout->addWidget(m_frame.lineThicknessChooser);	
 	boxLayout->addLayout(hboxLayout);
diff --git a/bibletime/printing/cstylelist.cpp b/bibletime/printing/cstylelist.cpp
index 70951a1..9d1f604 100644
--- a/bibletime/printing/cstylelist.cpp
+++ b/bibletime/printing/cstylelist.cpp
@@ -130,7 +130,9 @@ void CStyleList::deleteCurrentStyle(){
 	for (m_items->first(); m_items->current();m_items->next()) {
 		if (m_items->current()->listViewItem() == item) {
 			currentStyle = m_items->current();
-			m_items->remove(currentStyle);
+      const int pos = m_items->findRef(currentStyle);
+			if (pos != -1)
+        m_items->take(pos);
 			currentStyle->deleteListViewItem();			
 			if (!m_items->autoDelete() && currentStyle) {
 				delete currentStyle;			
@@ -143,12 +145,6 @@ void CStyleList::deleteCurrentStyle(){
 	}
 }
 
-///** Updates the style combo box. */
-//void CStyleList::updateStyleCombo(){
-//	if (m_printer)
-//		m_printer->emitStylesChanged();
-//}
-
 /** 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
index 7d7e5be..0e68dc8 100644
--- a/bibletime/printing/cstylelist.h
+++ b/bibletime/printing/cstylelist.h
@@ -19,13 +19,13 @@
 #define CSTYLELIST_H
 
 //BibleTime includes
-#include "frontend/cpointers.h"
+#include "util/cpointers.h"
 #include "cstyle.h"
 
 
 //Qt includes
 #include <qwidget.h>
-#include <qlist.h>
+#include <qptrlist.h>
 
 //KDE includes
 #include <klistview.h>
@@ -34,7 +34,7 @@
 class KAction;
 class QComboBox;
 
-typedef QList<CStyle> styleList;
+typedef QPtrList<CStyle> styleList;
 
   /** A KListView derived class which handles CStyle items.
   * @author The BibleTime team
diff --git a/bibletime/printing/style-data/Makefile.am b/bibletime/printing/style-data/Makefile.am
deleted file mode 100644
index 31faba2..0000000
--- a/bibletime/printing/style-data/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST =  bw_muchtext.xml  color_muchtext.xml  standard.xml
-rcdir = $(kde_datadir)/bibletime/printing/
-rc_DATA =  bw_muchtext.xml  color_muchtext.xml  standard.xml
-
diff --git a/bibletime/printing/style-data/Makefile.in b/bibletime/printing/style-data/Makefile.in
deleted file mode 100644
index f7968ee..0000000
--- a/bibletime/printing/style-data/Makefile.in
+++ /dev/null
@@ -1,384 +0,0 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# 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.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
-AUTODIRS = @AUTODIRS@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
-GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
-KDECONFIG = @KDECONFIG@
-KDE_CXXFLAGS = @KDE_CXXFLAGS@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-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_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
-LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
-LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KFORMULA = @LIB_KFORMULA@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-REPO = @REPO@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-idldir = @idldir@
-jni_includes = @jni_includes@
-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_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_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-micodir = @micodir@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-
-EXTRA_DIST = bw_muchtext.xml  color_muchtext.xml  standard.xml
-rcdir = $(kde_datadir)/bibletime/printing/
-rc_DATA = bw_muchtext.xml  color_muchtext.xml  standard.xml
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(rc_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
-#>+ 1
-all: docs-am  all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/printing/style-data/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/printing/style-data/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/printing/style-data/Makefile.in
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-rcDATA: $(rc_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
-	@list='$(rc_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rcdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rcdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rcdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(rcdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-rcDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(rc_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(rcdir)/$$p; \
-	done
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bibletime/printing/style-data
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/printing/style-data/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-rcDATA
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-rcDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(rcdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: uninstall-rcDATA install-rcDATA tags distdir info-am info dvi-am \
-dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# 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:
-
-#>+ 5
-force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/printing/style-data/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/printing/style-data/Makefile.in
-
-
-#>+ 2
-final:
-	$(MAKE) all-am
-#>+ 2
-no-final:
-	$(MAKE) all-am
-#>+ 3
-cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
diff --git a/bibletime/printing/style-data/bw_muchtext.xml b/bibletime/printing/style-data/bw_muchtext.xml
deleted file mode 100644
index 12b7783..0000000
--- a/bibletime/printing/style-data/bw_muchtext.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE DOC ><BibleTimePrintingStyle syntaxVersion="1" name="Black&amp;White for larger test portions" translate="1" >
- <HEADER alignment="1" enabled="1" >
-  <COLORS bgcolor="#ffffff" fgcolor="#000000" />
-  <FONT family="" weight="75" charset="15" 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" charset="15" pointsize="10" italic="1" />
-  <FRAME enabled="0" />
- </DESCRIPTION>
- <MODULETEXT alignment="0" enabled="1" >
-  <COLORS bgcolor="#ffffff" fgcolor="#000000" />
-  <FONT family="" weight="50" charset="15" pointsize="10" italic="0" />
-  <FRAME thickness="1" style="1" color="#000000" enabled="1" />
- </MODULETEXT>
-</BibleTimePrintingStyle>
diff --git a/bibletime/printing/style-data/color_muchtext.xml b/bibletime/printing/style-data/color_muchtext.xml
deleted file mode 100644
index 9c8d502..0000000
--- a/bibletime/printing/style-data/color_muchtext.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE DOC ><BibleTimePrintingStyle syntaxVersion="1" name="Colored style for larger test portions" translate="1" >
- <HEADER alignment="1" enabled="1" >
-  <COLORS bgcolor="#ffffff" fgcolor="#000000" />
-  <FONT family="" weight="75" charset="15" 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" charset="15" pointsize="10" italic="1" />
-  <FRAME enabled="0" />
- </DESCRIPTION>
- <MODULETEXT alignment="0" enabled="1" >
-  <COLORS bgcolor="#ffffff" fgcolor="#000000" />
-  <FONT family="" weight="50" charset="15" pointsize="10" italic="0" />
-  <FRAME thickness="1" style="1" color="#000000" enabled="1" />
- </MODULETEXT>
-</BibleTimePrintingStyle>
diff --git a/bibletime/printing/style-data/standard.xml b/bibletime/printing/style-data/standard.xml
deleted file mode 100644
index 183f030..0000000
--- a/bibletime/printing/style-data/standard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE DOC ><BibleTimePrintingStyle syntaxVersion="1" name="Standard" translate="1" >
- <HEADER alignment="0" enabled="1" >
-  <COLORS bgcolor="#ffffff" fgcolor="#000000" />
-  <FONT family="" weight="75" charset="15" pointsize="12" italic="0" />
-  <FRAME enabled="0" />
- </HEADER>
- <DESCRIPTION alignment="0" enabled="1" >
-  <COLORS bgcolor="#ffffff" fgcolor="#000000" />
-  <FONT family="" weight="50" charset="15" pointsize="10" italic="0" />
-  <FRAME enabled="0" />
- </DESCRIPTION>
- <MODULETEXT alignment="0" enabled="1" >
-  <COLORS bgcolor="#ffffff" fgcolor="#000000" />
-  <FONT family="" weight="50" charset="15" pointsize="10" italic="0" />
-  <FRAME enabled="0" />
- </MODULETEXT>
-</BibleTimePrintingStyle>
diff --git a/bibletime/resource.h b/bibletime/resource.h
deleted file mode 100644
index d3e5a6a..0000000
--- a/bibletime/resource.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/***************************************************************************
-                          resource.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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <kglobal.h>
-#include <kiconloader.h>
-
-//Groupmanager
-#define ID_GM_PRESENTER_CREATE			1001
-#define ID_GM_BOOKMARK_CREATE			1002
-#define ID_GM_GROUP_CREATE				1003
-#define ID_GM_ITEMS_DELETE				1004
-#define ID_GM_BOOKMARK_CHANGE			1005
-#define ID_GM_MODULES_SEARCH			1006
-#define ID_GM_MODULE_UNLOCK				1007
-#define ID_GM_MODULE_ABOUT				1008
-#define ID_GM_BOOKMARKS_EXPORT			1009
-#define ID_GM_BOOKMARKS_IMPORT			1010
-#define ID_GM_GROUP_CHANGE				1011
-#define ID_GM_RESET						1012
-#define ID_GM_BOOKMARK_PRINT			1013
-
-#define ID_PRESENTER_SELECT_ALL			1016
-#define ID_PRESENTER_LOOKUP				1018
-
-#define ID_PRESENTER_COPY_ONLY_KEY		1019
-#define ID_PRESENTER_COPY_KEY_TEXT		1020
-#define ID_PRESENTER_COPY_KEY			1021
-#define ID_PRESENTER_COPY_CHAPTER		1022
-#define ID_PRESENTER_COPY_SELECTED		1023
-
-#define ID_PRESENTER_PRINT_KEY			1030
-#define ID_PRESENTER_PRINT_CHAPTER		1031
-
-#define ID_PRESENTER_SAVE_ONLY_KEY		1032
-#define ID_PRESENTER_SAVE_KEY_TEXT		1033
-#define ID_PRESENTER_SAVE_KEY			1034
-#define ID_PRESENTER_SAVE_CHAPTER		1035
-#define ID_PRESENTER_SAVE_CHAPTER_HTML	1036
-
-#define ID_PRESENTER_COPY_POPUP			1050
-#define ID_PRESENTER_PRINT_POPUP		1051
-#define ID_PRESENTER_SAVE_POPUP			1052
-
-//Key bindings of BibleTime
-#define IDK_GM_RESET						CTRL+ALT+Key_R
-#define IDK_GM_ITEMS_DELETE			CTRL+ALT+Key_D
-#define IDK_GM_MODULES_SEARCH		CTRL+ALT+Key_M
-
-#define IDK_VIEW_FOOTNOTES			CTRL+ALT+Key_F
-#define IDK_VIEW_STRONGS				CTRL+ALT+Key_S
-#define IDK_VIEW_HEADINGS       0
-#define IDK_VIEW_MORPH_TAGS     0
-#define IDK_VIEW_TOOLBAR				CTRL+Key_T
-#define IDK_VIEW_GROUPMANAGER		0
-
-#define IDK_PRESENTER_NEXT_VERSE			CTRL+Key_V
-#define IDK_PRESENTER_PREVIOUS_VERSE	CTRL+SHIFT+Key_R
-#define IDK_PRESENTER_NEXT_CHAPTER		CTRL+Key_H
-#define IDK_PRESENTER_PREVIOUS_CHAPTER	CTRL+SHIFT+Key_H
-#define IDK_PRESENTER_EDIT					CTRL+SHIFT+Key_E
-#define IDK_PRESENTER_EDIT_DELETE		CTRL+Key_D
-#define IDK_PRESENTER_EDIT_BOLD			CTRL+Key_B
-#define IDK_PRESENTER_EDIT_ITALIC		CTRL+Key_I
-#define IDK_PRESENTER_EDIT_UNDERLINE	CTRL+Key_U
-
-#define IDK_PRESENTER_TOGGLE_TREE		CTRL+Key_T
-
-#define IDK_WINDOW_CASCADE			CTRL+Key_A
-#define IDK_WINDOW_TILE					CTRL+Key_T
-#define IDK_WINDOW_AUTO_CASCADE	CTRL+ALT+Key_A
-#define IDK_WINDOW_AUTO_TILE		CTRL+ALT+Key_T
-#define IDK_WINDOW_CLOSE_ALL		CTRL+Key_K
-#define IDK_WINDOW_LOAD_PROFILE	0
-#define IDK_WINDOW_SAVE_PROFILE	0
-#define IDK_WINDOW_EDIT_PROFILES  0
-#define IDK_WINDOW_FULLSCREEN		0
-
-#define IDK_HELP_DAILY_TIP				0
-
-/* The Bibletime Sub-Mimetypes */
-/* e.g. bible/reference is expanded to text/bible/reference,
-  like text/plain or text/html */
-
-#define REFERENCE				"bt_reference"    // text/bt_reference
-#define STRONGNUMBER		"bt_strongnumber" // text/bt_strongnumber
-#define BOOKMARK				"bt_bookmark"     // text/bt_bookmark (fake)
-#define MODULE					"bt_module"     	// text/bt_module
-#define GROUP						"bt_group"     		// text/bt_group
-#define TEXT						"plain"           // text/plain
-
-
-#define LOAD_SMALL_ICON(name)		SmallIcon(name, 16)
-#define LOAD_MC_ICON(name)			BarIcon(name, 22) //MC == module chooser
-#define LOAD_OD_ICON(name)			KGlobal::instance()->iconLoader()->loadIcon(name, KIcon::NoGroup, KIcon::SizeMedium)
-
-//ICONS
-#define ICON_FILE_CLEAR_QUEUE	"queue"
-#define ICON_FILE_NEW					"filenew"
-#define ICON_FILE_PRINT				"fileprint"
-#define ICON_FILE_SAVE				"filesave"
-#define ICON_FILE_DELETE			"editdelete"
-
-#define ICON_EDIT						"pencil"
-#define ICON_EDIT_COPY			"editcopy"
-#define ICON_EDIT_BOLD			"text_bold"
-#define ICON_EDIT_ITALIC		"text_italic"
-#define ICON_EDIT_UNDER			"text_under"
-#define ICON_EDIT_LEFT			"text_left"
-#define ICON_EDIT_CENTER		"text_center"
-#define ICON_EDIT_RIGHT			"text_right"
-#define ICON_EDIT_JUST			"text_block"
-
-#define ICON_VIEW_BOOKTREE				"view_sidetree"
-
-#define ICON_MAININDEX_RESET			"start"
-#define ICON_MAININDEX_SEARCH			"find"
-#define ICON_MAININDEX_DELETE_ITEMS		ICON_FILE_DELETE
-
-//#define ICON_VIEW_MAININDEX			"bt_mainindex"
-#define ICON_VIEW_MAININDEX				"view_sidetree"
-
-#define ICON_WINDOW_TILE				"bt_tile"
-#define ICON_WINDOW_CASCADE				"bt_cascade"
-#define ICON_WINDOW_TILE_AUTO			"bt_tile_auto"
-#define ICON_WINDOW_CASCADE_AUTO		"bt_cascade_auto"
-
-#define ICON_WINDOW_CLOSE_ALL			"fileclose"
-#define ICON_WINDOW_SAVE_PROFILE		"view_sidetree"
-#define ICON_WINDOW_LOAD_PROFILE		"view_sidetree"
-#define ICON_WINDOW_EDIT_PROFILES		"view_sidetree"
-#define ICON_WINDOW_FULLSCREEN			"window_fullscreen"
-
-#define ICON_HELP_DAILY_TIP				"idea"
-#define ICON_HELP_CONTENTS				"contents"
-#define ICON_BUG_REPORT					"configure"
-
-#define ICON_SYNC						"bt_sync"
-
-//CGroupManager icons
-#define GROUP_ICON_SMALL			LOAD_SMALL_ICON("folder")
-#define GROUP_OPEN_ICON_SMALL		LOAD_SMALL_ICON("folder_open")
-#define GROUP_NEW_ICON_SMALL		LOAD_SMALL_ICON("folder_new")
-#define GROUP_CHANGE_ICON_SMALL		LOAD_SMALL_ICON("folder") // maybe find a better one
-
-#define BIBLE_ICON_SMALL			LOAD_SMALL_ICON("bt_bible")
-#define BIBLE_LOCKED_ICON_SMALL		LOAD_SMALL_ICON("bt_bible_locked")
-#define BIBLE_ICON_MC				"bt_bible"
-#define BIBLE_ADD_ICON_MC		"bt_bible_add"
-
-#define BOOK_ICON_SMALL				LOAD_SMALL_ICON("bt_book")
-#define BOOK_LOCKED_ICON_SMALL		LOAD_SMALL_ICON("bt_book_locked")
-#define BOOK_ICON_MC				"bt_book"
-#define BOOK_ADD_ICON_MC		"bt_book_add"
-
-#define COMMENTARY_ICON_SMALL			LOAD_SMALL_ICON("bt_commentary")
-#define COMMENTARY_LOCKED_ICON_SMALL	LOAD_SMALL_ICON("bt_commentary_locked")
-#define COMMENTARY_ICON_MC			"bt_commentary"
-#define COMMENTARY_ADD_ICON_MC  "bt_commentary_add"
-
-#define LEXICON_ICON_SMALL			LOAD_SMALL_ICON("bt_lexicon")
-#define LEXICON_LOCKED_ICON_SMALL	LOAD_SMALL_ICON("bt_lexicon_locked")
-#define LEXICON_ICON_MC				  "bt_lexicon"
-#define LEXICON_ADD_ICON_MC			"bt_lexicon_add"
-
-#define DSB_ICON			          "bt_displayconfig"
-
-//UNUSED
-#define PARALLEL_ICON_MC			LOAD_SMALL_ICON("bt_parallel")
-
-#define SYNC_ICON_SMALL				LOAD_SMALL_ICON(ICON_SYNC)
-#define ITEMS_DELETE_ICON_SMALL		LOAD_SMALL_ICON(ICON_MAININDEX_DELETE_ITEMS)
-
-#define BOOKMARK_ICON_SMALL				LOAD_SMALL_ICON("bookmark")
-#define BOOKMARK_CHANGE_ICON_SMALL		LOAD_SMALL_ICON("bookmark")
-#define BOOKMARK_NEW_ICON_SMALL			LOAD_SMALL_ICON("bookmark_new")
-#define BOOKMARK_IMPORT_ICON_SMALL		LOAD_SMALL_ICON("bookmark")
-#define BOOKMARK_EXPORT_ICON_SMALL		LOAD_SMALL_ICON("bookmark")
-#define BOOKMARK_PRINT_ICON_SMALL		LOAD_SMALL_ICON(ICON_FILE_PRINT)
-
-#define SHOW_GM_ICON_SMALL			LOAD_SMALL_ICON( ICON_MAININDEX )
-#define RESET_GM_ICON_SMALL			LOAD_SMALL_ICON( ICON_MAININDEX_RESET )
-
-#define MODULE_SEARCH_ICON_SMALL	LOAD_SMALL_ICON( ICON_MAININDEX_SEARCH )
-#define MODULE_UNLOCK_ICON_SMALL	LOAD_SMALL_ICON("unlock")
-#define MODULE_ABOUT_ICON_SMALL		LOAD_SMALL_ICON("info")
-
-//used for Drag&Drop
-#define REFERENCE_ICON_SMALL		LOAD_SMALL_ICON("bookmark")
-
-//Icons for the optionsdialog; OD == OptionsDialog
-#define OD_ICON_GENERAL				LOAD_OD_ICON("bt_startconfig")
-#define OD_ICON_KEY_BINDINGS	LOAD_OD_ICON("key_bindings")
-#define OD_ICON_FONTS				LOAD_OD_ICON("fonts")
-#define OD_ICON_COLORS			LOAD_OD_ICON("bt_displayconfig")
-#define OD_ICON_PROFILES		LOAD_OD_ICON("view_sidetree")
-#define OD_ICON_SWORD				LOAD_OD_ICON("bt_swordconfig")
-
-//define HelpDialog aliases for defines
-#define HELPDIALOG_MODULE_LOCKED				"bibletime/helpdialog/help-module-encrypted.html"
-#define HELPDIALOG_FIRST_START					"bibletime/helpdialog/help-first-startup.html"
-#define HELPDIALOG_NO_SWORD_MODULES				"bibletime/helpdialog/help-no-modules.html"
-#define HELPDIALOG_NO_SWORD_MODULE_CONFIG_DIR	"bibletime/helpdialog/help-no-mods-d.html"
-#define HELPDIALOG_INITBACKEND_FAILED			"bibletime/helpdialog/help-initbackend-failed.html"
-#define HELPDIALOG_FIRSTTIME_SEARCH				"bibletime/helpdialog/help-first-time-search.html"
-
diff --git a/bibletime/tooltipdef.h b/bibletime/tooltipdef.h
deleted file mode 100644
index 0d77cb3..0000000
--- a/bibletime/tooltipdef.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/***************************************************************************
-                          tooltipdef.h  -  description
-                             -------------------
-    begin                : Sat Jul 29 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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//ToolTip entries for Mainwindow actions
-#define TT_FILE_CLEAR_QUEUE  i18n("Clear the printing queue")
-#define TT_FILE_PRINT  i18n("Open the printerdialog")
-#define TT_FILE_QUIT  i18n("Close BibleTime")
-	
-#define TT_GM_SEARCH_MODULES i18n("Search in modules")
-#define TT_GM_DELETE_ITEMS i18n("Remove selected items")
-#define TT_GM_RESET	i18n("Reset main index")
-
-#define TT_VIEW_GROUPMANAGER i18n("Show main index")
-#define TT_VIEW_TOOLBAR i18n("Show tooolbar")
-#define TT_VIEW_FOOTNOTES i18n("Show footnotes")
-#define TT_VIEW_STRONGS i18n("Show Strong's numbers")
-
-#define TT_WINDOW_TILE i18n("Tile windows")
-#define TT_WINDOW_AUTO_TILE  i18n("Automatically tile windows")
-#define TT_WINDOW_CASCADE  i18n("Cascade windows")
-#define TT_WINDOW_AUTO_CASCADE  i18n("Automatically cascade windows")
-#define TT_WINDOW_CLOSE_ALL  i18n("Close all windows")
-#define TT_WINDOW_SAVE_PROFILE  i18n("Save current profile")
-#define TT_WINDOW_EDIT_PROFILES  i18n("Edit profiles")
-#define TT_WINDOW_LOAD_PROFILE  i18n("Load a new profile")
-#define TT_WINDOW_FULLSCREEN  i18n("Toggle fullscreen mode")
-
-#define TT_SETTINGS_EDIT_TOOLBAR i18n("Edit toolbar")
-#define TT_SETTINGS_OPTIONS i18n("Options")
-
-#define TT_HELP_HANDBOOK i18n("BibleTime's handbook")
-#define TT_HELP_INSTALLATION i18n("BibleTime's installation documentation")
-#define TT_HELP_BIBLESTUDY i18n("BibleTime's Bible study HowTo")
-#define TT_HELP_WHATSTHIS i18n("Enter \"What's this?\" mode")
-#define TT_HELP_BUGREPORT i18n("Send bugreport")
-#define TT_HELP_DAILY_TIP i18n("Show daily tips at startup")
-#define TT_HELP_ABOUT i18n("About BibleTime")
-#define TT_HELP_ABOUT_KDE i18n("About KDE")
-
-
-//QWhatsThis defines for the groupmanager
-#define TT_GM_WIDGET i18n("The main index")
-#define TT_GM_NEW_GROUP i18n("Create a new folder")
-#define TT_GM_CHANGE_GROUP i18n("Change this folder")
-#define TT_GM_CHANGE_BOOKMARK i18n("Change this bookmark")
-#define TT_GM_IMPORT_BOOKMARKS i18n("Import bookmarks")
-#define TT_GM_EXPORT_BOOKMARKS i18n("Export bookmarks")
-#define TT_GM_PRINT_BOOKMARK i18n("Add bookmark to printing queue")
-#define TT_GM_UNLOCK_MODULE i18n("Unlock this module")
-#define TT_GM_ABOUT_MODULE i18n("About this module")
-
-//QWhatsThis defines for the presenters
-#define TT_MDI_AREA_WIDGET i18n("The working area")
-
-#define TT_PRESENTER_NEXT_ENTRY i18n("Show the next entry")
-#define TT_PRESENTER_PREVIOUS_ENTRY i18n("Show the previous entry")
-#define TT_PRESENTER_NEXT_VERSE i18n("Jump to the next verse")
-#define TT_PRESENTER_PREVIOUS_VERSE i18n("Jump to the previous verse")
-#define TT_PRESENTER_NEXT_CHAPTER i18n("Show the next chapter")
-#define TT_PRESENTER_PREVIOUS_CHAPTER i18n("Show the previous chapter")
-#define TT_PRESENTER_NEXT_BOOK i18n("Show the next book")
-#define TT_PRESENTER_PREVIOUS_BOOK i18n("Show the previous book")
-#define TT_PRESENTER_BOOK_COMBO i18n("List of books")
-#define TT_PRESENTER_CHAPTER_COMBO i18n("List of chapters")
-#define TT_PRESENTER_VERSE_COMBO i18n("List of verses")
-#define TT_PRESENTER_ENTRY_COMBO i18n("List of entries")
-#define TT_PRESENTER_SCROLL_BUTTON i18n("Scroll through the list")
-#define TT_PRESENTER_EDIT i18n("Edit this entry")
-#define TT_PRESENTER_EDIT_SAVE i18n("Save this comment")
-#define TT_PRESENTER_EDIT_DELETE i18n("Delete this comment")
-#define TT_PRESENTER_EDIT_COMMENT_UP_TO i18n("Comment up to")
-#define TT_PRESENTER_EDIT_SET_BOLD i18n("Set bold")
-#define TT_PRESENTER_EDIT_SET_ITALIC i18n("Set italic")
-#define TT_PRESENTER_EDIT_SET_UNDERLINED i18n("Set underlined")
-#define TT_PRESENTER_EDIT_SET_FONT i18n("Set font")
-#define TT_PRESENTER_EDIT_COLOR_CHOOSER i18n("Set the color")
-#define TT_PRESENTER_EDIT_FONTSIZE_CHOOSER i18n("Set the fontsize")
-
-#define TT_PRESENTER_SYNC i18n("Synchronize with Bible windows")
-
-//HTML widget related #defines
-#define TT_HTML_SAVE_AS i18n("Save as HTML")
-#define TT_HTML_SELECT_ALL i18n("Select all")
-#define TT_HTML_COPY i18n("Copy to clipboard")
-
-//searchdialog related #defines, SD means searchdialog; mc==Module chooser
-#define TT_SD_MODULECHOOSER i18n("Choose the modules to search in")
-#define TT_SD_MC_ADD_MODULE i18n("Add the selected module to the list")
-#define TT_SD_MC_REMOVE_MODULE i18n("Remove the selected module from the list")
-#define TT_SD_MC_MODULELIST i18n("List of modules used for the search")
-
-#define TT_SD_SEARCH_TEXT_EDIT i18n("Search for this text")
-#define TT_SD_SEARCH_MULTIPLE_WORDS i18n("Search multiple words")
-#define TT_SD_SEARCH_EXACT_MATCH i18n("Exact match")
-#define TT_SD_SEARCH_REGEXP i18n("Search with GNU regular expressions")
-#define TT_SD_SEARCH_CASE_SENSITIVE i18n("Search case sensitive")
-
-#define TT_SD_SCOPE_NO_SCOPE i18n("No scope")
-#define TT_SD_SCOPE_LAST_RESULT i18n("Last search result")
-#define TT_SD_SCOPE_OWN_SCOPE i18n("Use custom scope")
-#define TT_SD_SCOPE_NEW_SCOPE i18n("Add a new scope")
-#define TT_SD_SCOPE_DELETE_SCOPE i18n("Delete this search scope")
-#define TT_SD_SCOPE_EDIT_SCOPE_BUTTON i18n("Edit and define your search scopes")
-#define TT_SD_SCOPE_CHOOSER i18n("Choose a search scope from the list")
-#define TT_SD_SCOPE_EDIT_LINE	i18n("Enter your own search scope")
-#define TT_SD_SCOPE_PARSED_LIST	i18n("Parsed result")
-#define TT_SD_SCOPE_CLOSE i18n("Close this dialog")
-
-#define TT_SD_RESULT_MODULE_VIEW i18n("Used modules")
-#define TT_SD_RESULT_RESULT_VIEW i18n("Items found")
-#define TT_SD_RESULT_PREVIEW 	i18n("Preview")
-
-#define TT_SD_ANALYSIS_VIEW i18n("Graphical Search Analysis")
-
-
-//#defines for the settings dialog, OD means Optionsdialog
-#define TT_OD_GENERAL_DAILY_TIP i18n("Show daily tip")
-#define TT_OD_GENERAL_INTERNATIONAL_BOOKNAMES i18n("List of languages")
-#define TT_OD_GENERAL_SHOW_STARTUPLOGO i18n("Show start-up logo")
-#define TT_OD_GENERAL_SCROLL_PREVIOUS i18n("Use down arrow to scroll to next verse")
-#define TT_OD_GENERAL_RESTORE_WORKSPACE i18n("Restore the windows in the workspace on startup")
-
-#define TT_OD_SWORD_USE_LEXICON_CACHE i18n("Use cache files for the lexicon entries")
-#define TT_OD_SWORD_STANDARD_BIBLE i18n("The default bible used in the workspace area")
-#define TT_OD_SWORD_STANDARD_COMMENTARY i18n("The default commentary used in the workspace area")
-#define TT_OD_SWORD_STANDARD_LEXICON i18n("The default lexicon used in the workspace area")
-#define TT_OD_SWORD_STANDARD_HEBREW_STRONG 	i18n("The default Hebrew lexicon used in the workspace are")
-#define TT_OD_SWORD_STANDARD_GREEK_STRONG i18n("The default Greek lexicon used in the workspace area")
-#define TT_OD_SWORD_STANDARD_HEBREW_MORPH i18n("The default Morphological lexicon for Hebrew texts used in the workspace area")
-#define TT_OD_SWORD_STANDARD_GREEK_MORPH i18n("The default Morphological lexicon for Greek texts used in the workspace area")
-
-
-#define TT_OD_KEYS_CHOOSER i18n("Set keyboard accelerators")
-
-#define TT_OD_FONTS_TYPE_CHOOSER i18n("Choose the area of application")
-#define TT_OD_FONTS_CHOOSER i18n("Choose a font")
-
-#define TT_OD_COLORS_BACKGROUND i18n("Color of the background")
-#define TT_OD_COLORS_CURRENT_VERSE i18n("Color of the highlighted verse")
-
-#define TT_OD_DISPLAY_WINDOW_KEYS_GENERAL i18n("Keyboard accelerators used by all display windows")
-#define TT_OD_DISPLAY_WINDOW_KEYS_BIBLE i18n("Keyboard accelerators used by Bible windows")
-#define TT_OD_DISPLAY_WINDOW_KEYS_COMMENTARY i18n("Keyboard accelerators used by commentary windows")
-#define TT_OD_DISPLAY_WINDOW_KEYS_LEXICON i18n("Keyboard accelerators used by lexicon windows")
-
-//defines for the printing dialog; PI == Print Item; PD=Printer Dialog
-#define TT_PD_PRINT i18n("Start printing")
-#define TT_PD_PREVIEW i18n("Preview print job")
-#define TT_PD_CANCEL i18n("Cancel")
-#define TT_PD_HELP i18n("Open help")
-
-#define TT_PD_ENTRIES_STYLE_COMBO i18n("Styles")
-#define TT_PD_ENTRIES_PI_LIST i18n("List of print items")
-#define TT_PD_ENTRIES_PI_MOVE_UP i18n("Move item up")
-#define TT_PD_ENTRIES_PI_MOVE_DOWN i18n("Move item down")
-#define TT_PD_ENTRIES_PI_DELETE i18n("Delete items")
-#define TT_PD_ENTRIES_PI_PAGE_BREAK i18n("Insert a page break")
-
-#define TT_PD_LAYOUT_BORDER i18n("Page borders")
-#define TT_PD_LAYOUT_BORDER_LEFT i18n("Left border")
-#define TT_PD_LAYOUT_BORDER_RIGHT i18n("Right border")
-#define TT_PD_LAYOUT_BORDER_TOP i18n("Upper border")
-#define TT_PD_LAYOUT_BORDER_BOTTOM i18n("Lower border")
-#define TT_PD_LAYOUT_STYLE_LIST i18n("List of print styles")
-#define TT_PD_LAYOUT_STYLE_DELETE i18n("Delete the selected style")
-#define TT_PD_LAYOUT_STYLE_EDIT i18n("Edit the selected style")
-#define TT_PD_LAYOUT_STYLE_NEW i18n("Create a new printing style")
diff --git a/bibletime/util/Makefile.am b/bibletime/util/Makefile.am
index 5de8a1d..c96f870 100644
--- a/bibletime/util/Makefile.am
+++ b/bibletime/util/Makefile.am
@@ -1,6 +1,16 @@
 INCLUDES = $(all_includes)
-all_headers = scoped_resource.h
-EXTRA_DIST = $(all_headers)
+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
index b6ad92a..473bddd 100644
--- a/bibletime/util/Makefile.in
+++ b/bibletime/util/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,166 +229,451 @@ 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@
-micodir = @micodir@
+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)
-all_headers = scoped_resource.h
-EXTRA_DIST = $(all_headers)
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
+#>- libutil_a_METASOURCES = AUTO
+noinst_LIBRARIES = libutil.a
 
+libutil_a_SOURCES = \
+cpointers.cpp \
+cresmgr.cpp \
+ctoolclass.cpp
 
-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=scoped_resource.h 
 
-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+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)
 
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
+#>- all: all-am
 #>+ 1
-all: docs-am  all-redirect
+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/util/Makefile
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/util/Makefile
+.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:
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ETAGS = etags
+ETAGSFLAGS =
 
-tags: TAGS
-TAGS:
+CTAGS = ctags
+CTAGSFLAGS =
 
+tags: TAGS
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+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)
 
-subdir = bibletime/util
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/util/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(LIBRARIES)
 
-install-data-am:
+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
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
+	@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
 
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
+#>- 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
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+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:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/util/Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  bibletime/util/Makefile
 	cd $(top_srcdir) && perl admin/am_edit bibletime/util/Makefile.in
 
 
-#>+ 2
+#>+ 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) all-am
-#>+ 2
+	$(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) all-am
+	$(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) -f $(top_srcdir)/admin/Makefile.common 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
new file mode 100644
index 0000000..ea1aad3
--- /dev/null
+++ b/bibletime/util/cpointers.cpp
@@ -0,0 +1,65 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..1cf6f15
--- /dev/null
+++ b/bibletime/util/cpointers.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..4e88d62
--- /dev/null
+++ b/bibletime/util/cresmgr.cpp
@@ -0,0 +1,1632 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..d09a429
--- /dev/null
+++ b/bibletime/util/cresmgr.h
@@ -0,0 +1,890 @@
+/***************************************************************************
+                          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
new file mode 100644
index 0000000..d2caf7a
--- /dev/null
+++ b/bibletime/util/ctoolclass.cpp
@@ -0,0 +1,196 @@
+/***************************************************************************
+                 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
new file mode 100644
index 0000000..f7c7453
--- /dev/null
+++ b/bibletime/util/ctoolclass.h
@@ -0,0 +1,87 @@
+/***************************************************************************
+                 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/whatsthisdef.h b/bibletime/whatsthisdef.h
deleted file mode 100644
index 9839e14..0000000
--- a/bibletime/whatsthisdef.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/***************************************************************************
-                          whatsthisdef.h  -  Contains QWhatThis descriptions
-	                          of widget
-                             -------------------
-    begin                : Sat Jul 29 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 "tooltipdef.h"
-
-#ifndef WHATSTHISDEF_H
-#define WHATSTHISDEF_H
-
-//the general format of QWhatsThis help texts
-#define WT(title, description) QString::fromLatin1("<center><B>%1</B></center><HR>%2").arg(title).arg(description)
-
-//QWhatsThis entries for Mainwindow actions
-#define WT_FILE_CLEAR_QUEUE WT( TT_FILE_CLEAR_QUEUE, i18n("Clear the print queue of BibleTime. All items will be removed from the list and the print button will be disabled."))
-#define WT_FILE_PRINT WT( TT_FILE_PRINT, i18n("Open the printer dialog of BibleTime.  Here you can edit the print queue and assign styles to the items."))
-#define WT_FILE_QUIT WT( TT_FILE_QUIT, i18n("Close BibleTime and save the settings."))
-	
-#define WT_GM_SEARCH_MODULES WT(TT_GM_SEARCH_MODULES, i18n("Open the search dialog to search for text in one or more modules."))
-#define WT_GM_DELETE_ITEMS WT(TT_GM_DELETE_ITEMS, i18n("Remove the selected items from the main index.<BR>If you remove a folder, the subitems of it will be removed too."))
-#define WT_GM_RESET	WT(TT_GM_RESET, i18n("Reset the main index.<BR>All bookmarks and folders will be deleted and the default folders will be restored."))
-
-#define WT_VIEW_GROUPMANAGER WT(TT_VIEW_GROUPMANAGER, i18n("Toggle the main index view."))
-#define WT_VIEW_TOOLBAR WT(TT_VIEW_TOOLBAR, i18n("Toggle the main toolbar view."))
-#define WT_VIEW_FOOTNOTES WT(TT_VIEW_FOOTNOTES, i18n("Toggle footnotes in the modules."))
-#define WT_VIEW_STRONGS WT(TT_VIEW_STRONGS, i18n("Toggle Strong's numbers in the modules."))
-
-#define WT_WINDOW_TILE WT(TT_WINDOW_TILE, i18n("Tile the open display windows."))
-#define WT_WINDOW_AUTO_TILE WT( TT_WINDOW_AUTO_TILE, i18n("Automatically tile the display windows."))
-#define WT_WINDOW_CASCADE WT( TT_WINDOW_CASCADE, i18n("Cascade the open display windows."))
-#define WT_WINDOW_AUTO_CASCADE WT( TT_WINDOW_AUTO_CASCADE, i18n("Automatically cascade the opened display windows."))
-#define WT_WINDOW_CLOSE_ALL WT( TT_WINDOW_CLOSE_ALL, i18n("Close all open display windows."))
-#define WT_WINDOW_SAVE_PROFILE WT(TT_WINDOW_SAVE_PROFILE, i18n("Save current profile"))
-#define WT_WINDOW_EDIT_PROFILES WT(TT_WINDOW_EDIT_PROFILES, i18n("Edit profiles..."))
-#define WT_WINDOW_LOAD_PROFILE WT(TT_WINDOW_LOAD_PROFILE, i18n("Load a new profile"))
-#define WT_WINDOW_FULLSCREEN WT(TT_WINDOW_FULLSCREEN, i18n("Toggle fullscreen mode"))
-
-
-#define WT_SETTINGS_EDIT_TOOLBAR WT(TT_SETTINGS_EDIT_TOOLBAR, i18n("Open the BibleTime tool bar editor."))
-#define WT_SETTINGS_OPTIONS WT(TT_SETTINGS_OPTIONS, i18n("Open BibleTime's optionsdialog where you can set most of the preferences."))
-
-#define WT_HELP_HANDBOOK WT(TT_HELP_HANDBOOK, i18n("Open KDE's helpbrowser with BibleTime's handbook.<BR>The handbook explains how to use BibleTime in the best way."))
-#define WT_HELP_INSTALLATION WT(TT_HELP_INSTALLATION, i18n("Open KDE's helpbrowser with BibleTime's installation instructions.<BR>The installation instructions explain how to set up BibleTime and the text modules."))
-#define WT_HELP_BIBLESTUDY WT(TT_HELP_BIBLESTUDY, i18n("Open KDE's helpbrowser with the Bible study HowTo included with BibleTime.<BR>This HowTo is an introduction how to study the Bible in an efficient way."))
-#define WT_HELP_WHATSTHIS WT(TT_HELP_WHATSTHIS, 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."))
-#define WT_HELP_BUGREPORT WT(TT_HELP_BUGREPORT, i18n("Send a bugreport to the developers of BibleTime!"))
-#define WT_HELP_DAILY_TIP WT(TT_HELP_DAILY_TIP, i18n("Show a daily tip.<BR>The tips contain important Bible quotations and helpful usage tips for BibleTime."))
-#define WT_HELP_ABOUT WT(TT_HELP_ABOUT, i18n("Show detailed information about BibleTime."))
-#define WT_HELP_ABOUT_KDE WT(TT_HELP_ABOUT_KDE, i18n("Show the \"about\" dialog of KDE 2."))
-
-
-//QWhatsThis defines for the groupmanager
-#define WT_GM_WIDGET WT(TT_GM_WIDGET, i18n("This is the main index of BibleTime.<BR>Use it to manage the installed modules, to work with bookmarks, to open display windows etc.."))
-#define WT_GM_NEW_GROUP WT(TT_GM_NEW_GROUP, i18n("Create a new folder in the main index.<BR>If you press the right mouse button on a folder, the new folder will become a sub-folder of it.<BR>Otherwise you will create a toplevel folder."))
-#define WT_GM_CHANGE_GROUP WT(TT_GM_CHANGE_GROUP, i18n("Change the properties of the selected folder."))
-#define WT_GM_CHANGE_BOOKMARK WT(TT_GM_CHANGE_BOOKMARK, i18n("Change the properties of the selected bookmark."))
-#define WT_GM_IMPORT_BOOKMARKS WT(TT_GM_IMPORT_BOOKMARKS, i18n("Import bookmarks from a file."))
-#define WT_GM_EXPORT_BOOKMARKS WT(TT_GM_EXPORT_BOOKMARKS, i18n("Export bookmarks to a file so you or other<BR>users can import them later."))
-#define WT_GM_PRINT_BOOKMARK WT(TT_GM_PRINT_BOOKMARK, i18n("Use this to add this bookmark to BibleTime's print queue. The key, the description, and the text of the key will be used for printing."))
-#define WT_GM_UNLOCK_MODULE WT(TT_GM_UNLOCK_MODULE, i18n("Open a small dialog where you can unlock the selected module."))
-#define WT_GM_ABOUT_MODULE WT(TT_GM_ABOUT_MODULE, i18n("Open a dialog to show information about the selected module."))
-
-//QWhatsThis defines for the presenters
-#define WT_MDI_AREA_WIDGET WT(TT_MDI_AREA_WIDGET, i18n("This area is the main workspace of Bibletime.<BR>All display windows are opened in this window."))
-
-#define WT_PRESENTER_NEXT_ENTRY WT(TT_PRESENTER_NEXT_ENTRY, i18n("The next entry of the module will be shown."))
-#define WT_PRESENTER_PREVIOUS_ENTRY WT(TT_PRESENTER_PREVIOUS_ENTRY, i18n("The previous entry of the module will be shown."))
-#define WT_PRESENTER_NEXT_VERSE WT(TT_PRESENTER_NEXT_VERSE, i18n("For Bible texts, the next verse will be highlighted.<BR>In commentaries, the next entry will be shown."))
-#define WT_PRESENTER_PREVIOUS_VERSE WT(TT_PRESENTER_PREVIOUS_VERSE, i18n("For Bible texts, the previous verse will be highlighted. In commentaries,  the previous entry will be shown."))
-#define WT_PRESENTER_NEXT_CHAPTER WT(TT_PRESENTER_NEXT_CHAPTER, i18n("Show the next chapter of the module. The verse will be set to \"1\"."))
-#define WT_PRESENTER_PREVIOUS_CHAPTER WT(TT_PRESENTER_PREVIOUS_CHAPTER, i18n("Show the previous chapter of the module. The verse will be set to \"1\""))
-#define WT_PRESENTER_NEXT_BOOK WT(TT_PRESENTER_NEXT_BOOK, i18n("Show the next book of this module. The chapter and the verse will be set to \"1\"."))
-#define WT_PRESENTER_PREVIOUS_BOOK WT(TT_PRESENTER_PREVIOUS_BOOK, i18n("Show the previous book of this module. The chapter and the verse will be set to \"1\"."))
-#define WT_PRESENTER_BOOK_COMBO WT(TT_PRESENTER_BOOK_COMBO, i18n("This list contains the books which are available in this module."))
-#define WT_PRESENTER_CHAPTER_COMBO WT(TT_PRESENTER_CHAPTER_COMBO, i18n("This list contains the chapters which are available in the current book."))
-#define WT_PRESENTER_VERSE_COMBO WT(TT_PRESENTER_VERSE_COMBO, i18n("This list contains the verses which are available in the current chapter."))
-#define WT_PRESENTER_ENTRY_COMBO WT(TT_PRESENTER_ENTRY_COMBO, i18n("This list contains the entries of the current module."))
-#define WT_PRESENTER_SCROLL_BUTTON WT(TT_PRESENTER_SCROLL_BUTTON, 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."))
-#define WT_PRESENTER_EDIT WT(TT_PRESENTER_EDIT, i18n("Toggle between read-write and read-only mode of writeable modules."))
-#define WT_PRESENTER_EDIT_SAVE WT(TT_PRESENTER_EDIT_SAVE, i18n("Save new personal comments."))
-#define WT_PRESENTER_EDIT_DELETE WT(TT_PRESENTER_EDIT_DELETE, i18n("Clear the text and delete the entry from the module."))
-#define WT_PRESENTER_EDIT_SET_BOLD WT(TT_PRESENTER_EDIT_SET_BOLD, i18n("Toggle bold formatting of the selected text."))
-#define WT_PRESENTER_EDIT_SET_ITALIC WT(TT_PRESENTER_EDIT_SET_ITALIC, i18n("Toggle italic formatting of the selected text."))
-#define WT_PRESENTER_EDIT_SET_UNDERLINED WT(TT_PRESENTER_EDIT_SET_UNDERLINED, i18n("Toggle underlined formatting of the selected text."))
-#define WT_PRESENTER_EDIT_SET_FONT WT(TT_PRESENTER_EDIT_SET_FONT, i18n("Choose a new font for the selected text."))
-#define WT_PRESENTER_EDIT_COLOR_CHOOSER WT(TT_PRESENTER_EDIT_COLOR_CHOOSER, i18n("Choose a new color for the selected text."))
-#define WT_PRESENTER_EDIT_FONTSIZE_CHOOSER WT(TT_PRESENTER_EDIT_FONTSIZE_CHOOSER, i18n("Choose a new fontsize for the selected text."))
-
-#define WT_PRESENTER_SYNC WT(TT_PRESENTER_SYNC, i18n("Synchronize the displayed verse of this module with the active Bible window."))
-
-//HTML widget related #defines
-#define WT_HTML_SAVE_AS WT(TT_HTML_SAVE_AS, i18n("Save the displayed chapter as an HTML file."))
-#define WT_HTML_SELECT_ALL WT(TT_HTML_SELECT_ALL, i18n("Select all text."))
-#define WT_HTML_COPY WT(TT_HTML_COPY, i18n("Copy the displayed text to the clipboard."))
-
-//searchdialog related #defines, SD means searchdialog
-#define WT_SD_MODULECHOOSER WT(TT_SD_MODULECHOOSER, i18n("Choose the modules which will be used for the search.<BR>Use the two buttons on the right side to add or delete the modules to/from the list of used ones."))
-#define WT_SD_MC_ADD_MODULE WT(TT_SD_MC_ADD_MODULE, i18n("Add the selected module to the list on the right."))
-#define WT_SD_MC_REMOVE_MODULE WT(TT_SD_MC_REMOVE_MODULE, i18n("Remove the selected module from the list on the right side."))
-#define WT_SD_MC_MODULELIST WT(TT_SD_MC_MODULELIST, i18n("The list of modules used for the search."))
-
-#define WT_SD_SEARCH_TEXT_EDIT WT(TT_SD_SEARCH_TEXT_EDIT, i18n("The text entered in this edit box will be searched for in all selected modules."))
-#define WT_SD_SEARCH_MULTIPLE_WORDS WT(TT_SD_SEARCH_MULTIPLE_WORDS, i18n("Select this to search for multiple words.<BR>Each word in the edit box above is searched as a single word."))
-#define WT_SD_SEARCH_EXACT_MATCH WT(TT_SD_SEARCH_EXACT_MATCH, i18n("Select this to search for exactly the same text you entered in the edit box."))
-#define WT_SD_SEARCH_REGEXP WT(TT_SD_SEARCH_REGEXP, i18n("Select this to search using standard GNU regular expressions.<BR>Read the handbook for a explanation how to use them."))
-#define WT_SD_SEARCH_CASE_SENSITIVE WT(TT_SD_SEARCH_CASE_SENSITIVE, i18n("Activate this to use a case sensitive search."))
-
-#define WT_SD_SCOPE_NO_SCOPE WT(TT_SD_SCOPE_NO_SCOPE, i18n("Select this if you want to search through all parts of the module(s)."))
-#define WT_SD_SCOPE_LAST_RESULT WT(TT_SD_SCOPE_LAST_RESULT, i18n("Select this if you want to use the last search result as the search scope."))
-#define WT_SD_SCOPE_NEW_SCOPE WT(TT_SD_SCOPE_NEW_SCOPE, i18n("Create a new search scope."))
-#define WT_SD_SCOPE_OWN_SCOPE WT(TT_SD_SCOPE_OWN_SCOPE, i18n("Use a custom scope for the search.<BR>A standard set of search scopes exists."))
-#define WT_SD_SCOPE_DELETE_SCOPE WT(TT_SD_SCOPE_DELETE_SCOPE, i18n("Use this button to delete the chosen search scope."))
-#define WT_SD_SCOPE_EDIT_SCOPE_BUTTON WT(TT_SD_SCOPE_EDIT_SCOPE_BUTTON, i18n("Edit and define your search scopes"))
-#define WT_SD_SCOPE_CHOOSER WT(TT_SD_SCOPE_CHOOSER,i18n("Choose a search scope from the combo box"))
-#define WT_SD_SCOPE_EDIT_LINE WT(TT_SD_SCOPE_EDIT_LINE, i18n("Enter your own search scope.<BR>To define a range use \"-\" (e.g. Genesis-Exodus),<BR>to seperate different ranges or keys use the semicolon (e.g. Genesis;Matthew)."))
-#define WT_SD_SCOPE_PARSED_LIST WT(TT_SD_SCOPE_PARSED_LIST, i18n("This list contains the parsed result of your entered scope. This result will be used for the search."))
-#define WT_SD_SCOPE_CLOSE WT(TT_SD_SCOPE_CLOSE, i18n("Close this dialog and save the changes."))
-
-#define WT_SD_RESULT_MODULE_VIEW WT(TT_SD_RESULT_MODULE_VIEW, i18n("List of modules used for the search.<BR>Click on a module to see the search result on the right side."))
-#define WT_SD_RESULT_RESULT_VIEW WT(TT_SD_RESULT_RESULT_VIEW, i18n("This contains the items found in the selected module."))
-#define WT_SD_RESULT_PREVIEW WT(TT_SD_RESULT_PREVIEW, i18n("This text box shows a preview of the chosen item."))
-
-#define WT_SD_ANALYSIS_VIEW WT(TT_SD_ANALYSIS_VIEW, i18n("Graphical analysis of your search result.<BR>The bars show the number of items found in each book of the Bible or commentary."))
-
-//#defines for the settings dialog, OD means Optionsdialog
-#define WT_OD_GENERAL_DAILY_TIP WT(TT_OD_GENERAL_DAILY_TIP, i18n("Activate this box to see a daily tip on startup."))
-#define WT_OD_GENERAL_INTERNATIONAL_BOOKNAMES WT(TT_OD_GENERAL_INTERNATIONAL_BOOKNAMES, i18n("Contains the languages which can be used for the international booknames."))
-#define WT_OD_GENERAL_SHOW_STARTUPLOGO WT(TT_OD_GENERAL_SHOW_STARTUPLOGO, i18n("Activate this to see the BibleTime logo on startup."))
-#define WT_OD_GENERAL_SCROLL_PREVIOUS WT(TT_OD_GENERAL_SCROLL_PREVIOUS, i18n("Check this to use the down arrow to scroll to the next verse."))
-#define WT_OD_GENERAL_RESTORE_WORKSPACE WT(TT_OD_GENERAL_RESTORE_WORKSPACE, i18n("Save the windows in the workspace if BibleTime is closed<BR>and restore them on the next startup. "))
-
-#define WT_OD_SWORD_USE_LEXICON_CACHE WT(TT_OD_SWORD_USE_LEXICON_CACHE, i18n("Activate this to let BibleTime create index files for the lexicon entries. This will speed up opening the lexicons a lot, but consume some disk space. Recommended."))
-#define WT_OD_SWORD_STANDARD_BIBLE WT(TT_OD_SWORD_STANDARD_BIBLE, i18n("The default Bible is used when a hyperlink into a Bible was clicked"))
-#define WT_OD_SWORD_STANDARD_COMMENTARY WT(TT_OD_SWORD_STANDARD_BIBLE, i18n("The default commentary is used when a hyperlink into a commentary was clicked"))
-#define WT_OD_SWORD_STANDARD_LEXICON WT(TT_OD_SWORD_STANDARD_LEXICON, i18n("The default lexicon is used when a hyperlink into a lexicon was clicked"))
-#define WT_OD_SWORD_STANDARD_HEBREW_STRONG WT(TT_OD_SWORD_STANDARD_HEBREW_STRONG, i18n("The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon was clicked"))
-#define WT_OD_SWORD_STANDARD_GREEK_STRONG WT(TT_OD_SWORD_STANDARD_GREEK_STRONG, i18n("The default Greek lexicon is used when a hyperlink into a Greek lexicon was clicked"))
-#define WT_OD_SWORD_STANDARD_HEBREW_MORPH WT(TT_OD_SWORD_STANDARD_HEBREW_MORPH, i18n("The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text was clicked."))
-#define WT_OD_SWORD_STANDARD_GREEK_MORPH WT(TT_OD_SWORD_STANDARD_HEBREW_MORPH, i18n("The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text was clicked."))
-
-#define WT_OD_KEYS_CHOOSER WT(TT_OD_KEYS_CHOOSER, i18n("Select an action and change the key binding for the action."))
-#define WT_OD_FONTS_TYPE_CHOOSER WT(TT_OD_FONTS_TYPE_CHOOSER, i18n("Use this box to select how the font is used and change the font in the font chooser."))
-#define WT_OD_FONTS_CHOOSER WT(TT_OD_FONTS_CHOOSER, i18n("Choose a font"))
-
-#define WT_OD_COLORS_BACKGROUND WT(TT_OD_COLORS_BACKGROUND, i18n("This is the background color used in display windows."))
-#define WT_OD_COLORS_CURRENT_VERSE WT(TT_OD_COLORS_CURRENT_VERSE, i18n("This is the color of the highlighted verse used in display windows."))
-
-#define WT_OD_DISPLAY_WINDOW_KEYS_GENERAL WT(TT_OD_DISPLAY_WINDOW_KEYS_GENERAL, i18n("Set the keyboard accelerators used in all display windows"))
-#define WT_OD_DISPLAY_WINDOW_KEYS_BIBLE WT(TT_OD_DISPLAY_WINDOW_KEYS_BIBLE, i18n("Set keyboard accelerators used in Bible windows"))
-#define WT_OD_DISPLAY_WINDOW_KEYS_COMMENTARY WT(TT_OD_DISPLAY_WINDOW_KEYS_COMMENTARY, i18n("Set the keyboard accelerators used in commentary windows"))
-#define WT_OD_DISPLAY_WINDOW_KEYS_LEXICON WT(TT_OD_DISPLAY_WINDOW_KEYS_LEXICON, i18n("Set the keyboard accelerators used in lexicon windows"))
-
-
-//defines for the printing dialog; PI == Print Item; PD=Printer Dialog
-#define WT_PD_PRINT WT(TT_PD_PRINT, i18n("Start the printing process.<BR>The items of the list will be printed using the assigned styles."))
-#define WT_PD_PREVIEW WT(TT_PD_PREVIEW, i18n("Print into a temporary file and open a postscript viewer to preview the printing result."))
-#define WT_PD_CANCEL WT(TT_PD_CANCEL, i18n("Closes this dialog without doing anything else."))
-#define WT_PD_HELP WT(TT_PD_HELP, i18n("Open the online help of BibleTime."))
-
-#define WT_PD_ENTRIES_STYLE_COMBO WT(TT_PD_ENTRIES_STYLE_COMBO, i18n("This combo box contains the available print styles."))
-#define WT_PD_ENTRIES_PI_LIST WT(TT_PD_ENTRIES_PI_LIST, i18n("This is the list which contains the available print items."))
-#define WT_PD_ENTRIES_PI_MOVE_UP WT(TT_PD_ENTRIES_PI_MOVE_UP, i18n("Move the selected item up one item."))
-#define WT_PD_ENTRIES_PI_MOVE_DOWN WT(TT_PD_ENTRIES_PI_MOVE_DOWN, i18n("Move the selected item down one item."))
-#define WT_PD_ENTRIES_PI_DELETE WT(TT_PD_ENTRIES_PI_DELETE, i18n("Delete the selected items."))
-#define WT_PD_ENTRIES_PI_PAGE_BREAK WT(TT_PD_ENTRIES_PI_PAGE_BREAK, i18n("Inserts a page break into the list.<BR>The printer will start a new page."))
-
-#define WT_PD_LAYOUT_BORDER WT(TT_PD_LAYOUT_BORDER, i18n("This group contains the page borders of the page measured in millimeters."))
-#define WT_PD_LAYOUT_BORDER_LEFT WT(TT_PD_LAYOUT_BORDER_LEFT, i18n("The size of the border on the left side of the paper."))
-#define WT_PD_LAYOUT_BORDER_RIGHT WT(TT_PD_LAYOUT_BORDER_RIGHT, i18n("The size of the border on the right side of the paper."))
-#define WT_PD_LAYOUT_BORDER_TOP WT(TT_PD_LAYOUT_BORDER_TOP, i18n("The size of the border on the top of the paper."))
-#define WT_PD_LAYOUT_BORDER_BOTTOM WT(TT_PD_LAYOUT_BORDER_BOTTOM, i18n("The size of the border on the bottom of the paper."))
-#define WT_PD_LAYOUT_STYLE_LIST WT(TT_PD_LAYOUT_STYLE_LIST, i18n("This list contains the available printing styles.<BR>Create your own one using the \"New style\" button."))
-#define WT_PD_LAYOUT_STYLE_DELETE WT(TT_PD_LAYOUT_STYLE_DELETE, i18n("Remove the selected printing style from the list."))
-#define WT_PD_LAYOUT_STYLE_EDIT WT(TT_PD_LAYOUT_STYLE_EDIT, i18n("Change the properties of the selected printing style."))
-#define WT_PD_LAYOUT_STYLE_NEW WT(TT_PD_LAYOUT_STYLE_NEW, i18n("Create a new printing style.<BR>The new style will be added to the list."))
-
-#endif
-
diff --git a/bibletime/xml/Makefile.in b/bibletime/xml/Makefile.in
index 2058c35..ae674ba 100644
--- a/bibletime/xml/Makefile.in
+++ b/bibletime/xml/Makefile.in
@@ -1,7 +1,9 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.7 $ 
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# 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.
@@ -11,190 +13,215 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-#>- 
-bindir = @bindir@
-#>+ 3
-DEPDIR = .deps
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+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@
-DLLTOOL = @DLLTOOL@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
 GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
+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_CXXFLAGS = @KDE_CXXFLAGS@
 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@
-LIBGEN = @LIBGEN@
 LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
 LIBOBJS = @LIBOBJS@
 LIBPNG = @LIBPNG@
 LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
 LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
 LIBSM = @LIBSM@
 LIBSOCKET = @LIBSOCKET@
-LIBTIFF = @LIBTIFF@
 LIBTOOL = @LIBTOOL@
 LIBUCB = @LIBUCB@
 LIBUTIL = @LIBUTIL@
-LIBXINERAMA = @LIBXINERAMA@
 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_KFORMULA = @LIB_KFORMULA@
 LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
 LIB_KIO = @LIB_KIO@
 LIB_KPARTS = @LIB_KPARTS@
 LIB_KSPELL = @LIB_KSPELL@
 LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KWRITE = @LIB_KWRITE@
+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@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
+NOOPT_CFLAGS = @NOOPT_CFLAGS@
 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-NOREPO = @NOREPO@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
+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@
-REPO = @REPO@
 RPM_GROUP = @RPM_GROUP@
 RPM_PREFIX = @RPM_PREFIX@
-SETUIDFLAGS = @SETUIDFLAGS@
+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@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
+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@
-idldir = @idldir@
-jni_includes = @jni_includes@
+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@
@@ -202,159 +229,223 @@ 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@
-micodir = @micodir@
+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 = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(rc_DATA)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(rc_DATA)
 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-#>- all: all-redirect
+DIST_COMMON = Makefile.am Makefile.in
+#>- all: all-am
 #>+ 1
-all: docs-am  all-redirect
+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
-#>+ 2
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/xml/Makefile
+$(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)
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+mostlyclean-libtool:
+	-rm -f *.lo
 
+clean-libtool:
+	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+rcDATA_INSTALL = $(INSTALL_DATA)
 install-rcDATA: $(rc_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(rcdir)
 	@list='$(rc_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rcdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rcdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rcdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(rcdir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(rcdir)/$$p; \
+	@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:
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-subdir = bibletime/xml
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bibletime/xml/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-rcDATA
+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
-install: install-am
-uninstall-am: uninstall-rcDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(rcdir)
-
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
+	@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
 
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
+#>- clean-am: clean-generic clean-libtool mostlyclean-am
+#>+ 1
+clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-rcDATA install-rcDATA tags distdir info-am info dvi-am \
-dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
@@ -363,22 +454,59 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 #>+ 2
 docs-am:
 
-#>+ 5
+#>+ 6
 force-reedit:
-		cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/xml/Makefile
+		cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  bibletime/xml/Makefile
 	cd $(top_srcdir) && perl admin/am_edit bibletime/xml/Makefile.in
 
 
-#>+ 2
+#>+ 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
-#>+ 2
+
+#>+ 3
+final-install:
+	$(MAKE) install-am
+
+#>+ 3
 no-final:
 	$(MAKE) all-am
+
+#>+ 3
+no-final-install:
+	$(MAKE) install-am
+
 #>+ 3
 cvs-clean:
-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common 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
index d896cf0..6866376 100644
--- a/bibletime/xml/bibletimeui.rc
+++ b/bibletime/xml/bibletimeui.rc
@@ -1,33 +1,35 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="BibleTime" version="13">
+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="BibleTime" version="20">
 <MenuBar>
  <Menu name="file" noMerge="1"><text>&amp;File</text>
-  <Action name="fileClearQueue_action"/>
+  <Action name="file_clear_queue_action"/>
   <Action name="file_print"/>
   <Separator/>
   <Action name="file_quit"/>
  </Menu>
- <Menu name="main index"><text>&amp;Main index</text>
-  <Action name="GMsearch_action"/>
+ <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="GMreset_action"/>
-  <Action name="GMdelete_action"/>
+  <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="viewGroupManager_action"/>
- </Menu>
- <Menu name="settings" noMerge="1"><Text>&amp;Settings</Text>
-  <Action name="options_configure_toolbars"/>
-  <Action name="options_configure"/>
+  <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"/>	
+  <Action name="windowEditProfiles_action"/>
+  <Separator/>
+  <Action name="windowFullscreen_action"/>
   <Separator/>
-  <Action name="windowFullscreen_action"/>	
-  <Separator/>	
   <Action name="windowTile_action"/>
   <Action name="windowCascade_action"/>
   <Action name="windowAutoTile_action"/>
@@ -35,11 +37,10 @@
   <Separator/>
   <Action name="windowCloseAll_action"/>
   <Separator/>
- </Menu>	
+ </Menu>
  <Menu name="help" noMerge="1"><Text>&amp;Help</Text>
-  <Action name="help_handbook"/>
-  <Action name="help_install"/>
-  <Action name="help_howto"/>
+  <Action name="helpHandbook_action"/>
+  <Action name="helpHowTo_action"/>
   <Separator/>
   <Action name="help_whats_this"/>
   <Action name="help_report_bug"/>
@@ -47,22 +48,21 @@
   <Separator/>
   <Action name="help_about_app"/>
   <Action name="help_about_kde"/>
- </Menu>	
+ </Menu>
 </MenuBar>
 <ToolBar name="mainToolBar" fullWidth="true" noMerge="1" newLine="1">
- <Action name="file_quit"/>		
- <Action name="file_print"/>
- <Action name="file_clearQueue"/>
+ <Action name="file_quit"/>
  <Separator/>
- <Action name="viewStrongs_action"/>
- <Action name="viewFootnotes_action"/>
- <Action name="viewGroupmanager_action"/>		
+ <Action name="groupmanager_search_action"/>
  <Separator/>
- <Action name="GMsearch_action"/>		
+ <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="windowFullscreen_action"/>	
+ <Action name="windowSaveToNewProfile_action"/>
  <Separator/>
  <Action name="help_whats_this"/>
 </ToolBar>
diff --git a/config.guess b/config.guess
deleted file mode 100755
index 378eab8..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1368 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-03-30'
-
-# 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.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# 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, 93, 94, 95, 96, 97, 98, 99, 2000
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break
-	  fi
-	done
-	rm -f $dummy.c $dummy.o $dummy.rel
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
-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.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	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.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	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;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	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 ;;
-    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=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		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 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > 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 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    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)
-	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 $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    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
-		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 $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		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])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              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 $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >$dummy.c
-	#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 $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*: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 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	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*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
-	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/
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# 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
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-int main (int argc, char *argv[]) {
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	;;
-    ppc:Linux:*:*)
-	# Determine Lib Version
-	cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unknown\n");
-#endif
-  return 0;
-}
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		./$dummy | grep 1\.99 > /dev/null
-		if test "$?" = 0 ; then LIBC="libc1" ; fi
-	fi
-	rm -f $dummy.c $dummy
-	echo powerpc-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    alpha:Linux:*:*)
-	cat <<EOF >$dummy.s
-	  .data
-	  \$Lformat:
-		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-	   .text
-		.globl main
-		.align 4
-		.ent main
-	    main:
-		.frame \$30,16,\$26,0
-		ldgp \$29,0(\$27)
-		.prologue 1
-		.long 0x47e03d80 # implver \$0
-		lda \$2,-1
-		.long 0x47e20c21 # amask \$2,\$1
-		lda \$16,\$Lformat
-		mov \$0,\$17
-		not \$1,\$18
-		jsr \$26,printf
-		ldgp \$29,0(\$26)
-		mov 0,\$16
-		jsr \$26,exit
-		.end main
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-		0-0)	UNAME_MACHINE="alpha" ;;
-		1-0)	UNAME_MACHINE="alphaev5" ;;
-		1-1)    UNAME_MACHINE="alphaev56" ;;
-		1-101)	UNAME_MACHINE="alphapca56" ;;
-		2-303)	UNAME_MACHINE="alphaev6" ;;
-		2-307)	UNAME_MACHINE="alphaev67" ;;
-		esac
-		objdump --private-headers $dummy | \
-		  grep ld.so.1 > /dev/null
-		if test "$?" = 0 ; then
-			LIBC="libc1"
-		fi
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i?86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported emulations:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_emulations" in
-	  i?86linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
-		;;
-	  elf_i?86)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  i?86coff)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
-		;;
-	esac
-	# Either a pre-BFD a.out linker (linux-gnuoldld)
-	# or one that does not give us useful --help.
-	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	# If ld does not provide *any* "supported emulations:"
-	# that means it is gnuoldld.
-	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-	case "${UNAME_MACHINE}" in
-	i?86)
-	  VENDOR=pc;
-	  ;;
-	*)
-	  VENDOR=unknown;
-	  ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
-	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:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-	else
-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    i?86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i?86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # 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 ;;
-    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 | 4850:*: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:CPunix: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 ;;
-    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 ;;
-    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]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i?86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >$dummy.c <<EOF
-#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 $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-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/config.h b/config.h
deleted file mode 100644
index 4f0b89a..0000000
--- a/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
-
-/* The number of bytes in a char.  */
-#define SIZEOF_CHAR 1
-
-/* The number of bytes in a char *.  */
-#define SIZEOF_CHAR_P 4
-
-/* The number of bytes in a int.  */
-#define SIZEOF_INT 4
-
-/* The number of bytes in a long.  */
-#define SIZEOF_LONG 4
-
-/* Define if you have the res_init function.  */
-#define HAVE_RES_INIT 1
-
-/* Name of package */
-#define PACKAGE "bibletime"
-
-/* Version number of package */
-#define VERSION "1.1"
-
-/* C++ compiler supports template repository */
-#define HAVE_TEMPLATE_REPOSITORY 1
-
-/* Defines if your system has the crypt function */
-#define HAVE_CRYPT 1
-
-/* Define the real type of socklen_t */
-/* #undef socklen_t */
-
-/* Compatibility define */
-#define ksize_t socklen_t
-
-/* Define if you have libz */
-#define HAVE_LIBZ 1
-
-/* Define if you want Xinerama support */
-/* #undef HAVE_XINERAMA */
-
-/* Define if you have libpng */
-#define HAVE_LIBPNG 1
-
-/* Define if you have libjpeg */
-#define HAVE_LIBJPEG 1
-
-/* The type of your distribution */
-#define DISTRIBUTION Debian
-
-/* The version of your distribution */
-#define DISTRIBUTION_VERSION 3.0
-
diff --git a/config.h.in b/config.h.in
index 6cf1360..8d8c0e2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,53 +1,218 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* The number of bytes in a char.  */
-#undef SIZEOF_CHAR
+/* The type of your distribution */
+#undef DISTRIBUTION
 
-/* The number of bytes in a char *.  */
-#undef SIZEOF_CHAR_P
+/* The version of your distribution */
+#undef DISTRIBUTION_VERSION
 
-/* The number of bytes in a int.  */
-#undef SIZEOF_INT
+/* Define if you have the CoreAudio API */
+#undef HAVE_COREAUDIO
 
-/* The number of bytes in a long.  */
-#undef SIZEOF_LONG
+/* 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 if you have the res_init function.  */
+/* 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
 
-/* C++ compiler supports template repository */
-#undef HAVE_TEMPLATE_REPOSITORY
+/*
+ * 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
 
-/* Defines if your system has the crypt function */
-#undef HAVE_CRYPT
 
-/* Define the real type of socklen_t */
-#undef socklen_t
 
-/* Compatibility define */
-#undef ksize_t
+/*
+ * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
+ * that defines bzero.
+ */
 
-/* Define if you have libz */
-#undef HAVE_LIBZ
+#if defined(_AIX)
+#include <strings.h>
+#endif
 
-/* Define if you want Xinerama support */
-#undef HAVE_XINERAMA
 
-/* Define if you have libpng */
-#undef HAVE_LIBPNG
 
-/* Define if you have libjpeg */
-#undef HAVE_LIBJPEG
+#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
+# include <sys/time.h>
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+#endif
 
-/* The type of your distribution */
-#undef DISTRIBUTION
 
-/* The version of your distribution */
-#undef DISTRIBUTION_VERSION
 
+#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/config.sub b/config.sub
deleted file mode 100755
index 4ac0c8b..0000000
--- a/config.sub
+++ /dev/null
@@ -1,1360 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-03-30'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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>.
-#
-# 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* | storm-chaos* | os2-emx*)
-    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
-		;;
-	-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.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-		| pj | pjl | h8500)
-		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 | z8k | v70 | w65)
-		;;
-
-	# 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[234567]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.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-	      | [cjt]90-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
-		;;
-	# 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
-		;;
-	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 | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	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[34567]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i[34567]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i[34567]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i[34567]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
-		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	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
-		;;
-	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)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
-		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/^[^-]*-//'`
-		;;
-	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
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-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
-		;;
-	t3e)
-		basic_machine=t3e-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	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
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	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
-		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
-	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)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv9)
-		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
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-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* \
-	      | -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*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i[34567]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
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-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
-		;;
-	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
-		;;
-	*-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*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-		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/configure b/configure
index 775fe7b..6cfcc88 100755
--- a/configure
+++ b/configure
@@ -1,92 +1,479 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# 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
 
-# Defaults:
-ac_help=
+
+
+# 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
-# Any additions from configure.in:
+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}
-ac_help="$ac_help
-  --disable-fast-perl     disable fast Makefile generation (needs perl)"
-ac_help="$ac_help
-  --enable-debug          enables debug symbols [default=no]"
-ac_help="$ac_help
-  --disable-debug         disables debug output and debug symbols [default=no]"
-ac_help="$ac_help
-  --enable-strict         compiles with strict compiler options (may not work!)"
-ac_help="$ac_help
-  --enable-profile        creates profiling infos [default=no]"
-ac_help="$ac_help
-  --enable-final          build size optimized apps (experimental - needs lots of memory)"
-ac_help="$ac_help
-  --disable-closure       don't delay template instantiation"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=no]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-ac_help="$ac_help
-  --enable-objprelink     prelink apps using objprelink (experimental [only tested on linux/386])"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --with-xinerama         enable support for Xinerama "
-ac_help="$ac_help
-  --enable-mt             link to threaded Qt (experimental)"
-ac_help="$ac_help
-  --with-extra-includes=DIR
-                          adds non standard include paths"
-ac_help="$ac_help
-  --with-extra-libs=DIR   adds non standard library paths"
-ac_help="$ac_help
-  --with-qt-dir=DIR       where the root of Qt is installed "
-ac_help="$ac_help
-  --with-qt-includes=DIR  where the Qt includes are. "
-ac_help="$ac_help
-  --with-qt-libraries=DIR where the Qt library is installed."
-ac_help="$ac_help
-  --disable-rpath         do not use the rpath feature of ld"
-ac_help="$ac_help
-  --disable-path-check    don't try to find out, where to install"
-ac_help="$ac_help
-  --enable-static-linking	use static linking"
-ac_help="$ac_help
-  --with-sword-dir=DIR     Patch where Sword is being installed (default=/usr) "
-ac_help="$ac_help
-  --enable-static-sword    Link to the static Sword library"
-ac_help="$ac_help
-  --with-distribution=TYPE     The name of your *NIX distribution, e.g. SuSE [auto] "
-ac_help="$ac_help
-  --with-distribution-version=VERSION     Version of your *NIX distribution, e.g. 7.2 [auto] "
-ac_help="$ac_help
-  --with-rpm-prefix=DIR    The directory which should be used as PREFIX
-														in the RPM spec file [auto] "
-ac_help="$ac_help
-  --with-rpm-group=DIR     The group which will be used for the RPM system [auto] "
+# 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.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -95,10 +482,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 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'
@@ -112,17 +504,9 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
 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"
@@ -130,59 +514,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    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" ;;
+    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" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -191,95 +575,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # 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 << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --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
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -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 ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    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" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    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" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -288,19 +624,19 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    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)
+  | --no-cr | --no-c | -n)
     no_create=yes ;;
 
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
@@ -314,26 +650,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    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_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_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -350,7 +686,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -360,7 +696,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -371,58 +707,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    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" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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.
@@ -433,99 +768,110 @@ EOF
     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_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" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { 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 ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # 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
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  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
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# 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
 
-# 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
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=acinclude.m4
 
 # 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_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  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=..
@@ -535,13 +881,517 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+(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
@@ -552,41 +1402,105 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { 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
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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 "creating cache $cache_file"
-  > $cache_file
+  { 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
+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
@@ -597,129 +1511,123 @@ for ac_dir in admin $srcdir/admin; do
     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 "configure: error: can not find install-sh or install.sh in admin $srcdir/admin" 1>&2; exit 1; }
+  { { 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=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+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/'`
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
 
 # The aliases save the names the user supplied, while $host etc.
 # will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:641: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:662: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:680: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
+test -n "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+  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"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
+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
@@ -730,60 +1638,73 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # 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 $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:739: checking for a BSD compatible install" >&5
+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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/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
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
+  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
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
+    done
+    ;;
+esac
+done
+
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    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"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
@@ -791,8 +1712,8 @@ 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 $ac_n "checking for -p flag to install""... $ac_c" 1>&6
-echo "configure:796: checking for -p flag to install" >&5
+    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
@@ -804,9 +1725,10 @@ echo "configure:796: checking for -p flag to install" >&5
       fi
     fi
     rm -f confinst.$$.*
-    echo "$ac_t""$ac_res" 1>&6
+    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
@@ -814,175 +1736,310 @@ echo "configure:796: checking for -p flag to install" >&5
     INSTALL_SCRIPT='${INSTALL}'
   fi
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:819: checking whether build environment is sane" >&5
+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 > conftestfile
+echo timestamp > conftest.file
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
    if test "$*" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
+      set X `ls -t $srcdir/configure conftest.file`
    fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
 
       # If neither matched, then we have a broken ls.  This can happen
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { 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" = conftestfile
+   test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
+   { { 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
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:857: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
+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}"'
-EOF
+	@echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+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 conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  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
 
-PACKAGE=bibletime
-
-VERSION=1.1
+ # 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
 
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+# 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
-cat >> confdefs.h <<EOF
+
+
+# Define the identity of the package.
+ PACKAGE=bibletime
+ VERSION=1.4.1
+
+
+cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
-EOF
+_ACEOF
 
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
 #define VERSION "$VERSION"
-EOF
+_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}"}
 
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:903: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
+
+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
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
+  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
 
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:916: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
+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
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:929: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
 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
 
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:942: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
+  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
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:955: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
+  STRIP=$ac_ct_STRIP
 else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
+  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"
+    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
+fi;
 
 
-  
   val=
   if test -f $srcdir/configure.files ; then
     val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
@@ -993,54 +2050,218 @@ fi
       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"
-  
-   if test $enableval = "no";      then
-       kde_use_debug_code="no"
-       kde_use_debug_define=yes
-     else
-       kde_use_debug_code="yes"
-       kde_use_debug_define=no
-   fi
-  
+
+    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
 
+fi;
 
     # Check whether --enable-dummyoption or --disable-dummyoption was given.
 if test "${enable_dummyoption+set}" = set; then
   enableval="$enable_dummyoption"
-  :
-fi
 
+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
+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
@@ -1048,220 +2269,648 @@ if test "${enable_profile+set}" = set; then
   kde_use_profiling=$enableval
 else
   kde_use_profiling="no"
-  
-fi
 
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1061: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+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"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  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
-  echo "$ac_t""no" 1>&6
+  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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1091: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+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 $# -gt 0; then
+  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
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1142: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+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"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1174: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+    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
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
 
-cat > conftest.$ac_ext << EOF
+  test -n "$ac_ct_CC" && break
+done
 
-#line 1185 "configure"
-#include "confdefs.h"
+  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 ()
+{
 
-main(){return(0);}
-EOF
-if { (eval echo configure:1190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+  ;
+  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
-    ac_cv_prog_cc_cross=yes
+    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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
+  { { 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 -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1216: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
+rm -f conftest$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
 
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1221: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+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
-  ac_cv_prog_gcc=no
-fi
-fi
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+{ { 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
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
+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
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1249: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ;
+  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
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_prog_cc_g=no
 fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1275,16 +2924,569 @@ 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" = "yes"; then
-      CFLAGS="-g -O2 $CFLAGS"
-      case $host in
-        *-*-linux-gnu)	
-          CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-        ;;
-      esac
+    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
@@ -1294,6 +3496,7 @@ fi
     CFLAGS="-DNDEBUG $CFLAGS"
   fi
 
+
   case "$host" in
   *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
   *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
@@ -1305,409 +3508,1844 @@ fi
 
   CXXFLAGS=" $CXXFLAGS"
 
-  for ac_prog in $CCC c++ g++ gcc CC cxx cc++ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1314: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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
+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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+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"
+CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$CXX" && break
+    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
-test -n "$CXX" || CXX="gcc"
 
+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
 
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1346: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+  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 ()
+{
 
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+  ;
+  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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&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
 
-cat > conftest.$ac_ext << EOF
 
-#line 1362 "configure"
-#include "confdefs.h"
 
-int main(){return(0);}
-EOF
-if { (eval echo configure:1367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cxx_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cxx_cross=no
-  else
-    ac_cv_prog_cxx_cross=yes
-  fi
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cxx_works=no
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
 fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+
+
+  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-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-if test $ac_cv_prog_cxx_works = no; then
-  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1393: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1398: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  cat > conftest.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
+ 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_cv_prog_gxx=no
+
+
+
+   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
 
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
 
-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
+    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
-  GXX=
+
+
+
+   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
 
-ac_test_CXXFLAGS="${CXXFLAGS+set}"
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1426: checking whether ${CXX-g++} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-  ac_cv_prog_cxx_g=yes
+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
-  ac_cv_prog_cxx_g=no
-fi
-rm -f conftest*
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ :
 
 fi
 
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&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
+
+  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
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  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'
+
+
+  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
+ :
 
-  if test "$GXX" = "yes"; then
-    if test "$kde_use_debug_code" = "yes"; then
-      CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+fi
 
-      
-echo $ac_n "checking whether $CXX supports -Wno-long-long""... $ac_c" 1>&6
-echo "configure:1464: checking whether $CXX supports -Wno-long-long" >&5
-kde_cache=`echo Wno-long-long | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+          ;;
+        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
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -Wno-long-long -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -Wno-long-long -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  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'
+
+
+  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
-rm -f conftest*
+
+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 "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  :
  CXXFLAGS="-Wno-long-long $CXXFLAGS"
 else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
  :
- 
+
 fi
 
-      
-echo $ac_n "checking whether $CXX supports -Wnon-virtual-dtor""... $ac_c" 1>&6
-echo "configure:1493: checking whether $CXX supports -Wnon-virtual-dtor" >&5
-kde_cache=`echo Wnon-virtual-dtor | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+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
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -Wnon-virtual-dtor -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -Wnon-virtual-dtor -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
-fi
-rm -f conftest*
+
+
+
+   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 "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  :
  CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"
 else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
  :
- 
+
 fi
 
-      
-echo $ac_n "checking whether $CXX supports -fno-builtin""... $ac_c" 1>&6
-echo "configure:1522: checking whether $CXX supports -fno-builtin" >&5
-kde_cache=`echo fno-builtin | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -fno-builtin -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -fno-builtin -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
+     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
-rm -f conftest*
+
+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 "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  :
- CXXFLAGS="-fno-builtin $CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -fno-check-new"
 else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
  :
- 
+
 fi
 
 
-      case $host in        *-*-linux-gnu)
-        CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS"
-        ;;
-      esac
+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
 
-      if test "$kde_use_strict_options" = "yes"; then
-        CXXFLAGS="-Wcast-qual -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
-      fi
 
-      if test "$kde_very_strict" = "yes"; then
-        CXXFLAGS="-Wold-style-cast -Wredundant-decls -Wconversion $CXXFLAGS"
-      fi
-    else
-      CXXFLAGS="-O2 $CXXFLAGS"
-    fi
-  fi
 
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG $CXXFLAGS"
-  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
 
-  if test "$kde_use_profiling" = "yes"; then
-    
-echo $ac_n "checking whether $CXX supports -pg""... $ac_c" 1>&6
-echo "configure:1574: checking whether $CXX supports -pg" >&5
-kde_cache=`echo pg | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -pg -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -pg -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ :
+
 fi
-rm -f conftest*
+
+
+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 "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  :
- 
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-    
+ USE_EXCEPTIONS="-fexceptions"
 else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
  :
- 
+ USE_EXCEPTIONS=
 fi
 
   fi
-    
-  
-echo $ac_n "checking whether $CXX supports -fno-exceptions""... $ac_c" 1>&6
-echo "configure:1608: checking whether $CXX supports -fno-exceptions" >&5
-kde_cache=`echo fno-exceptions | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  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
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -fno-exceptions -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -fno-exceptions -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  fi
+  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
-rm -f conftest*
+
+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 "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  :
- CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
 else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
  :
- 
+
 fi
 
-  
-echo $ac_n "checking whether $CXX supports -fno-check-new""... $ac_c" 1>&6
-echo "configure:1637: checking whether $CXX supports -fno-check-new" >&5
-kde_cache=`echo fno-check-new | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+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
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -fno-check-new -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -fno-check-new -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  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'
+
+
+  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
-rm -f conftest*
+
+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 "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  :
- CXXFLAGS="$CXXFLAGS -fno-check-new"
+ CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
 else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
  :
- 
+
 fi
 
-  
-echo $ac_n "checking whether $CXX supports -fexceptions""... $ac_c" 1>&6
-echo "configure:1666: checking whether $CXX supports -fexceptions" >&5
-kde_cache=`echo fexceptions | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+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
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -fexceptions -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -fexceptions -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
-  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'
+
+
+  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
-rm -f conftest*
+
+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 "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  :
- USE_EXCEPTIONS="-fexceptions"
+ CXXFLAGS="$CXXFLAGS --one_per"
 else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
  :
- USE_EXCEPTIONS=	
+
 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*) 
+      *-*-solaris*)
         if test "$GXX" = yes; then
           libstdcpp=`$CXX -print-file-name=libstdc++.so`
           if test ! -f $libstdcpp; then
-             { echo "configure: 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" 1>&2; exit 1; }
+             { { 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
 
-    __val=$CXX
+  if test "x$kde_use_qt_emb" != "xyes"; then
+  __val=$CXX
   __forbid=" -fno-rtti -rpath "
   if test -n "$__val"; then
     __new=""
@@ -1715,7 +5353,8 @@ fi
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) echo "configure: warning: found forbidden $i in CXX, removing it" 1>&2 ;;
+        *" $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 ;;
@@ -1733,7 +5372,47 @@ fi
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) echo "configure: warning: found forbidden $i in CXXFLAGS, removing it" 1>&2 ;;
+        *" $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 ;;
@@ -1743,167 +5422,333 @@ fi
     CXXFLAGS=$__new
   fi
 
+fi
 
 
-  echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1750: checking how to run the C++ preprocessor" >&5
+  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 eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  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_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-  CXXCPP="${CXX-g++} -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1766 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   :
 else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CXXCPP=/lib/cpp
+  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
-rm -f conftest*
-  ac_cv_prog_CXXCPP="$CXXCPP"
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
 
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
 
-  # the following is to allow programs, that are known to
-  # have problems when compiled with -O2
-  if test -n "$CXXFLAGS"; then
-      kde_safe_IFS=$IFS
-      IFS=" "
-      NOOPT_CXXFLAGS=""
-      for i in $CXXFLAGS; do
-        case $i in
-          -O*)
-                ;;
-          *)
-                NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS $i"
-                ;;
-        esac
-      done
-      IFS=$kde_safe_IFS
+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
-
-  
-
-  
-  # 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
+  ac_cpp_err=yes
 fi
-
-
-  
-  REPO=""
-  NOREPO=""
-
-  
-echo $ac_n "checking whether $CXX supports -frepo""... $ac_c" 1>&6
-echo "configure:1832: checking whether $CXX supports -frepo" >&5
-kde_cache=`echo frepo | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test -z "$ac_cpp_err"; then
+  :
 else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -frepo -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -frepo -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
+  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
-rm -f conftest*
+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
 
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
- 
-     REPO="-frepo"
-     NOREPO="-fno-repo"
-   
+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 "$ac_t""no" 1>&6
- :
- 
+  { { 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 -z "$REPO"; then
-  
-echo $ac_n "checking whether $CXX supports -instances=explicit""... $ac_c" 1>&6
-echo "configure:1866: checking whether $CXX supports -instances=explicit" >&5
-kde_cache=`echo instances=explicit | sed 'y%.=/+-%___p_%'`
-if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-echo 'int main() { return 0; }' >conftest.cc
-eval "kde_cv_prog_cxx_$kde_cache=no"
-if test -z "`$CXX -instances=explicit -c conftest.cc 2>&1`"; then
-  if test -z "`$CXX -instances=explicit -o conftest conftest.o 2>&1`"; then
-    eval "kde_cv_prog_cxx_$kde_cache=yes"
+
+  if test "$GCC" = yes; then
+     NOOPT_CFLAGS=-O0
   fi
-fi
-rm -f conftest*
+
+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 "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  :
- 
-     REPO="-instances=explicit"
-     NOREPO="-instances=extern"
-  
+ NOOPT_CXXFLAGS=-O0
 else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
  :
- 
+
 fi
 
-  fi
 
-  if test -n "$REPO"; then
-     cat >> confdefs.h <<EOF
-#define HAVE_TEMPLATE_REPOSITORY 1
-EOF
 
-     
-  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=""
@@ -1912,18 +5757,19 @@ EOF
       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=yes
-fi
-
+  kde_use_closure=no
+fi;
 
+  KDE_NO_UNDEFINED=""
   if test "x$kde_use_closure" = "xyes"; then
        KDE_USE_CLOSURE_TRUE=""
        KDE_USE_CLOSURE_FALSE="#"
@@ -1931,84 +5777,373 @@ fi
   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
-  
-  
 
 
-  
 
-  KDE_CXXFLAGS=
-  
+
+
+  # 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.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   enable_shared=no
-fi
+fi;
 
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   enable_static=yes
-fi
+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.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
+    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
-  IFS="$ac_save_ifs"
-  ;;
-esac
+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
-  enable_fast_install=yes
+  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
@@ -2016,13 +6151,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:2026: checking for ld used by GCC" >&5
+  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
@@ -2032,12 +6166,12 @@ echo "configure:2026: checking for ld used by GCC" >&5
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
+    [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -2051,32 +6185,36 @@ echo "configure:2026: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:2056: checking for GNU ld" >&5
+  echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:2059: checking for non-GNU ld" >&5
+  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${lt_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
 	test "$with_gnu_ld" != no && break
-      else
+	;;
+      *)
 	test "$with_gnu_ld" != yes && break
-      fi
+	;;
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -2084,103 +6222,112 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:2094: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
-else
+  ;;
+*)
   lt_cv_prog_gnu_ld=no
+  ;;
+esac
 fi
-fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
+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 $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:2111: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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 "$ac_t""$lt_cv_ld_reload_flag" 1>&6
+echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
 
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2123: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
       # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
 	lt_cv_path_NM="$tmp_nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
+	  break
+	  ;;
+	*)
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
+	  ;;
+	esac
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-
+echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6
 NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
 
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2161: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
+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 "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2182: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -2191,13 +6338,13 @@ lt_cv_deplibs_check_method='unknown'
 # `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
+# '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
-aix*)
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2211,25 +6358,28 @@ bsdi4*)
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+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'
+  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* )
+freebsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -2249,15 +6399,27 @@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20*|hpux11*)
-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+  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*)
+irix5* | irix6* | nonstopux*)
   case $host_os in
-  irix5*)
+  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"
     ;;
@@ -2277,9 +6439,12 @@ irix5* | irix6*)
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | m68k* | arm* | mips* | hppa* | sh* )
+  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
@@ -2290,34 +6455,32 @@ linux-gnu*)
 
 netbsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
   fi
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
   ;;
 
-openbsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
-    i*86 )
-            lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 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
-  ;;
-
-newsos6)
+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'
@@ -2336,52 +6499,1445 @@ solaris*)
 
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
   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 "$ac_t""$lt_cv_deplibs_check_method" 1>&6
+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"
 
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
+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_tool_prefix=
+  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 $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2370: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
+*)
+  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"
@@ -2391,7 +7947,7 @@ else
 	  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
+	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
 	    cat <<EOF 1>&2
@@ -2412,38 +7968,38 @@ EOF
       break
     fi
   done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+  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 "$ac_t""$MAGIC_CMD" 1>&6
+  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  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 $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2432: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    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_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
+*)
+  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"
@@ -2453,7 +8009,7 @@ else
 	  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
+	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
 	    cat <<EOF 1>&2
@@ -2474,17 +8030,19 @@ EOF
       break
     fi
   done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+  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 "$ac_t""$MAGIC_CMD" 1>&6
+  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
   else
@@ -2496,603 +8054,12352 @@ fi
   ;;
 esac
 
-# 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2503: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+  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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+    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
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 else
-  echo "$ac_t""no" 1>&6
+    :
 fi
 
+fi
 
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2535: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+    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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
+  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
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+    ;;
+  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
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+       ;;
+   *)
+  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 "$ac_t""no" 1>&6
+  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
-  RANLIB=":"
+  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
 
-# 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2570: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+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 -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
+  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
-  IFS="$ac_save_ifs"
+
+  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
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+
+
+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
-  echo "$ac_t""no" 1>&6
+  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 -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2602: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  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_word; then
-      ac_cv_prog_STRIP="strip"
-      break
+    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="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+
+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
-  echo "$ac_t""no" 1>&6
+  # 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
-  STRIP=":"
+  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
 
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-libtool_flags="$libtool_flags --enable-dlopen"
+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*
 
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  :
 fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
 
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+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
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
+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
-  pic_mode=default
+  need_locks=no
 fi
 
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+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
 
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 2669 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
+  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.
       ;;
-    *N32*)
-      LD="${LD-ld} -n32"
+    '$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
       ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
+    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
-  rm -rf conftest*
   ;;
 
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2691: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  # 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
 
-     cat > conftest.$ac_ext <<EOF
-#line 2704 "configure"
-#include "confdefs.h"
+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
 
-int main() {
+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=
 
-; return 0; }
-EOF
-if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
+  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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
+  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_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$ac_t""$lt_cv_cc_needs_belf" 1>&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"
+   ;;
+
+  *)
+    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"
 
-esac
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
 
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:2742: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    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 2747 "configure"
+#line 14033 "configure"
 #include "confdefs.h"
 
-int main() {
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
 
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
+#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
-return __CYGWIN__;
-; return 0; }
+
+#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 configure:2758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
+  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 -f conftest*
-rm -f conftest*
+rm -fr conftest*
+
+
 fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:2775: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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 2780 "configure"
+#line 14131 "configure"
 #include "confdefs.h"
 
-int main() {
-return __MINGW32__;
-; return 0; }
+#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 configure:2787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
+  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 -f conftest*
-rm -f conftest*
+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
 
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
+    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
 
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# Check to make sure the PIC flag actually works.
 #
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+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=
     ;;
   *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
     ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
+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
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+  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
-    echo "not updating unwritable cache $cache_file"
+    # 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
-rm -f confcache
 
+#
+# 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
 
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
 
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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
-  echo "creating cache $cache_file"
-  > $cache_file
+  # 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
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
+# 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`:
 
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
+# 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
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
+# 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2922: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
+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
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
+    :
 fi
-rm -f conftest*
+
 fi
 
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
+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
+      ;;
 
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:2948: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    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
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
+    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
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.$ac_ext | *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+  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
-    done
+    	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
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+    # 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
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+  ;;
+
+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
 
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
+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=
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  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
 
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
+    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.  */
 
-# Check whether --enable-objprelink or --disable-objprelink was given.
-if test "${enable_objprelink+set}" = set; then
-  enableval="$enable_objprelink"
-  kde_use_objprelink=$enableval
+/* 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
-  kde_use_objprelink=no
+  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
 
-  if test "x$kde_use_objprelink" = "xyes"; then 
 
-      
-   echo $ac_n "checking for objprelink""... $ac_c" 1>&6
-echo "configure:3010: checking for objprelink" >&5
-   if test -n "$OBJPRELINK"; then
-        kde_cv_path="$OBJPRELINK";
-   else
-        kde_cache=`echo objprelink | sed 'y%./+-%__p_%'`
+fi
+
+
+fi
+
+
+fi
 
-        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+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
-  
-        kde_cv_path="NONE"
-	dirs=""
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
+  	  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"
 
-        for dir in $dirs; do
-	  if test -x "$dir/objprelink"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/objprelink  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/objprelink"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/objprelink"
-                break
-	    fi
-          fi
-        done
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
 
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
+#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*
 
 
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
-   fi
+    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 test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      kde_use_objprelink=no
-   else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      OBJPRELINK=$kde_cv_path
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
 
-   fi
-   
-     
-      if test "x$kde_use_objprelink" = "xyes"; then
-      echo $ac_n "checking Patching libtool to run objprelink.""... $ac_c" 1>&6
-echo "configure:3067: checking Patching libtool to run objprelink." >&5
-      mv libtool libtool.orig
-      cat > libtool <<\EOF
-#! /bin/sh
-for n ; do case $n in
-  *.o)  test -r $n && echo objprelink $n && objprelink $n ;;
-  *.lo) m=`basename $n .lo`".o" && test -r $m && echo objprelink $m && objprelink $m 
-        m=".libs/$m" && test -r $m && echo objprelink $m && objprelink $m ;;
-esac; done
+#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
-      cat >> libtool libtool.orig
-      rm libtool.orig
-      chmod a+x libtool
-      echo "$ac_t""done" 1>&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); } && 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:3086: checking whether to enable maintainer-specific portions of Makefiles" >&5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+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
+fi;
+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
 
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
 
 if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -3101,18 +20408,19 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3114: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
   /*)
@@ -3136,62 +20444,69 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test -n "$MSGFMT"; then
-  echo "$ac_t""$MSGFMT" 1>&6
+  echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$ac_t""no" 1>&6
+  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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3148: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  /*)
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  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"
+GMSGFMT=$ac_cv_path_GMSGFMT
+
 if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
+  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$ac_t""no" 1>&6
+  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 "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&6
+        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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3193: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
   /*)
@@ -3215,9 +20530,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
-  echo "$ac_t""$XGETTEXT" 1>&6
+  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
@@ -3225,1232 +20542,3698 @@ fi
 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
 	  : ;
 	else
-	  echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6
+	  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
-     
 
-  
 
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3238: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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'
+
+
+    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
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 3253 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
+
+      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 "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 3270 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
+  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
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 3287 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
+
+
+
+ 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
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
+
+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
-rm -f conftest*
+
+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
-rm -f conftest*
+
 fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
+
+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
-  CPP="$ac_cv_prog_CPP"
+
+
+
+
+
+
+
+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_cv_prog_CPP="$CPP"
+
+
+
+ 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
-echo "$ac_t""$CPP" 1>&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_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+#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-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 $ac_n "checking for main in -lutil""... $ac_c" 1>&6
-echo "configure:3326: checking for main in -lutil" >&5
-ac_lib_var=`echo util'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  ac_save_LIBS="$LIBS"
-LIBS="-lutil  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3334 "configure"
-#include "confdefs.h"
 
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+if test "x$kde_cv_func_strlcpy" = xyes; then
+  kde_cv_proto_strlcpy=no
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  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
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+
+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
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBUTIL="-lutil"
+
+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
-  echo "$ac_t""no" 1>&6
+  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 $ac_n "checking for main in -lcompat""... $ac_c" 1>&6
-echo "configure:3362: checking for main in -lcompat" >&5
-ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+   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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcompat  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3370 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:3377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+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"
-else
-  echo "$ac_t""no" 1>&6
 fi
-    
+
    kde_have_crypt=
-   echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3399: checking for crypt in -lcrypt" >&5
-ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+   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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3407 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:3418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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 "$ac_t""no" 1>&6
-echo $ac_n "checking for crypt in -lc""... $ac_c" 1>&6
-echo "configure:3437: checking for crypt in -lc" >&5
-ac_lib_var=`echo c'_'crypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3445 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:3456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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 "$ac_t""no" 1>&6
 
-        echo "configure: warning: you have no crypt in either libcrypt or libc.
+        { 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" 1>&2
+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 <<EOF
+
+cat >>confdefs.h <<_ACEOF
 #define HAVE_CRYPT 1
-EOF
+_ACEOF
 
    fi
-   
-  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:3493: checking for socklen_t" >&5
-  if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-     ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+  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-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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
-#line 3510 "configure"
-#include "confdefs.h"
+    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
+main ()
+{
 
 socklen_t a=0;
 getsockname(0,(struct sockaddr*)0, &a);
-      
-; return 0; }
-EOF
-if { (eval echo configure:3523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 3531 "configure"
-#include "confdefs.h"
+  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
+main ()
+{
 
 int a=0;
 getsockname(0,(struct sockaddr*)0, &a);
-        
-; return 0; }
-EOF
-if { (eval echo configure:3544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_socklen_t=size_t
-      
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_socklen_t=size_t
+
 fi
-rm -f conftest*
-    
+rm -f conftest.$ac_objext conftest.$ac_ext
+
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$ac_t""$ac_cv_socklen_t" 1>&6
+  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 <<EOF
+
+cat >>confdefs.h <<_ACEOF
 #define socklen_t $ac_cv_socklen_t
-EOF
+_ACEOF
 
   fi
-  cat >> confdefs.h <<EOF
-#define ksize_t socklen_t
-EOF
 
+cat >>confdefs.h <<_ACEOF
+#define ksize_t socklen_t
+_ACEOF
 
 
-   ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
-   echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3590: checking for dnet_ntoa in -ldnet" >&5
-ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+   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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3598 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3631: checking for dnet_ntoa in -ldnet_stub" >&5
-ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3639 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:3650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
    fi
-   echo $ac_n "checking for inet_ntoa""... $ac_c" 1>&6
-echo "configure:3672: checking for inet_ntoa" >&5
-if eval "test \"`echo '$''{'ac_cv_func_inet_ntoa'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3677 "configure"
-#include "confdefs.h"
+   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.  */
-#include <assert.h>
+    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();
-
-int main() {
-
+   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
-inet_ntoa();
+char (*f) () = inet_ntoa;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:3700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_inet_ntoa=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_inet_ntoa=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'inet_ntoa`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+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 $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6
-echo "configure:3721: checking for inet_ntoa in -lnsl" >&5
-ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+     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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3729 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:3740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
    fi
-   echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:3762: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3767 "configure"
-#include "confdefs.h"
+   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.  */
-#include <assert.h>
+    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();
-
-int main() {
-
+   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
-connect();
+char (*f) () = connect;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_connect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+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 $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3811: checking for connect in -lsocket" >&5
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3819 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:3830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
    fi
 
-   echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:3853: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3858 "configure"
-#include "confdefs.h"
+   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.  */
-#include <assert.h>
+    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();
-
-int main() {
-
+   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
-remove();
+char (*f) () = remove;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_remove=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_remove=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+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 $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3902: checking for remove in -lposix" >&5
-ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3910 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:3921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
    fi
 
    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3945: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3950 "configure"
-#include "confdefs.h"
+   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.  */
-#include <assert.h>
+    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();
-
-int main() {
-
+   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
-shmat();
+char (*f) () = shmat;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:3973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+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 "$ac_t""no" 1>&6
-echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3991: checking for shmat in -lipc" >&5
-ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3999 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:4010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+   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
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+
+
+   # 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
-  echo "$ac_t""no" 1>&6
+  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
 
-   
-   # Solaris 2.6 and others need -lresolv for res_init
-   for ac_func in res_init
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4037: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
-  cat > conftest.$ac_ext <<EOF
-#line 4042 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+  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 $ac_func();
+   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
 
-int main() {
+fi
+if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
 
-/* 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
-$ac_func();
-#endif
 
-; return 0; }
-EOF
-if { (eval echo configure:4065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_COREAUDIO 1
+_ACEOF
+
+     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
+
 fi
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-kde_libs_safe="$LIBS"
-     LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-     cat > conftest.$ac_ext <<EOF
-#line 4089 "configure"
-#include "confdefs.h"
 
+
+
+  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(); 
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:4100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  LIBRESOLV="-lresolv"
-        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-        cat >> confdefs.h <<\EOF
+      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
-EOF
+_ACEOF
+
 
-     
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  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*
-     LIBS=$kde_libs_safe
-   
+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
-done
+rm -f conftest.$ac_objext conftest.$ac_ext
+
 
 
    LIBSOCKET="$X_EXTRA_LIBS"
-   
-   
-   
-   echo $ac_n "checking for killpg in -lucb""... $ac_c" 1>&6
-echo "configure:4125: checking for killpg in -lucb" >&5
-ac_lib_var=`echo ucb'_'killpg | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+
+   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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lucb  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4133 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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"
-else
-  echo "$ac_t""no" 1>&6
 fi
-    
+
 
    case $host in     *-*-lynxos* )
-        echo $ac_n "checking LynxOS header file wrappers""... $ac_c" 1>&6
-echo "configure:4167: checking LynxOS header file wrappers" >&5
+        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 "$ac_t""disabled" 1>&6
-        echo $ac_n "checking for gethostbyname in -lbsd""... $ac_c" 1>&6
-echo "configure:4171: checking for gethostbyname in -lbsd" >&5
-ac_lib_var=`echo bsd'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
+        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 <<EOF
-#line 4179 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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"
-else
-  echo "$ac_t""no" 1>&6
 fi
           ;;
     esac
 
-     echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4213: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
+     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
-  ac_cv_sizeof_int=4
+  # 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
-  cat > conftest.$ac_ext <<EOF
-#line 4221 "configure"
-#include "confdefs.h"
+  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 <sys/types.h>
-main()
+#include <stdlib.h>
+int
+main ()
 {
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
+
+  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;
 }
-EOF
-if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
+_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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
   ac_cv_sizeof_int=0
 fi
-rm -fr conftest*
-fi
-
 fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
+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
-EOF
+_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
 
-  echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4252: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  ;
+  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
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long=4
+  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
-  cat > conftest.$ac_ext <<EOF
-#line 4260 "configure"
-#include "confdefs.h"
+  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 <sys/types.h>
-main()
+#include <stdlib.h>
+int
+main ()
 {
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
+
+  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;
 }
-EOF
-if { (eval echo configure:4272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long=`cat conftestval`
+_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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
-fi
+  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
 
-fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF
+  ;
+  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
 
-  echo $ac_n "checking size of char *""... $ac_c" 1>&6
-echo "configure:4291: checking size of char *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  ;
+  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
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_char_p=4
+  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
-  cat > conftest.$ac_ext <<EOF
-#line 4299 "configure"
-#include "confdefs.h"
+  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 <sys/types.h>
-main()
+#include <stdlib.h>
+int
+main ()
 {
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(char *));
-  exit(0);
+
+  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;
 }
-EOF
-if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_char_p=`cat conftestval`
+_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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_char_p=0
+  ac_cv_sizeof_long=0
 fi
-rm -fr conftest*
 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
 
-fi
-echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-EOF
+  ;
+  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
 
-  echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:4330: checking size of char" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  ;
+  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
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_char=1
+  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
-  cat > conftest.$ac_ext <<EOF
-#line 4338 "configure"
-#include "confdefs.h"
+  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 <sys/types.h>
-main()
+#include <stdlib.h>
+int
+main ()
 {
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(char));
-  exit(0);
+
+  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;
 }
-EOF
-if { (eval echo configure:4350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_char=`cat conftestval`
+_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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_char=0
+  ac_cv_sizeof_char_p=0
 fi
-rm -fr conftest*
 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
 
-fi
-echo "$ac_t""$ac_cv_sizeof_char" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-EOF
 
 
-   
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4371: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4379 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:4390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+   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
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
 LIBDL="-ldl"
 ac_cv_have_dlfcn=yes
 
-else
-  echo "$ac_t""no" 1>&6
 fi
 
 
-echo $ac_n "checking for shl_unload in -ldld""... $ac_c" 1>&6
-echo "configure:4415: checking for shl_unload in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_unload | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4423 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+   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
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
 LIBDL="-ldld"
 ac_cv_have_shload=yes
 
-else
-  echo "$ac_t""no" 1>&6
 fi
 
 
@@ -4458,139 +24241,1144 @@ fi
 
 
 
-echo $ac_n "checking for extra includes""... $ac_c" 1>&6
-echo "configure:4463: checking for extra includes" >&5
-# 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
+  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
 
-kde_extra_includes=
-if test -n "$kde_use_extra_includes" && \
-   test "$kde_use_extra_includes" != "NONE"; then
+  ;
+  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
 
-   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"
+  ;
+  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
-   kde_use_extra_includes="no"
-fi
+  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
 
-echo "$ac_t""$kde_use_extra_includes" 1>&6
+  ;
+  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
 
-kde_extra_libs=
-echo $ac_n "checking for extra libs""... $ac_c" 1>&6
-echo "configure:4494: checking for extra libs" >&5
-# 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
+  ;
+  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
-  kde_use_extra_libs=NONE
+  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 ()
+{
 
-fi
+  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);
 
-if test -n "$kde_use_extra_libs" && \
-   test "$kde_use_extra_libs" != "NONE"; then
+  ;
+  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
 
-   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"
+  ;
+  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
-   kde_use_extra_libs="no"
-fi
+  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
 
-echo "$ac_t""$kde_use_extra_libs" 1>&6
+  ;
+  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
 
-echo $ac_n "checking for libz""... $ac_c" 1>&6
-echo "configure:4528: checking for libz" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_z'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  ;
+  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_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  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
 
-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 <<EOF
-#line 4545 "configure"
-#include "confdefs.h"
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
-#include<zlib.h>
+fi
 
-int main() {
-return (zlibVersion() == ZLIB_VERSION); 
-; return 0; }
-EOF
-if { (eval echo configure:4554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_z='-lz'"
+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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_z=no"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func__NSGetEnviron=no
 fi
-rm -f conftest*
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
+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
-if test ! "$ac_cv_lib_z" = no; then
-  cat >> confdefs.h <<EOF
-#define HAVE_LIBZ 1
-EOF
 
-  LIBZ="$ac_cv_lib_z"
-  
-  echo "$ac_t""$ac_cv_lib_z" 1>&6
-else
-  { echo "configure: error: not found. Check your installation and look into config.log" 1>&2; exit 1; }
-  LIBZ=""
-  
+
+
+
+
+
+
+
+
+
+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
 
 
-echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4584: checking for X" >&5
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
-if eval "test \"`echo '$''{'kde_cv_have_x'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+
+
+
+
+# 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
@@ -4608,28 +25396,46 @@ fi
 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 <<EOF
-#line 4618 "configure"
-#include "confdefs.h"
+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>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
+_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 "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  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               \
@@ -4674,7 +25480,7 @@ else
     fi
   done
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = NO
 
 if test "$ac_x_libraries" = NO; then
@@ -4687,61 +25493,79 @@ if test "$ac_x_libraries" = NO; then
   # Don't add to $LIBS permanently.
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4692 "configure"
-#include "confdefs.h"
-
-int main() {
+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; }
-EOF
-if { (eval echo configure:4699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  LIBS="$ac_save_LIBS"
+  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/` \
-    /usr/X11/lib          \
-    /usr/X11R6/lib        \
-    /usr/X11R5/lib        \
-    /usr/X11R4/lib        \
-                          \
-    /usr/lib/X11          \
-    /usr/lib/X11R6        \
-    /usr/lib/X11R5        \
-    /usr/lib/X11R4        \
-                          \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
-                          \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11	  \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
+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
@@ -4752,7 +25576,7 @@ do
   done
 done
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = NO
 
 case "$host" in
@@ -4761,45 +25585,45 @@ mips-sgi-irix6*)
 *-*-solaris*)
   ;;
 *)
-  rm -fr conftestdir
-if mkdir conftestdir; then
-  cd conftestdir
+  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 <<'EOF'
+  cat >Imakefile <<'_ACEOF'
 acfindx:
 	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-EOF
+_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
+         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
+    case $ac_im_incroot in
 	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
-    case "$ac_im_usrlibdir" in
+    case $ac_im_usrlibdir in
 	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
   cd ..
-  rm -fr conftestdir
+  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"
+    ac_x_libraries="/usr/lib${kdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -4816,11 +25640,15 @@ if test "$kde_x_libraries" = NO; then
 fi
 
 if test "$kde_x_includes" = NO; then
-  { echo "configure: error: Can't find X includes. Please check your installation and add the correct paths!" 1>&2; exit 1; }
+  { { 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 "configure: error: Can't find X libraries. Please check your installation and add the correct paths!" 1>&2; exit 1; }
+  { { 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.
@@ -4832,10 +25660,12 @@ fi
 eval "$kde_cv_have_x"
 
 if test "$have_x" != yes; then
-  echo "$ac_t""$have_x" 1>&6
+  echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
-  echo "$ac_t""libraries $kde_x_libraries, headers $kde_x_includes" 1>&6
+  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
@@ -4854,11 +25684,6 @@ 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"
@@ -4868,332 +25693,767 @@ LDFLAGS="$LDFLAGS $X_LDFLAGS"
 # 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 $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4873: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4881 "configure"
-#include "confdefs.h"
+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; }
-EOF
-if { (eval echo configure:4892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   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"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
-
 LDFLAGS="$ac_save_LDFLAGS"
 
-
-
 LIB_X11='-lX11 $(LIBSOCKET)'
 
-
-echo $ac_n "checking for libXext""... $ac_c" 1>&6
-echo "configure:4921: checking for libXext" >&5
-if eval "test \"`echo '$''{'kde_cv_have_libXext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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 <<EOF
-#line 4933 "configure"
-#include "confdefs.h"
+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() {
+int
+main ()
+{
 
 printf("hello Xext\n");
 
-; return 0; }
-EOF
-if { (eval echo configure:4947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  kde_cv_have_libXext=no
-   
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+kde_cv_have_libXext=no
+
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 LDFLAGS=$kde_ldflags_safe
 LIBS=$kde_libs_safe
- 
+
 fi
 
 
-echo "$ac_t""$kde_cv_have_libXext" 1>&6
+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 "configure: error: We need a working libXext to proceed. Since configure
+  { { 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." 1>&2; exit 1; }
+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
 
-echo $ac_n "checking for Xinerama""... $ac_c" 1>&6
-echo "configure:4974: checking for Xinerama" >&5
 
- # Check whether --with-xinerama or --without-xinerama was given.
-if test "${with_xinerama+set}" = set; then
-  withval="$with_xinerama"
-  
-    no_xinerama=no
-  
+
+
+
+
+
+
+
+
+
+
+
+  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
-  
-    no_xinerama=yes
-  
+  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
 
-kde_save_LDFLAGS="$LDFLAGS"
-kde_save_CFLAGS="$CFLAGS"
-kde_save_LIBS="$LIBS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
-LIBS="-lXinerama -lXext"
 
-if test "x$no_xinerama" = "xno"; then
 
-  if eval "test \"`echo '$''{'ac_cv_have_xinerama'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-	  cat > conftest.$ac_ext <<EOF
-#line 5004 "configure"
-#include "confdefs.h"
-#include <X11/Xlib.h>
-  			#include <X11/extensions/Xinerama.h>
-int main() {
-XineramaIsActive(NULL);
-; return 0; }
-EOF
-if { (eval echo configure:5012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_have_xinerama="yes"
+
+      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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_have_xinerama="no"
-fi
-rm -f conftest*
-  
+
+
+
+   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
-  ac_cv_have_xinerama=no;
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ :
+
 fi
 
-echo "$ac_t""$ac_cv_have_xinerama" 1>&6
+      fi
 
-LIBXINERAMA=""
 
-if test "$ac_cv_have_xinerama" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_XINERAMA 1
-EOF
 
-  LIBXINERAMA="-lXinerama"
-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
 
 
-LDFLAGS="$kde_save_LDFLAGS"
-CFLAGS="$kde_save_CFLAGS"
-LIBS="$kde_save_LIBS"
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+   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-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
 
-if test -z ""; then
-  kde_qtver=2
-  kde_qtsubver=1
+                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_qtsubver=`echo "" | sed -e 's#[0-9]\+\.\([0-9]\+\).*#\1#'`
-  # following is the check if subversion isn�t found in passed argument
-  if test "$kde_qtsubver" = ""; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "" | sed -e 's#^\([0-9]\+\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  else
-   # this is the version number fallback to 2.1, unless major version is 1 or 2
-   if test "$kde_qtver" != "2"; then
-    kde_qtver=2
-    kde_qtsubver=1
-   fi
-  fi
+  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
 
-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
-  else
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  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_qt_minversion=
+  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
 
-if test -z ""; then
-   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
-   else
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-  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
-   kde_qt_verstring=
+  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"
 
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
+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
-   kde_qt_dirs="$QTDIR /usr/lib/qt"
+  { { 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 $ac_n "checking for libpng""... $ac_c" 1>&6
-echo "configure:5117: checking for libpng" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_png'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+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"
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 5134 "configure"
-#include "confdefs.h"
-    
+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() {
+
+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; }
-EOF
-if { (eval echo configure:5147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+
+  ;
+  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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_png=no"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "ac_cv_lib_png=no"
 
 fi
-rm -f conftest*
+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 <<EOF
+
+cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPNG 1
-EOF
+_ACEOF
 
   LIBPNG="$ac_cv_lib_png"
-  
-  echo "$ac_t""$ac_cv_lib_png" 1>&6
+
+  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+echo "${ECHO_T}$ac_cv_lib_png" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   LIBPNG=""
-  
+
 fi
 
 
 
-echo $ac_n "checking for libjpeg6b""... $ac_c" 1>&6
-echo "configure:5179: checking for libjpeg6b" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_jpeg_6b'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
 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 <<EOF
-#line 5196 "configure"
-#include "confdefs.h"
+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;
@@ -5209,20 +26469,34 @@ extern "C" {
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 
-int main() {
+int
+main ()
+{
 jpeg_CreateDecompress(0L, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:5217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_jpeg_6b=no"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "ac_cv_lib_jpeg_6b=no"
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
 CFLAGS="$ac_save_CFLAGS"
 
@@ -5231,30 +26505,29 @@ fi
 
 if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
   LIBJPEG="$ac_cv_lib_jpeg_6b"
-  echo "$ac_t""$ac_cv_lib_jpeg_6b" 1>&6
+  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
 else
-  echo "$ac_t""no" 1>&6
-  
-echo $ac_n "checking for libjpeg""... $ac_c" 1>&6
-echo "configure:5240: checking for libjpeg" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_jpeg_normal'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  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_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
 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 <<EOF
-#line 5257 "configure"
-#include "confdefs.h"
+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;
@@ -5270,20 +26543,34 @@ extern "C" {
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 
-int main() {
+int
+main ()
+{
 jpeg_CreateDecompress(0L, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:5278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  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 "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_jpeg_normal=no"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "ac_cv_lib_jpeg_normal=no"
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
 CFLAGS="$ac_save_CFLAGS"
 
@@ -5292,13 +26579,15 @@ fi
 
 if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
   LIBJPEG="$ac_cv_lib_jpeg_normal"
-  echo "$ac_t""$ac_cv_lib_jpeg_normal" 1>&6
+  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
 else
-  echo "$ac_t""no" 1>&6
-  
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
        LIBJPEG=
-    
-   
+
+
 fi
 
 
@@ -5307,14 +26596,14 @@ fi
 
 
 
-jpeg_incdirs="/usr/include /usr/local/include $kde_extra_includes"
+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: 5318: $i/$j" >&5
+    echo "configure: 26606: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       jpeg_incdir=$i
@@ -5326,21 +26615,30 @@ done
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-  cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBJPEG 1
-EOF
+_ACEOF
 
 else
   if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    echo "configure: warning: 
+    { 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.
-" 1>&2
+" >&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 "configure: warning: libjpeg not found. disable JPEG support." 1>&2
+    { 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=
@@ -5352,6 +26650,76 @@ 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.
@@ -5359,113 +26727,163 @@ if test "${enable_mt+set}" = set; then
   enableval="$enable_mt"
   kde_use_qt_mt=$enableval
 else
-  kde_use_qt_mt=no
 
-fi
+    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
 
-  case $host in
-  *-*-linux-*)
-    if test "x$GCC" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread"
-      X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
+
+
+    if test -z "$LIBPTHREAD"; then
+    if test -z "$USE_THREADS"; then
+      kde_check_threading_default=no
     else
-      echo "configure: warning: Compiler is not gcc. MT support disabled." 1>&2
+      kde_check_threading_default=yes
     fi
-    ;;
-  *)
-    echo "configure: warning: MT not yet supported on $host - disabled." 1>&2
-    ;;
-  esac
+  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
 
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBPTHREAD 1
+_ACEOF
 
-kde_qt_was_given=yes
+  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
 
-if test -z "$LIBQT_GLOB"; then
 
-  LIBQT_GLOB="libqt.*"
 
+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
 
-  LIBQT="-lqt"
-  kde_int_qt="-lqt"
-
-
-  if test "x$kde_use_qt_mt" = "xyes"; then
+  kde_int_qt="-l$qtlib"
+else
+  kde_int_qt="$LIBQT"
+  kde_lib_qt_set=yes
+fi
 
-      case $host in
-      *-*-linux-*)
-        if test "x$GCC" = "xyes"; then
-          LIBQT="-lqt-mt"
-          kde_int_qt="-lqt-mt"
-          LIBQT_GLOB="libqt-mt.*"
-          USING_QT_MT="using -mt"
-        fi
-      ;;
-      esac
+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
 
-  kde_qt_was_given=no
 
+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
-  kde_int_qt="$LIBQT"
+  LIBQT="-l$qtlib"
 fi
 
-if test $kde_qtver = 2; then
+if test $kde_qtver != 1; then
+
+
 
-  
-  
   LIBQT="$LIBQT $LIBPNG $LIBJPEG"
 fi
 
-echo $ac_n "checking for Qt""... $ac_c" 1>&6
-echo "configure:5432: checking for Qt" >&5
+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
+       ac_qt_libraries="$withval"/lib${kdelibsuff}
        ac_qt_bindir="$withval"/bin
-    
-fi
+
+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
 
+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
 
+fi;
 
-if eval "test \"`echo '$''{'ac_cv_have_qt'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_have_qt+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   #try to guess Qt locations
 
@@ -5473,12 +26891,12 @@ 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 $x_includes"
+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" = "2"; then
+if test "$kde_qtver" != "1"; then
   kde_qt_header=qstyle.h
 else
   kde_qt_header=qglobal.h
@@ -5490,7 +26908,7 @@ for i in $qt_incdirs;
 do
   for j in $kde_qt_header;
   do
-    echo "configure: 5494: $i/$j" >&5
+    echo "configure: 26911: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       qt_incdir=$i
@@ -5503,7 +26921,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib $dir"
+   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
@@ -5517,16 +26935,22 @@ else
     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=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+ ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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'
 
@@ -5537,8 +26961,8 @@ ac_ldflags_safe="$LDFLAGS"
 ac_libs_safe="$LIBS"
 
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS"
-LIBS="$LIBS $LIBQT"
+LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
+LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
 
 
 
@@ -5556,10 +26980,19 @@ EOF
 
 if test $kde_qtsubver -gt 0; then
 cat >> conftest.$ac_ext <<EOF
-#include <qiconview.h>
+#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
@@ -5572,24 +27005,32 @@ 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
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
     QString s;
     s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
 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 configure:5593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+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
@@ -5602,15 +27043,15 @@ LDFLAGS="$ac_ldflags_safe"
 LIBS="$ac_libs_safe"
 
 ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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)";
@@ -5618,11 +27059,20 @@ if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
       ac_qt_notfound="(headers)";
     fi
   else
-    ac_qt_notfound="(libraries)";
+    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 "configure: 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." 1>&2; exit 1; }
+  { { 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
@@ -5633,32 +27083,34 @@ fi
 eval "$ac_cv_have_qt"
 
 if test "$have_qt" != yes; then
-  echo "$ac_t""$have_qt" 1>&6;
+  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 "$ac_t""libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" 1>&6
+  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"; then
+if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
 
 
-echo $ac_n "checking if Qt compiles without flags""... $ac_c" 1>&6
-echo "configure:5651: checking if Qt compiles without flags" >&5
-if eval "test \"`echo '$''{'kde_cv_qt_direct'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+
+ ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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'
 
@@ -5671,7 +27123,11 @@ 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=
@@ -5693,10 +27149,19 @@ EOF
 
 if test $kde_qtsubver -gt 0; then
 cat >> conftest.$ac_ext <<EOF
-#include <qiconview.h>
+#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
@@ -5709,24 +27174,32 @@ 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
-    QIconView iv(0);
-    iv.setWordWrapIconText(false);
     QString s;
     s.setLatin1("Elvis is alive", 14);
-    int magnolia = QEvent::Speech; /* new in 2.2 beta2 */
 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 configure:5730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+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"
@@ -5744,22 +27217,23 @@ export LD_LIBRARY_PATH
 LIBRARY_PATH="$ac_LIBRARY_PATH"
 export LIBRARY_PATH
 ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$ac_t""yes" 1>&6
-  qt_libraries= 
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  qt_libraries=
 else
-  echo "$ac_t""no" 1>&6
-  
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
 fi
 
 fi
@@ -5768,7 +27242,7 @@ fi
 
 
 if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES="";
+ QT_INCLUDES=""
 else
  QT_INCLUDES="-I$qt_includes"
  all_includes="$QT_INCLUDES $all_includes"
@@ -5780,6 +27254,8 @@ 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"
+
 
 
 
@@ -5793,18 +27269,18 @@ fi
       qt_bindirs="$ac_qt_bindir $qt_bindirs"
    fi
 
-   
-   echo $ac_n "checking for moc""... $ac_c" 1>&6
-echo "configure:5799: checking for moc" >&5
+
+   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 \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        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
@@ -5832,7 +27308,7 @@ else
 
         eval "kde_cv_path_$kde_cache=$kde_cv_path"
 
-        
+
 fi
 
 
@@ -5841,36 +27317,47 @@ fi
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: No Qt meta object compiler (moc) found!
+      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.
-" 1>&2; exit 1; }
+" >&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 "$ac_t""$kde_cv_path" 1>&6
+      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 $ac_n "checking for uic""... $ac_c" 1>&6
-echo "configure:5865: checking for uic" >&5
-   if test -n "$UIC"; then
-        kde_cv_path="$UIC";
+
+   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 \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        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
@@ -5898,7 +27385,7 @@ else
 
         eval "kde_cv_path_$kde_cache=$kde_cv_path"
 
-        
+
 fi
 
 
@@ -5907,54 +27394,262 @@ fi
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      UIC=""
+      echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6
+      UIC_PATH=""
    else
-      echo "$ac_t""$kde_cv_path" 1>&6
-      UIC=$kde_cv_path
+      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" ; then
-       
-    echo "configure: warning: No Qt ui compiler (uic) found!
+     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.
-" 1>&2
+" >&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
 
-   
-   
 
 
-LIB_QT="$kde_int_qt "'$(LIBPNG) $(LIBJPEG) -lXext $(LIB_X11) $(LIBSM)'
+
+   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 $ac_n "checking for rpath""... $ac_c" 1>&6
-echo "configure:5950: checking for rpath" >&5
+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
-
+fi;
 
 if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 
@@ -5964,7 +27659,8 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
     KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
   fi
     if test -n "$X_LDFLAGS"; then
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
+    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)"
@@ -5972,22 +27668,32 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 fi
 
 
-echo "$ac_t""$USE_RPATH" 1>&6
 
-echo $ac_n "checking for KDE""... $ac_c" 1>&6
-echo "configure:5979: checking for KDE" >&5
+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=${prefix}/include
-  ac_kde_includes=$prefix/include
+  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
+
 
-  if test "${exec_prefix}" != NONE; then
-    kde_libraries=${exec_prefix}/lib
-    ac_kde_libraries=$exec_prefix/lib
-  else
-    kde_libraries=${prefix}/lib
-    ac_kde_libraries=$prefix/lib
-  fi
 else
   ac_kde_includes=
   ac_kde_libraries=
@@ -5995,8 +27701,8 @@ else
   kde_includes=""
 fi
 
-if eval "test \"`echo '$''{'ac_cv_have_kde'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_have_kde+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   #try to guess kde locations
 
@@ -6010,7 +27716,7 @@ 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/kde2/include /opt/kde/include $x_includes $qt_includes"
+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"
 
@@ -6019,7 +27725,7 @@ for i in $kde_incdirs;
 do
   for j in $kde_check_header;
   do
-    echo "configure: 6023: $i/$j" >&5
+    echo "configure: 27728: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_incdir=$i
@@ -6031,21 +27737,25 @@ done
 ac_kde_includes="$kde_incdir"
 
 if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-  { echo "configure: error: 
+  { { 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!" 1>&2; exit 1; }
+So, check this please and use another prefix!" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
+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: 6049: $i/$j" >&5
+    echo "configure: 27758: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_libdir=$i
@@ -6056,21 +27766,56 @@ 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 "configure: error: 
+{ { 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!" 1>&2; exit 1; }
+So, check this please and use another prefix!" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_kde_libraries="$kde_libdir"
 
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then
+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 
+else
   ac_cv_have_kde="have_kde=no"
 
 fi
@@ -6087,19 +27832,22 @@ if test "$have_kde" != "yes"; then
  fi
  if test "$exec_prefix" = NONE; then
   ac_kde_exec_prefix="$ac_kde_prefix"
-  echo "$ac_t""will be installed in $ac_kde_prefix" 1>&6
+  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 "$ac_t""will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" 1>&6
+  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="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
+ 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 "$ac_t""libraries $ac_kde_libraries, headers $ac_kde_includes" 1>&6
+  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"
@@ -6113,9 +27861,11 @@ 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 
+if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
  all_libraries="$all_libraries $KDE_LDFLAGS"
 fi
 
@@ -6129,92 +27879,178 @@ 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
 
 
-  
+fi;
+
 
 
-echo $ac_n "checking for KDE paths""... $ac_c" 1>&6
-echo "configure:6159: checking for KDE paths" >&5
+
+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 eval "test \"`echo '$''{'kde_cv_all_paths'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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='\${prefix}/share/doc/HTML'
+    kde_htmldir='\${datadir}/doc/HTML'
   fi
   if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
+    kde_appsdir='\${datadir}/applnk'
   fi
   if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
+    kde_icondir='\${datadir}/icons'
   fi
   if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
+    kde_sounddir='\${datadir}/sounds'
   fi
   if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
+    kde_datadir='\${datadir}/apps'
   fi
   if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
+    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='\${prefix}/share/config'
+    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='\${prefix}/share/mimelnk'
+    kde_mimedir='\${datadir}/mimelnk'
   fi
   if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
+    kde_toolbardir='\${datadir}/toolbar'
   fi
   if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
+    kde_wallpaperdir='\${datadir}/wallpapers'
   fi
   if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
+    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='\${prefix}/share/services'
+    kde_servicesdir='\${datadir}/services'
   fi
   if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
+    kde_servicetypesdir='\${datadir}/servicetypes'
   fi
   if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
+    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\" \
@@ -6224,6 +28060,7 @@ if test "$ac_use_path_checking" = "default"; then
 	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\" \
@@ -6232,24 +28069,30 @@ if test "$ac_use_path_checking" = "default"; then
 	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 "$ac_t""compiling" 1>&6
-     
-  
-    echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
-echo "configure:6246: checking for KDE headers installed" >&5
-    
-     ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+     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-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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'
 
@@ -6280,25 +28123,41 @@ int main() {
     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_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- if { (eval echo configure:6289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   echo "$ac_t""yes" 1>&6
+ 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 "configure: error: your system is not able to compile a small KDE application!
+   { { 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." 1>&2; exit 1; }
+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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
 
 
 
@@ -6321,17 +28180,27 @@ cross_compiling=$ac_cv_prog_cc_cross
      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
   fi
 
-echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
-echo "configure:6326: checking for KDE libraries installed" >&5
+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 configure:6329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  echo "$ac_t""yes" 1>&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); } && test -s conftest; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  { echo "configure: error: your system fails at linking a small KDE application!
+  { { 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." 1>&2; exit 1; }
+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
@@ -6353,6 +28222,7 @@ kde_have_all_paths=yes
 	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\" \
@@ -6361,12 +28231,19 @@ kde_have_all_paths=yes
 	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 "configure: error: path checking not yet supported for KDE 2" 1>&2; exit 1; }
+     { { 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
@@ -6380,11 +28257,14 @@ eval "$kde_cv_all_paths"
    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 "$kde_have_all_paths" != "yes"; then
+   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
 
@@ -6392,63 +28272,88 @@ 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_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='\${prefix}/share/doc/HTML'
+    kde_htmldir='\${datadir}/doc/HTML'
   fi
   if test -z "$kde_appsdir"; then
-    kde_appsdir='\${prefix}/share/applnk'
+    kde_appsdir='\${datadir}/applnk'
   fi
   if test -z "$kde_icondir"; then
-    kde_icondir='\${prefix}/share/icons'
+    kde_icondir='\${datadir}/icons'
   fi
   if test -z "$kde_sounddir"; then
-    kde_sounddir='\${prefix}/share/sounds'
+    kde_sounddir='\${datadir}/sounds'
   fi
   if test -z "$kde_datadir"; then
-    kde_datadir='\${prefix}/share/apps'
+    kde_datadir='\${datadir}/apps'
   fi
   if test -z "$kde_locale"; then
-    kde_locale='\${prefix}/share/locale'
+    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='\${prefix}/share/config'
+    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='\${prefix}/share/mimelnk'
+    kde_mimedir='\${datadir}/mimelnk'
   fi
   if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${prefix}/share/toolbar'
+    kde_toolbardir='\${datadir}/toolbar'
   fi
   if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${prefix}/share/wallpapers'
+    kde_wallpaperdir='\${datadir}/wallpapers'
   fi
   if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${prefix}/share/templates'
+    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='\${prefix}/share/services'
+    kde_servicesdir='\${datadir}/services'
   fi
   if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${prefix}/share/servicetypes'
+    kde_servicetypesdir='\${datadir}/servicetypes'
   fi
   if test -z "$kde_moduledir"; then
-    kde_moduledir='\${exec_prefix}/lib/kde2'
+    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\" \
@@ -6458,6 +28363,7 @@ if test "$ac_use_path_checking" = "default"; then
 	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\" \
@@ -6466,24 +28372,30 @@ if test "$ac_use_path_checking" = "default"; then
 	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 "$ac_t""compiling" 1>&6
-     
-  
-    echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
-echo "configure:6480: checking for KDE headers installed" >&5
-    
-     ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+     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-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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'
 
@@ -6514,25 +28426,41 @@ int main() {
     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_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- if { (eval echo configure:6523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   echo "$ac_t""yes" 1>&6
+ 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 "configure: error: your system is not able to compile a small KDE application!
+   { { 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." 1>&2; exit 1; }
+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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
 
 
 
@@ -6555,17 +28483,27 @@ cross_compiling=$ac_cv_prog_cc_cross
      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
   fi
 
-echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
-echo "configure:6560: checking for KDE libraries installed" >&5
+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 configure:6563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  echo "$ac_t""yes" 1>&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); } && test -s conftest; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  { echo "configure: error: your system fails at linking a small KDE application!
+  { { 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." 1>&2; exit 1; }
+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
@@ -6587,6 +28525,7 @@ kde_have_all_paths=yes
 	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\" \
@@ -6595,12 +28534,19 @@ kde_have_all_paths=yes
 	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 "configure: error: path checking not yet supported for KDE 2" 1>&2; exit 1; }
+     { { 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
@@ -6610,33 +28556,64 @@ fi
    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 "$kde_have_all_paths" != "yes"; then
+   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 "configure: error: configure could not run a little KDE program to test the environment.
+  { { 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!)
-" 1>&2; exit 1; }
+" >&2;}
+   { (exit 1); exit 1; }; }
 else
   rm -f conftest*
-  echo "$ac_t""$kde_result" 1>&6
+  echo "$as_me:$LINENO: result: $kde_result" >&5
+echo "${ECHO_T}$kde_result" >&6
 fi
 
 bindir=$kde_bindir
 
 
 
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde2/bin /usr/kde/bin /usr/local/kde/bin"
+# 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=:
@@ -6646,18 +28623,18 @@ bindir=$kde_bindir
            IFS=$kde_save_IFS
         fi
         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
-        
-   echo $ac_n "checking for dcopidl""... $ac_c" 1>&6
-echo "configure:6652: checking for dcopidl" >&5
+
+   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 \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        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
@@ -6685,7 +28662,7 @@ else
 
         eval "kde_cv_path_$kde_cache=$kde_cv_path"
 
-        
+
 fi
 
 
@@ -6694,30 +28671,36 @@ fi
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: The important program dcopidl was not found!
+      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.
-" 1>&2; exit 1; }
+" >&2;}
+   { (exit 1); exit 1; }; }
 
    else
-      echo "$ac_t""$kde_cv_path" 1>&6
+      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6
       DCOPIDL=$kde_cv_path
 
    fi
 
-        
-   echo $ac_n "checking for dcopidl2cpp""... $ac_c" 1>&6
-echo "configure:6712: checking for dcopidl2cpp" >&5
+
+   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 \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        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
@@ -6745,7 +28728,7 @@ else
 
         eval "kde_cv_path_$kde_cache=$kde_cv_path"
 
-        
+
 fi
 
 
@@ -6754,30 +28737,37 @@ fi
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: The important program dcopidl2cpp was not found!
+      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.
-" 1>&2; exit 1; }
+" >&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 "$ac_t""$kde_cv_path" 1>&6
+      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6
       DCOPIDL2CPP=$kde_cv_path
 
    fi
 
-        
-   echo $ac_n "checking for mcopidl""... $ac_c" 1>&6
-echo "configure:6772: checking for mcopidl" >&5
+        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 \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        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
@@ -6805,7 +28795,7 @@ else
 
         eval "kde_cv_path_$kde_cache=$kde_cv_path"
 
-        
+
 fi
 
 
@@ -6814,30 +28804,38 @@ fi
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: The important program mcopidl was not found!
-Please check whether you installed KDE correctly.
-" 1>&2; exit 1; }
+      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 "$ac_t""$kde_cv_path" 1>&6
+      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6
       MCOPIDL=$kde_cv_path
 
    fi
 
-        
-   echo $ac_n "checking for artsc-config""... $ac_c" 1>&6
-echo "configure:6832: checking for artsc-config" >&5
+
+   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 \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        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
@@ -6865,7 +28863,7 @@ else
 
         eval "kde_cv_path_$kde_cache=$kde_cv_path"
 
-        
+
 fi
 
 
@@ -6874,30 +28872,39 @@ fi
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      
-    { echo "configure: error: The important program artsc-config was not found!
-Please check whether you installed KDE correctly.
-" 1>&2; exit 1; }
+      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 "$ac_t""$kde_cv_path" 1>&6
+      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6
       ARTSCCONFIG=$kde_cv_path
 
    fi
 
-        
-   echo $ac_n "checking for kde-config""... $ac_c" 1>&6
-echo "configure:6892: checking for kde-config" >&5
+        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 \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        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
@@ -6925,7 +28932,7 @@ else
 
         eval "kde_cv_path_$kde_cache=$kde_cv_path"
 
-        
+
 fi
 
 
@@ -6934,26 +28941,28 @@ fi
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      
+      echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6
+
    else
-      echo "$ac_t""$kde_cv_path" 1>&6
+      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6
       KDECONFIG=$kde_cv_path
 
    fi
 
-        
-   echo $ac_n "checking for meinproc""... $ac_c" 1>&6
-echo "configure:6948: checking for meinproc" >&5
+
+   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 \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        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
@@ -6981,7 +28990,7 @@ else
 
         eval "kde_cv_path_$kde_cache=$kde_cv_path"
 
-        
+
 fi
 
 
@@ -6990,25 +28999,229 @@ fi
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$ac_t""not found" 1>&6
-      
+      echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6
+
    else
-      echo "$ac_t""$kde_cv_path" 1>&6
+      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6
       MEINPROC=$kde_cv_path
 
    fi
 
-      
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde2/share /opt/kde/share $prefix/share"
+
+        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: 7012: $i/$j" >&5
+    echo "configure: 29224: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       KDE_XSL_STYLESHEET=$i
@@ -7025,35 +29238,45 @@ done
         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 "configure: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+               { { 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.
-                          " 1>&2; exit 1; }
+                          " >&2;}
+   { (exit 1); exit 1; }; }
            fi
            kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
         else
            kde_libs_prefix='$(prefix)'
            kde_libs_htmldir='$(kde_htmldir)'
         fi
-        
-        
 
 
 
 
-  
 
 
 
@@ -7068,6 +29291,17 @@ done
 
 
 
+
+
+
+
+
+
+
+kdeinitdir='$(kde_moduledir)'
+
+
+
 if test "$kde_qtver" = 1; then
   kde_minidir="$kde_icondir/mini"
 else
@@ -7076,47 +29310,75 @@ else
   kde_minidir="/dev/null"
 fi
 
-  
-   
-   
-   
 
-if test $kde_qtver = 2; then
-   LIB_KDECORE='-lkdecore'
-   
-   LIB_KDEUI='-lkdeui'
-   
-   LIB_KFORMULA='-lkformula'
-   
-   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_KWRITE='-lkwrite'
-   
-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)'
-   
+
+
+
+
+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
 
 
@@ -7126,74 +29388,73 @@ CPPFLAGS="$CPPFLAGS -DQT_NO_ASCII_CAST -DQT_NO_COMPAT -DQT_CLEAN_NAMESPACE -Wall
 
 ac_use_static="NO"
 
-echo $ac_n "checking whether to use static linking""... $ac_c" 1>&6
-echo "configure:7131: checking whether to use static linking" >&5
+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
-
+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 "$ac_t""$USE_STATIC_LINKING" 1>&6
+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
-
+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
+   ac_static_sword="$ac_use_static"
 
+fi;
 
-echo $ac_n "checking for Sword library files""... $ac_c" 1>&6
-echo "configure:7177: checking for Sword library files" >&5
+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 "$ac_static_sword" = "YES"; then
+if test "x$ac_static_sword" = "xYES"; then
 	SEARCH_LIBS="libsword.a";
 else
-	SEARCH_LIBS="libsword.a libsword.so";
+	SEARCH_LIBS="libsword.so libsword.a";
 fi
 
 
-if eval "test \"`echo '$''{'ac_cv_sword_libdir'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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: 7197: $i/$j" >&5
+    echo "configure: 29457: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ac_cv_sword_libdir=$i
@@ -7205,11 +29466,13 @@ done
 fi
 
 
-if test "$ac_cv_sword_libdir" = "NO"; then
-  { echo "configure: error: SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!" 1>&2; exit 1; };
+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 "$ac_static_sword" = "YES"; then
+if test "x$ac_static_sword" = "xYES"; then
 	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
 else
 	LIB_SWORD="-lsword";
@@ -7219,29 +29482,28 @@ fi
 
 all_libraries="$all_libraries -L$ac_cv_sword_libdir"
 
-if test "$ac_static_sword" = "YES"; then
+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 "$ac_t""$MESSAGE" 1>&6
-
-
+echo "$as_me:$LINENO: result: $MESSAGE" >&5
+echo "${ECHO_T}$MESSAGE" >&6
 
-echo $ac_n "checking for Sword include files""... $ac_c" 1>&6
-echo "configure:7233: checking for Sword include files" >&5
+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 eval "test \"`echo '$''{'ac_cv_sword_incdir'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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: 7245: $i/$j" >&5
+    echo "configure: 29506: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ac_cv_sword_incdir=$i
@@ -7253,34 +29515,40 @@ done
 fi
 
 
-if test "$ac_cv_sword_incdir" = "NO"; then
-	{ echo "configure: error: The Sword include file files were not found.
+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 !
-" 1>&2; exit 1; }
+" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 SWORD_INCLUDES="-I$ac_cv_sword_incdir"
 
 all_includes="$all_includes -I$ac_cv_sword_incdir"
 
-echo "$ac_t""$ac_cv_sword_incdir" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_sword_incdir" >&5
+echo "${ECHO_T}$ac_cv_sword_incdir" >&6
 
 
 
-echo $ac_n "checking if you have Sword 1.5.3 or later""... $ac_c" 1>&6
-echo "configure:7272: checking if you have Sword 1.5.3 or later" >&5
 
-if eval "test \"`echo '$''{'ac_cv_installed_sword_version'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+
+ ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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'
 
@@ -7300,38 +29568,34 @@ LIBRARY_PATH=
 export LIBRARY_PATH
 
 cat > conftest.$ac_ext <<EOF
-#include <iostream.h>
+#include <iostream>
 #include <swversion.h>
 
+#ifdef SWORD_NAMESPACE_START
+using namespace sword;
+#endif
+
 int main(int argc, char* argv) {
-	if (argc != 2) {
-		cout << SWVersion::currentVersion << endl;
-	}
-	else if (argc == 2) 
-	{
-		if (SWVersion(&argv[1]) < SWVersion::currentVersion || SWVersion(&argv[1]) == SWVersion::currentVersion)
-		{
-			cout << 0 << endl;
-			return 0;
-		}
-		else	
-		{
-			cout << 1 << endl;
-			return 1; //version not recent enough
-		}
-	}
+	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 configure:7329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+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`
-		eval sword_test_returncode=`./conftest 1.5.3 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
 
@@ -7345,90 +29609,230 @@ export LD_LIBRARY_PATH
 LIBRARY_PATH="$ac_LIBRARY_PATH"
 export LIBRARY_PATH
 ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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"
 
-right_version="ok";
-if test $sword_test_returncode = 1;  then
-	right_version="wrong version";
+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;
-	
-echo "$ac_t""$ac_cv_installed_sword_version" 1>&6
-if test $right_version != "ok"; then
-        { echo "configure: error: Your Sword installation is not recent enoought! Please
-upgrade to version 1.5.3!" 1>&2; exit 1; };
+
+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
 
-echo $ac_n "checking for the used Linux distribution""... $ac_c" 1>&6
-echo "configure:7374: checking for the used Linux distribution" >&5
 
 # 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
+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
+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
+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
-
+fi;
 
 if test "$ac_distribution" != "auto"; then
 	DISTRIBUTION=$ac_distribution
 fi
 
 if test "$ac_distribution" = "auto"; then
-if eval "test \"`echo '$''{'DISTRIBUTION'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
@@ -7447,12 +29851,12 @@ if test "$ac_distribution_version" != "auto"; then
 	DISTRIBUTION_VERSION=$ac_distribution_version
 fi
 if test "$ac_distribution_version" = "auto"; then
-if eval "test \"`echo '$''{'DISTRIBUTION_VERSION'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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 = //'`;	
+	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
@@ -7470,16 +29874,16 @@ if test "$ac_rpm_prefix" != "auto"; then
 	RPM_PREFIX=$ac_rpm_prefix
 fi
 if test "$ac_rpm_prefix" = "auto"; then
-if eval "test \"`echo '$''{'RPM_PREFIX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${RPM_PREFIX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
 if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde2"
+	RPM_PREFIX="/opt/kde3"
 elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_PREFIX="/usr"	
+	RPM_PREFIX="/usr"
 elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_PREFIX="/usr"		
+	RPM_PREFIX="/usr"
 elif test "$DISTRIBUTION" = "Debian"; then
 	RPM_PREFIX="/usr"
 fi
@@ -7492,10 +29896,10 @@ if test "$ac_rpm_group" != "auto"; then
 	RPM_GROUP=$ac_rpm_group
 fi
 if test "$ac_rpm_prefix" = "auto"; then
-if eval "test \"`echo '$''{'RPM_GROUP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
@@ -7511,16 +29915,18 @@ fi
 fi
 
 if test -n "$DISTRIBUTION" && test "$DISTRIBUTION" != "unknown"; then
-	cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
 #define DISTRIBUTION ${DISTRIBUTION}
-EOF
+_ACEOF
 
 fi
 
 if test -n "$DISTRIBUTION_VERSION"  && test "$DISTRIBUTION_VERSION" != "unknown"; then
-	cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
 #define DISTRIBUTION_VERSION ${DISTRIBUTION_VERSION}
-EOF
+_ACEOF
 
 fi
 
@@ -7529,17 +29935,32 @@ fi
 
 
 
-echo "$ac_t""$DISTRIBUTION $DISTRIBUTION_VERSION" 1>&6
+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
+
 
-echo $ac_n "checking for RPM installation prefix""... $ac_c" 1>&6
-echo "configure:7536: checking for RPM installation prefix" >&5
-echo "$ac_t""$RPM_PREFIX" 1>&6
 
-echo $ac_n "checking for the correct RPM group""... $ac_c" 1>&6
-echo "configure:7540: checking for the correct RPM group" >&5
-echo "$ac_t""$RPM_GROUP" 1>&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"
 
 
 
@@ -7554,15 +29975,16 @@ if test ! -s $srcdir/subdirs; then
   done
 fi
 
+ac_topsubdirs=
 if test -s $srcdir/inst-apps; then
   ac_topsubdirs="`cat $srcdir/inst-apps`"
-else
+elif test -s $srcdir/subdirs; then
   ac_topsubdirs="`cat $srcdir/subdirs`"
 fi
 
 for i in $ac_topsubdirs; do
-  echo $ac_n "checking if $i should be compiled""... $ac_c" 1>&6
-echo "configure:7566: checking if $i should be compiled" >&5
+  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
@@ -7573,561 +29995,1601 @@ echo "configure:7566: checking if $i should be compiled" >&5
   else
     install_it="no"
   fi
-  echo "$ac_t""$install_it" 1>&6
+  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
 
 
 
-trap '' 1 2 15
-cat > confcache <<\EOF
+          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.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# 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.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `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 \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (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
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    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
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# 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[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 DEFS=-DHAVE_CONFIG_H
 
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
+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
 
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
+: ${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.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+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
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
+  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
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "\
-./Makefile \
-admin/Makefile \
-bibletime/Makefile \
-bibletime/backend/Makefile \
-bibletime/frontend/Makefile \
-bibletime/frontend/groupmanager/Makefile \
-bibletime/frontend/keychooser/Makefile \
-bibletime/frontend/presenters/Makefile \
-bibletime/frontend/searchdialog/Makefile \
-bibletime/frontend/thirdparty/Makefile \
-bibletime/frontend/thirdparty/qt3stuff/Makefile \
-bibletime/pics/Makefile \
-bibletime/pics/highcolor/Makefile \
-bibletime/pics/highcolor/16x16/Makefile \
-bibletime/pics/highcolor/22x22/Makefile \
-bibletime/pics/highcolor/32x32/Makefile \
-bibletime/pics/highcolor/48x48/Makefile \
-bibletime/pics/lowcolor/Makefile \
-bibletime/pics/lowcolor/16x16/Makefile \
-bibletime/pics/lowcolor/22x22/Makefile \
-bibletime/pics/lowcolor/32x32/Makefile \
-bibletime/printing/Makefile \
-bibletime/printing/style-data/Makefile \
-bibletime/util/Makefile \
-bibletime/xml/Makefile \
-NEWS README INSTALL TODO bibletime.lsm bibletime.spec bibletime.desktop \
- config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CONF_FILES@%$CONF_FILES%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@USE_EXCEPTIONS@%$USE_EXCEPTIONS%g
-s%@USE_RTTI@%$USE_RTTI%g
-s%@CXXCPP@%$CXXCPP%g
-s%@NOOPT_CXXFLAGS@%$NOOPT_CXXFLAGS%g
-s%@REPO@%$REPO%g
-s%@NOREPO@%$NOREPO%g
-s%@KDE_USE_FINAL_TRUE@%$KDE_USE_FINAL_TRUE%g
-s%@KDE_USE_FINAL_FALSE@%$KDE_USE_FINAL_FALSE%g
-s%@KDE_USE_CLOSURE_TRUE@%$KDE_USE_CLOSURE_TRUE%g
-s%@KDE_USE_CLOSURE_FALSE@%$KDE_USE_CLOSURE_FALSE%g
-s%@KDE_CXXFLAGS@%$KDE_CXXFLAGS%g
-s%@OBJEXT@%$OBJEXT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@LN_S@%$LN_S%g
-s%@RANLIB@%$RANLIB%g
-s%@STRIP@%$STRIP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@KDE_PLUGIN@%$KDE_PLUGIN%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@MSGFMT@%$MSGFMT%g
-s%@GMSGFMT@%$GMSGFMT%g
-s%@XGETTEXT@%$XGETTEXT%g
-s%@CPP@%$CPP%g
-s%@LIBUTIL@%$LIBUTIL%g
-s%@LIBCOMPAT@%$LIBCOMPAT%g
-s%@LIBCRYPT@%$LIBCRYPT%g
-s%@LIBSOCKET@%$LIBSOCKET%g
-s%@LIBRESOLV@%$LIBRESOLV%g
-s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@LIBUCB@%$LIBUCB%g
-s%@LIBDL@%$LIBDL%g
-s%@X_INCLUDES@%$X_INCLUDES%g
-s%@X_LDFLAGS@%$X_LDFLAGS%g
-s%@x_libraries@%$x_libraries%g
-s%@x_includes@%$x_includes%g
-s%@LIBSM@%$LIBSM%g
-s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-s%@LIB_X11@%$LIB_X11%g
-s%@LIBXINERAMA@%$LIBXINERAMA%g
-s%@USER_INCLUDES@%$USER_INCLUDES%g
-s%@USER_LDFLAGS@%$USER_LDFLAGS%g
-s%@LIBZ@%$LIBZ%g
-s%@LIBPNG@%$LIBPNG%g
-s%@LIBJPEG@%$LIBJPEG%g
-s%@qt_libraries@%$qt_libraries%g
-s%@qt_includes@%$qt_includes%g
-s%@QT_INCLUDES@%$QT_INCLUDES%g
-s%@QT_LDFLAGS@%$QT_LDFLAGS%g
-s%@MOC@%$MOC%g
-s%@UIC@%$UIC%g
-s%@LIB_QT@%$LIB_QT%g
-s%@KDE_EXTRA_RPATH@%$KDE_EXTRA_RPATH%g
-s%@KDE_RPATH@%$KDE_RPATH%g
-s%@kde_libraries@%$kde_libraries%g
-s%@kde_includes@%$kde_includes%g
-s%@KDE_LDFLAGS@%$KDE_LDFLAGS%g
-s%@KDE_INCLUDES@%$KDE_INCLUDES%g
-s%@all_includes@%$all_includes%g
-s%@all_libraries@%$all_libraries%g
-s%@AUTODIRS@%$AUTODIRS%g
-s%@DCOPIDL@%$DCOPIDL%g
-s%@DCOPIDL2CPP@%$DCOPIDL2CPP%g
-s%@DCOP_DEPENDENCIES@%$DCOP_DEPENDENCIES%g
-s%@MCOPIDL@%$MCOPIDL%g
-s%@ARTSCCONFIG@%$ARTSCCONFIG%g
-s%@KDECONFIG@%$KDECONFIG%g
-s%@MEINPROC@%$MEINPROC%g
-s%@KDE_XSL_STYLESHEET@%$KDE_XSL_STYLESHEET%g
-s%@kde_libs_prefix@%$kde_libs_prefix%g
-s%@kde_libs_htmldir@%$kde_libs_htmldir%g
-s%@kde_htmldir@%$kde_htmldir%g
-s%@kde_appsdir@%$kde_appsdir%g
-s%@kde_icondir@%$kde_icondir%g
-s%@kde_sounddir@%$kde_sounddir%g
-s%@kde_datadir@%$kde_datadir%g
-s%@kde_locale@%$kde_locale%g
-s%@kde_confdir@%$kde_confdir%g
-s%@kde_mimedir@%$kde_mimedir%g
-s%@kde_wallpaperdir@%$kde_wallpaperdir%g
-s%@kde_bindir@%$kde_bindir%g
-s%@kde_templatesdir@%$kde_templatesdir%g
-s%@kde_servicesdir@%$kde_servicesdir%g
-s%@kde_servicetypesdir@%$kde_servicetypesdir%g
-s%@kde_moduledir@%$kde_moduledir%g
-s%@LIB_KDECORE@%$LIB_KDECORE%g
-s%@LIB_KDEUI@%$LIB_KDEUI%g
-s%@LIB_KFORMULA@%$LIB_KFORMULA%g
-s%@LIB_KIO@%$LIB_KIO%g
-s%@LIB_KSYCOCA@%$LIB_KSYCOCA%g
-s%@LIB_SMB@%$LIB_SMB%g
-s%@LIB_KFILE@%$LIB_KFILE%g
-s%@LIB_KAB@%$LIB_KAB%g
-s%@LIB_KHTML@%$LIB_KHTML%g
-s%@LIB_KSPELL@%$LIB_KSPELL%g
-s%@LIB_KPARTS@%$LIB_KPARTS%g
-s%@LIB_KWRITE@%$LIB_KWRITE%g
-s%@LIB_KFM@%$LIB_KFM%g
-s%@BT_LDFLAGS@%$BT_LDFLAGS%g
-s%@SWORD_LIBRARY_PATH@%$SWORD_LIBRARY_PATH%g
-s%@LIB_SWORD@%$LIB_SWORD%g
-s%@SWORD_INCLUDES@%$SWORD_INCLUDES%g
-s%@DISTRIBUTION@%$DISTRIBUTION%g
-s%@DISTRIBUTION_VERSION@%$DISTRIBUTION_VERSION%g
-s%@RPM_PREFIX@%$RPM_PREFIX%g
-s%@RPM_GROUP@%$RPM_GROUP%g
-s%@TOPSUBDIRS@%$TOPSUBDIRS%g
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
 
-CEOF
-EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# 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_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # 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" conftest.subs > conftest.s$ac_file
+# 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
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+    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
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
+  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
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+    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
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
 fi
-EOF
 
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"\
-./Makefile \
-admin/Makefile \
-bibletime/Makefile \
-bibletime/backend/Makefile \
-bibletime/frontend/Makefile \
-bibletime/frontend/groupmanager/Makefile \
-bibletime/frontend/keychooser/Makefile \
-bibletime/frontend/presenters/Makefile \
-bibletime/frontend/searchdialog/Makefile \
-bibletime/frontend/thirdparty/Makefile \
-bibletime/frontend/thirdparty/qt3stuff/Makefile \
-bibletime/pics/Makefile \
-bibletime/pics/highcolor/Makefile \
-bibletime/pics/highcolor/16x16/Makefile \
-bibletime/pics/highcolor/22x22/Makefile \
-bibletime/pics/highcolor/32x32/Makefile \
-bibletime/pics/highcolor/48x48/Makefile \
-bibletime/pics/lowcolor/Makefile \
-bibletime/pics/lowcolor/16x16/Makefile \
-bibletime/pics/lowcolor/22x22/Makefile \
-bibletime/pics/lowcolor/32x32/Makefile \
-bibletime/printing/Makefile \
-bibletime/printing/style-data/Makefile \
-bibletime/util/Makefile \
-bibletime/xml/Makefile \
-NEWS README INSTALL TODO bibletime.lsm bibletime.spec bibletime.desktop \
-"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+_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
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+# 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
+}
 
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
+# 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"
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+_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
 
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-"") ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  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=.
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
+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
 
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
+  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='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
+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='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+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
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.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
 
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  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.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
+  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.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
+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 :
+while grep . conftest.undefs >/dev/null
 do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+  # 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 conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
+  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.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
+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
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
+    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
-    rm -f $ac_file
-    mv conftest.h $ac_file
+  else
+    cat $tmp/config.h
+    rm -f $tmp/config.h
   fi
-fi; done
+# 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
 
-EOF
-cat >> $CONFIG_STATUS <<EOF
+#
+# 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
 
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+cat >>$CONFIG_STATUS <<\_ACEOF
 
-exit 0
-EOF
-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 
+{ (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
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
+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
new file mode 100644
index 0000000..1083352
--- /dev/null
+++ b/configure.files
@@ -0,0 +1 @@
+configure.in.in
diff --git a/configure.in b/configure.in
index e2663c4..a64c322 100644
--- a/configure.in
+++ b/configure.in
@@ -1,25 +1,6 @@
-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 Licensednl    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.
+dnl =======================================================
+dnl FILE: configure.in.in
+dnl =======================================================
 
 AC_INIT(acinclude.m4) dnl a source file from your sub dir
 
@@ -35,12 +16,13 @@ dnl Perform program name transformation
 AC_ARG_PROGRAM
 
 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(bibletime, 1.1) dnl searches for some needed programs
+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
+AM_CONFIG_HEADER([config.h]) dnl at the distribution this done
 
 dnl Checks for programs.
 AC_CHECK_COMPILERS
@@ -62,106 +44,57 @@ 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.3, [$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
-dnl AC_OUTPUT(NEWS README INSTALL TODO bibletime.lsm bibletime.spec bibletime.desktop)
-
-dnl echo "Executing perl am_edit ..."
-dnl perl am_edit
-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 Licensednl    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(bibletime-doc, 1.1) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-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
-
-dnl Chek for the used distribution
-AC_CHECK_DISTRIBUTION
-
-dnl add here all your Makefiles. They are created by configure
-dnl AC_OUTPUT(README INSTALL bibletime-doc.spec)
+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_OUTPUT( \
-./Makefile \
-admin/Makefile \
-bibletime/Makefile \
-bibletime/backend/Makefile \
-bibletime/frontend/Makefile \
-bibletime/frontend/groupmanager/Makefile \
-bibletime/frontend/keychooser/Makefile \
-bibletime/frontend/presenters/Makefile \
-bibletime/frontend/searchdialog/Makefile \
-bibletime/frontend/thirdparty/Makefile \
-bibletime/frontend/thirdparty/qt3stuff/Makefile \
-bibletime/pics/Makefile \
-bibletime/pics/highcolor/Makefile \
-bibletime/pics/highcolor/16x16/Makefile \
-bibletime/pics/highcolor/22x22/Makefile \
-bibletime/pics/highcolor/32x32/Makefile \
-bibletime/pics/highcolor/48x48/Makefile \
-bibletime/pics/lowcolor/Makefile \
-bibletime/pics/lowcolor/16x16/Makefile \
-bibletime/pics/lowcolor/22x22/Makefile \
-bibletime/pics/lowcolor/32x32/Makefile \
-bibletime/printing/Makefile \
-bibletime/printing/style-data/Makefile \
-bibletime/util/Makefile \
-bibletime/xml/Makefile \
-NEWS README INSTALL TODO bibletime.lsm bibletime.spec bibletime.desktop \
-README INSTALL bibletime-doc.spec \
-)
+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
index 22e3839..2f067b9 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,26 +1,3 @@
-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 Licensednl    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
@@ -35,12 +12,13 @@ dnl Perform program name transformation
 AC_ARG_PROGRAM
 
 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(bibletime, 1.1) dnl searches for some needed programs
+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
+AM_CONFIG_HEADER([config.h]) dnl at the distribution this done
 
 dnl Checks for programs.
 AC_CHECK_COMPILERS
@@ -62,13 +40,17 @@ 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.3, [$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
-dnl AC_OUTPUT(NEWS README INSTALL TODO bibletime.lsm bibletime.spec bibletime.desktop)
 
-dnl echo "Executing perl am_edit ..."
-dnl perl am_edit
+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
new file mode 100644
index 0000000..e0134b8
--- /dev/null
+++ b/debian/Makefile.am
@@ -0,0 +1,11 @@
+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/changelog b/debian/changelog
index df0ebe4..f1261c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,40 +1,48 @@
-bibletime (1.1-4) unstable; urgency=high
+bibletime (1.4-1) unstable; urgency=low
 
-  * build depend on sword 1.5.3-3
+  * New upstream version
+  * depend on sword 1.5.7
 
- -- Daniel Glassey <wdg@debian.org>  Thu, 18 Apr 2002 09:35:13 +0100
+ -- Daniel Glassey <wdg@debian.org>  Thu,  8 Jan 2004 11:50:46 +0000
 
-bibletime (1.1-3) unstable; urgency=low
+bibletime (1.3-3) unstable; urgency=low
 
-  * fixes to compile with gcc3, Closes: #143212
-  * fixes to get rid of some compiler warnings too
-  
- -- Daniel Glassey <wdg@debian.org>  Wed, 17 Apr 2002 23:48:16 +0100
+  * Fix copyright file
+  * Acknowledge NMU, thanks, Closes: #187033
 
-bibletime (1.1-2) unstable; urgency=high
+ -- Daniel Glassey <wdg@debian.org>  Tue, 16 Dec 2003 22:40:52 +0000
 
-  * integrate docs into this package since there isn't time to
-     get a new package in
-  * fonts seem ok in optionsdialog now, Closes: #139703
-  * verses wrap ok now, tested WEB 1Tim5:18, Closes: #140108
+bibletime (1.3-2) unstable; urgency=medium
 
- -- Daniel Glassey <wdg@debian.org>  Mon, 15 Apr 2002 09:20:13 +0100
+  * Build Depend on sword >= 1.5.6-9
+  * Time to upload to unstable
+  * Standards version now 3.6.1.0
 
-bibletime (1.1-1) unstable; urgency=low
+ -- Daniel Glassey <wdg@debian.org>  Wed, 12 Nov 2003 17:59:31 +0000
 
-  * New upstream release
+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>  Mon,  8 Apr 2002 20:36:07 +0100
+ -- Daniel Glassey <wdg@debian.org>  Thu, 28 Aug 2003 15:29:45 +0100
 
-bibletime (1.0.99b-2) unstable; urgency=low
+bibletime (1.2.99-2) unstable; urgency=low
 
-  * Depend on bibletime-doc, required documentation
+  * rebuild against not quite released sword1.5.5.99-3
 
- -- Daniel Glassey <wdg@debian.org>  Sat,  6 Apr 2002 18:45:50 +0100
+ -- 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 beta release
+  * New upstream release
 
  -- Daniel Glassey <wdg@debian.org>  Tue,  2 Apr 2002 21:33:55 +0100
 
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index 5e390cd..0000000
--- a/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/kde2/bt-printing
diff --git a/debian/control b/debian/control
index f2ecea7..cef578e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,19 @@
 Source: bibletime
-Section: x11
-Build-Depends: debhelper, kdelibs-dev (>= 2.2.2-8), libsword-dev (>=1.5.3-3)
+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.5.6.0
+Standards-Version: 3.6.1.0
 
 Package: bibletime
 Architecture: any
-Section: x11
+Section: kde
 Depends: ${shlibs:Depends}
 Recommends: sword-text, sword-dict, sword-comm
 Provides: sword-frontend
-Conflicts: bibletime-doc
 Description: A bible study tool for KDE
- BibleTime 1.1 is a free and easy to use bible study tool for UNIX systems. 
- It requires a working KDE2 environment and SWORD 1.5.3 or later. 
- BibleTime provides easy handling of digitized texts (Bibles, commentaries 
- and lexicons) and powerful features to work with these texts (search in 
+ 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
index 7642d5b..ea5a23c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,22 @@
-This package was debianized by Daniel Glassey <danglassey@yahoo.com> on
+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 <bt-devel@crosswire.org>
+Upstream Author(s): Bibletime team <info@bibletime.info>
 
-Copyright:
-   GNU GPL .. see /usr/share/common-licenses/GPL
+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/docs b/debian/docs
index 5502ed8..50bd824 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 NEWS
 README
-TODO
diff --git a/debian/menu b/debian/menu
index 8977bdb..153b74b 100644
--- a/debian/menu
+++ b/debian/menu
@@ -2,7 +2,7 @@
     needs=X11\
     hints="KDE"\
 	kderemove="1"\
-    section=Apps/Text\
+    section=Apps/Tools\
     title="BibleTime"\
     icon="/usr/share/pixmaps/bibletime.xpm"\
     command=/usr/bin/bibletime
diff --git a/debian/rules b/debian/rules
index 3f83528..606772b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ configure-stamp:
 	#automake
 	#perl am_edit
 	$(COMPILER_FLAGS) ./configure $(configkde) --disable-maintainer-mode
-	cd bibletime-doc && ./configure $(configkde) --disable-maintainer-mode
 	touch configure-stamp
 
 build: configure build-stamp
@@ -33,7 +32,6 @@ build-stamp:
 
 	# Add here commands to compile the package.
 	$(COMPILER_FLAGS) $(MAKE)
-	cd bibletime-doc && $(MAKE)
 
 	touch build-stamp
 
@@ -47,14 +45,12 @@ clean:
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) distclean
 	-$(MAKE) clean
-	-cd bibletime-doc && $(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
-	-cd bibletime-doc && rm subdirs configure.files config.cache config.log config.status
 
 	dh_clean
 
@@ -67,7 +63,6 @@ install: build
 	# 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
-	cd bibletime-doc && $(MAKE) install DESTDIR=`pwd`/../debian/tmp
 
 	# Install the pixmap for the debian menu item.
 	install -p -d -o root -g root -m 755 \
@@ -83,7 +78,7 @@ install: build
 
 	#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/printing/*
 	chmod 644 debian/tmp/usr/share/apps/bibletime/bibletimeui.rc
 
 # Build architecture-independent files here.
diff --git a/debian/undocumented b/debian/undocumented
deleted file mode 100644
index 5d2691d..0000000
--- a/debian/undocumented
+++ /dev/null
@@ -1 +0,0 @@
-bibletime.1
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 0000000..dd9b133
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,10 @@
+# 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
new file mode 100644
index 0000000..35b3e64
--- /dev/null
+++ b/docs/Makefile.in
@@ -0,0 +1,679 @@
+# 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
new file mode 100644
index 0000000..7e4ac2a
--- /dev/null
+++ b/docs/handbook/Makefile.am
@@ -0,0 +1,15 @@
+# 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
new file mode 100644
index 0000000..60a9d09
--- /dev/null
+++ b/docs/handbook/Makefile.in
@@ -0,0 +1,657 @@
+# 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
new file mode 100644
index 0000000..238a42b
--- /dev/null
+++ b/docs/handbook/html/Makefile.am
@@ -0,0 +1,24 @@
+# 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
new file mode 100644
index 0000000..84b95f3
--- /dev/null
+++ b/docs/handbook/html/Makefile.in
@@ -0,0 +1,516 @@
+# 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
new file mode 100644
index 0000000..02ae367
--- /dev/null
+++ b/docs/handbook/html/configure.png
diff --git a/docs/handbook/html/contents.png b/docs/handbook/html/contents.png
new file mode 100644
index 0000000..b9987fb
--- /dev/null
+++ b/docs/handbook/html/contents.png
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-delete-verse.png b/docs/handbook/html/editdelete.png
index fb04ace..fb04ace 100644
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-delete-verse.png
+++ b/docs/handbook/html/editdelete.png
diff --git a/docs/handbook/html/exit.png b/docs/handbook/html/exit.png
new file mode 100644
index 0000000..4877f19
--- /dev/null
+++ b/docs/handbook/html/exit.png
diff --git a/docs/handbook/html/fileclose.png b/docs/handbook/html/fileclose.png
new file mode 100644
index 0000000..2b13d4a
--- /dev/null
+++ b/docs/handbook/html/fileclose.png
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-print.png b/docs/handbook/html/fileprint.png
index 669b738..669b738 100644
--- a/bibletime-doc/docs/de/handbook/html/hdbk-bars-toolbar-action-print.png
+++ b/docs/handbook/html/fileprint.png
diff --git a/docs/handbook/html/find.png b/docs/handbook/html/find.png
new file mode 100644
index 0000000..e752f04
--- /dev/null
+++ b/docs/handbook/html/find.png
diff --git a/docs/handbook/html/go.png b/docs/handbook/html/go.png
new file mode 100644
index 0000000..0d92fab
--- /dev/null
+++ b/docs/handbook/html/go.png
diff --git a/docs/handbook/html/hdbk-bars-menubar-Help.html b/docs/handbook/html/hdbk-bars-menubar-Help.html
new file mode 100644
index 0000000..1ab2752
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars-menubar-Help.html
@@ -0,0 +1,22 @@
+<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
new file mode 100644
index 0000000..0fb41f0
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars-menubar-Window.html
@@ -0,0 +1,11 @@
+<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
new file mode 100644
index 0000000..079fd2f
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars-menubar-file.html
@@ -0,0 +1,7 @@
+<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
new file mode 100644
index 0000000..b028d28
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars-menubar-mainindex.html
@@ -0,0 +1,19 @@
+<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
new file mode 100644
index 0000000..68b7b5f
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars-menubar-settings.html
@@ -0,0 +1,7 @@
+<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
new file mode 100644
index 0000000..c6e74fa
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars-menubar-view.html
@@ -0,0 +1,11 @@
+<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
new file mode 100644
index 0000000..b5c01d4
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars-menubar.html
@@ -0,0 +1,67 @@
+<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/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-Configtoolbar.png b/docs/handbook/html/hdbk-bars-toolbar-Configtoolbar.png
index 6b9f33b..6b9f33b 100644
--- a/bibletime-doc/docs/en/handbook/html/hdbk-bars-toolbar-Configtoolbar.png
+++ b/docs/handbook/html/hdbk-bars-toolbar-Configtoolbar.png
diff --git a/docs/handbook/html/hdbk-bars-toolbar-action.html b/docs/handbook/html/hdbk-bars-toolbar-action.html
new file mode 100644
index 0000000..c4f64a6
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars-toolbar-action.html
@@ -0,0 +1,133 @@
+<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
new file mode 100644
index 0000000..b96da15
--- /dev/null
+++ b/docs/handbook/html/hdbk-bars.html
@@ -0,0 +1,4 @@
+<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
new file mode 100644
index 0000000..52691c3
--- /dev/null
+++ b/docs/handbook/html/hdbk-conf-optdialog-color.png
diff --git a/docs/handbook/html/hdbk-conf-optdialog-fonts.png b/docs/handbook/html/hdbk-conf-optdialog-fonts.png
new file mode 100644
index 0000000..55ea3c8
--- /dev/null
+++ b/docs/handbook/html/hdbk-conf-optdialog-fonts.png
diff --git a/docs/handbook/html/hdbk-conf-optdialog-start.png b/docs/handbook/html/hdbk-conf-optdialog-start.png
new file mode 100644
index 0000000..3e4a5b1
--- /dev/null
+++ b/docs/handbook/html/hdbk-conf-optdialog-start.png
diff --git a/docs/handbook/html/hdbk-conf-optdialog-sword.png b/docs/handbook/html/hdbk-conf-optdialog-sword.png
new file mode 100644
index 0000000..3501bfe
--- /dev/null
+++ b/docs/handbook/html/hdbk-conf-optdialog-sword.png
diff --git a/docs/handbook/html/hdbk-config-bt-Accelerators.html b/docs/handbook/html/hdbk-config-bt-Accelerators.html
new file mode 100644
index 0000000..b28de9d
--- /dev/null
+++ b/docs/handbook/html/hdbk-config-bt-Accelerators.html
@@ -0,0 +1,4 @@
+<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
new file mode 100644
index 0000000..9d177b2
--- /dev/null
+++ b/docs/handbook/html/hdbk-config-bt-Colors.html
@@ -0,0 +1,3 @@
+<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
new file mode 100644
index 0000000..3024494
--- /dev/null
+++ b/docs/handbook/html/hdbk-config-bt-profiles.html
@@ -0,0 +1,6 @@
+<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
new file mode 100644
index 0000000..96ddc1b
--- /dev/null
+++ b/docs/handbook/html/hdbk-config-bt-sword.html
@@ -0,0 +1,12 @@
+<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
new file mode 100644
index 0000000..b1787ab
--- /dev/null
+++ b/docs/handbook/html/hdbk-config-bt.html
@@ -0,0 +1,56 @@
+<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/bibletime-doc/docs/en/handbook/html/hdbk-config-toolbar.png b/docs/handbook/html/hdbk-config-toolbar.png
index ab1f513..ab1f513 100644
--- a/bibletime-doc/docs/en/handbook/html/hdbk-config-toolbar.png
+++ b/docs/handbook/html/hdbk-config-toolbar.png
diff --git a/docs/handbook/html/hdbk-config.html b/docs/handbook/html/hdbk-config.html
new file mode 100644
index 0000000..b833278
--- /dev/null
+++ b/docs/handbook/html/hdbk-config.html
@@ -0,0 +1,8 @@
+<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/bibletime-doc/docs/en/handbook/html/hdbk-inst-sources-installmgr.png b/docs/handbook/html/hdbk-inst-sources-installmgr.png
index 11c577a..11c577a 100644
--- a/bibletime-doc/docs/en/handbook/html/hdbk-inst-sources-installmgr.png
+++ b/docs/handbook/html/hdbk-inst-sources-installmgr.png
diff --git a/docs/handbook/html/hdbk-intro-ToDo.html b/docs/handbook/html/hdbk-intro-ToDo.html
new file mode 100644
index 0000000..58f8210
--- /dev/null
+++ b/docs/handbook/html/hdbk-intro-ToDo.html
@@ -0,0 +1,11 @@
+<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
new file mode 100644
index 0000000..f0ec645
--- /dev/null
+++ b/docs/handbook/html/hdbk-intro-motivation.html
@@ -0,0 +1,14 @@
+<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
new file mode 100644
index 0000000..ba6313f
--- /dev/null
+++ b/docs/handbook/html/hdbk-intro.html
@@ -0,0 +1,50 @@
+<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
new file mode 100644
index 0000000..fd2e703
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-MDI-Window.html
@@ -0,0 +1,32 @@
+<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
new file mode 100644
index 0000000..32b4bb8
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-change-range.png
diff --git a/docs/handbook/html/hdbk-op-crch-dia-choose.png b/docs/handbook/html/hdbk-op-crch-dia-choose.png
new file mode 100644
index 0000000..9302589
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-crch-dia-choose.png
diff --git a/docs/handbook/html/hdbk-op-delete-verse.png b/docs/handbook/html/hdbk-op-delete-verse.png
new file mode 100644
index 0000000..fb04ace
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-delete-verse.png
diff --git a/docs/handbook/html/hdbk-op-module-select-1.png b/docs/handbook/html/hdbk-op-module-select-1.png
new file mode 100644
index 0000000..e05c597
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-module-select-1.png
diff --git a/docs/handbook/html/hdbk-op-module-select-2.png b/docs/handbook/html/hdbk-op-module-select-2.png
new file mode 100644
index 0000000..6bd281e
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-module-select-2.png
diff --git a/docs/handbook/html/hdbk-op-module-tree-1.png b/docs/handbook/html/hdbk-op-module-tree-1.png
new file mode 100644
index 0000000..f3ffac5
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-module-tree-1.png
diff --git a/docs/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png b/docs/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png
new file mode 100644
index 0000000..02369bd
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png
diff --git a/docs/handbook/html/hdbk-op-module-tree-select.html b/docs/handbook/html/hdbk-op-module-tree-select.html
new file mode 100644
index 0000000..d8e0b63
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-module-tree-select.html
@@ -0,0 +1,41 @@
+<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
new file mode 100644
index 0000000..0753f7d
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-output.html
@@ -0,0 +1,49 @@
+<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/bibletime-doc/docs/de/handbook/html/hdbk-op-pencil.png b/docs/handbook/html/hdbk-op-pencil.png
index 8e2f895..8e2f895 100644
--- a/bibletime-doc/docs/de/handbook/html/hdbk-op-pencil.png
+++ b/docs/handbook/html/hdbk-op-pencil.png
diff --git a/docs/handbook/html/hdbk-op-search-dialog-modsel.png b/docs/handbook/html/hdbk-op-search-dialog-modsel.png
new file mode 100644
index 0000000..49e3f77
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-search-dialog-modsel.png
diff --git a/docs/handbook/html/hdbk-op-search-dialog-options.png b/docs/handbook/html/hdbk-op-search-dialog-options.png
new file mode 100644
index 0000000..584ec44
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-search-dialog-options.png
diff --git a/docs/handbook/html/hdbk-op-search-dialog-range.png b/docs/handbook/html/hdbk-op-search-dialog-range.png
new file mode 100644
index 0000000..60b2e89
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-search-dialog-range.png
diff --git a/docs/handbook/html/hdbk-op-search-dialog-searchanal.png b/docs/handbook/html/hdbk-op-search-dialog-searchanal.png
new file mode 100644
index 0000000..8e9c339
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-search-dialog-searchanal.png
diff --git a/docs/handbook/html/hdbk-op-search-dialog-searchresult.png b/docs/handbook/html/hdbk-op-search-dialog-searchresult.png
new file mode 100644
index 0000000..7790c92
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-search-dialog-searchresult.png
diff --git a/bibletime-doc/docs/en/handbook/html/hdbk-op-search-dialog-searchtext.png b/docs/handbook/html/hdbk-op-search-dialog-searchtext.png
index 24a9464..24a9464 100644
--- a/bibletime-doc/docs/en/handbook/html/hdbk-op-search-dialog-searchtext.png
+++ b/docs/handbook/html/hdbk-op-search-dialog-searchtext.png
diff --git a/docs/handbook/html/hdbk-op-search-dialog-text-regexp.html b/docs/handbook/html/hdbk-op-search-dialog-text-regexp.html
new file mode 100644
index 0000000..80c3a05
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-search-dialog-text-regexp.html
@@ -0,0 +1,122 @@
+<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
new file mode 100644
index 0000000..0868416
--- /dev/null
+++ b/docs/handbook/html/hdbk-op-search.html
@@ -0,0 +1,99 @@
+<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
new file mode 100644
index 0000000..f82cea2
--- /dev/null
+++ b/docs/handbook/html/hdbk-op.html
@@ -0,0 +1,49 @@
+<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
new file mode 100644
index 0000000..6aa3cd1
--- /dev/null
+++ b/docs/handbook/html/hdbk-start-custom.html
@@ -0,0 +1,10 @@
+<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
new file mode 100644
index 0000000..b21c230
--- /dev/null
+++ b/docs/handbook/html/hdbk-start-screen-terms.png
diff --git a/docs/handbook/html/hdbk-start-screen.html b/docs/handbook/html/hdbk-start-screen.html
new file mode 100644
index 0000000..6e88d01
--- /dev/null
+++ b/docs/handbook/html/hdbk-start-screen.html
@@ -0,0 +1,4 @@
+<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
new file mode 100644
index 0000000..9f55c5e
--- /dev/null
+++ b/docs/handbook/html/hdbk-start-sequence-tips.png
diff --git a/docs/handbook/html/hdbk-start-sequence.html b/docs/handbook/html/hdbk-start-sequence.html
new file mode 100644
index 0000000..6a8be5a
--- /dev/null
+++ b/docs/handbook/html/hdbk-start-sequence.html
@@ -0,0 +1,13 @@
+<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
new file mode 100644
index 0000000..91f7a47
--- /dev/null
+++ b/docs/handbook/html/hdbk-term.html
@@ -0,0 +1,34 @@
+<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/bibletime/pics/highcolor/32x32/hi32-action-bt_bible.png b/docs/handbook/html/hi32-action-bt_bible.png
index 7422069..7422069 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_bible.png
+++ b/docs/handbook/html/hi32-action-bt_bible.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_bible_add.png b/docs/handbook/html/hi32-action-bt_bible_add.png
index 27f13ef..27f13ef 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_bible_add.png
+++ b/docs/handbook/html/hi32-action-bt_bible_add.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_book.png b/docs/handbook/html/hi32-action-bt_book.png
index 29af6eb..29af6eb 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_book.png
+++ b/docs/handbook/html/hi32-action-bt_book.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_book_add.png b/docs/handbook/html/hi32-action-bt_book_add.png
index 29348a8..29348a8 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_book_add.png
+++ b/docs/handbook/html/hi32-action-bt_book_add.png
diff --git a/docs/handbook/html/hi32-action-bt_cascade.png b/docs/handbook/html/hi32-action-bt_cascade.png
new file mode 100644
index 0000000..e3fe29e
--- /dev/null
+++ b/docs/handbook/html/hi32-action-bt_cascade.png
diff --git a/docs/handbook/html/hi32-action-bt_cascade_auto.png b/docs/handbook/html/hi32-action-bt_cascade_auto.png
new file mode 100644
index 0000000..991e3dd
--- /dev/null
+++ b/docs/handbook/html/hi32-action-bt_cascade_auto.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_commentary.png b/docs/handbook/html/hi32-action-bt_commentary.png
index 748f65b..748f65b 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_commentary.png
+++ b/docs/handbook/html/hi32-action-bt_commentary.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_commentary_add.png b/docs/handbook/html/hi32-action-bt_commentary_add.png
index 1f4b728..1f4b728 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_commentary_add.png
+++ b/docs/handbook/html/hi32-action-bt_commentary_add.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_displayconfig.png b/docs/handbook/html/hi32-action-bt_displayconfig.png
index 9a130b1..9a130b1 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_displayconfig.png
+++ b/docs/handbook/html/hi32-action-bt_displayconfig.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_lexicon.png b/docs/handbook/html/hi32-action-bt_lexicon.png
index 2133cc3..2133cc3 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_lexicon.png
+++ b/docs/handbook/html/hi32-action-bt_lexicon.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_lexicon_add.png b/docs/handbook/html/hi32-action-bt_lexicon_add.png
index 08a1456..08a1456 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_lexicon_add.png
+++ b/docs/handbook/html/hi32-action-bt_lexicon_add.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_startconfig.png b/docs/handbook/html/hi32-action-bt_startconfig.png
index 28f0aa6..28f0aa6 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_startconfig.png
+++ b/docs/handbook/html/hi32-action-bt_startconfig.png
diff --git a/bibletime/pics/highcolor/32x32/hi32-action-bt_swordconfig.png b/docs/handbook/html/hi32-action-bt_swordconfig.png
index 23fb4c5..23fb4c5 100644
--- a/bibletime/pics/highcolor/32x32/hi32-action-bt_swordconfig.png
+++ b/docs/handbook/html/hi32-action-bt_swordconfig.png
diff --git a/docs/handbook/html/hi32-action-bt_sync.png b/docs/handbook/html/hi32-action-bt_sync.png
new file mode 100644
index 0000000..e5e73b2
--- /dev/null
+++ b/docs/handbook/html/hi32-action-bt_sync.png
diff --git a/docs/handbook/html/hi32-action-bt_tile.png b/docs/handbook/html/hi32-action-bt_tile.png
new file mode 100644
index 0000000..eb43048
--- /dev/null
+++ b/docs/handbook/html/hi32-action-bt_tile.png
diff --git a/docs/handbook/html/hi32-action-bt_tile_auto.png b/docs/handbook/html/hi32-action-bt_tile_auto.png
new file mode 100644
index 0000000..28d9f3b
--- /dev/null
+++ b/docs/handbook/html/hi32-action-bt_tile_auto.png
diff --git a/docs/handbook/html/hi32-app-bibletime.png b/docs/handbook/html/hi32-app-bibletime.png
new file mode 100644
index 0000000..6d3c54e
--- /dev/null
+++ b/docs/handbook/html/hi32-app-bibletime.png
diff --git a/docs/handbook/html/index.html b/docs/handbook/html/index.html
new file mode 100644
index 0000000..d662020
--- /dev/null
+++ b/docs/handbook/html/index.html
@@ -0,0 +1,20 @@
+<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
new file mode 100644
index 0000000..b123250
--- /dev/null
+++ b/docs/handbook/html/kcmfontinst.png
diff --git a/docs/handbook/html/key_bindings.png b/docs/handbook/html/key_bindings.png
new file mode 100644
index 0000000..49bf5f6
--- /dev/null
+++ b/docs/handbook/html/key_bindings.png
diff --git a/docs/handbook/html/ktip.png b/docs/handbook/html/ktip.png
new file mode 100644
index 0000000..4b38d5d
--- /dev/null
+++ b/docs/handbook/html/ktip.png
diff --git a/bibletime-doc/docs/de/handbook/html/hdbk_op_pencil.png b/docs/handbook/html/pencil.png
index 8e2f895..8e2f895 100644
--- a/bibletime-doc/docs/de/handbook/html/hdbk_op_pencil.png
+++ b/docs/handbook/html/pencil.png
diff --git a/docs/handbook/html/queue.png b/docs/handbook/html/queue.png
new file mode 100644
index 0000000..96745cd
--- /dev/null
+++ b/docs/handbook/html/queue.png
diff --git a/docs/handbook/html/start.png b/docs/handbook/html/start.png
new file mode 100644
index 0000000..9bf7f03
--- /dev/null
+++ b/docs/handbook/html/start.png
diff --git a/docs/handbook/html/view_sidetree.png b/docs/handbook/html/view_sidetree.png
new file mode 100644
index 0000000..791d657
--- /dev/null
+++ b/docs/handbook/html/view_sidetree.png
diff --git a/docs/handbook/html/window_fullscreen.png b/docs/handbook/html/window_fullscreen.png
new file mode 100644
index 0000000..3163acc
--- /dev/null
+++ b/docs/handbook/html/window_fullscreen.png
diff --git a/docs/handbook/unicode/Makefile.am b/docs/handbook/unicode/Makefile.am
new file mode 100644
index 0000000..6199c64
--- /dev/null
+++ b/docs/handbook/unicode/Makefile.am
@@ -0,0 +1,24 @@
+# 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
new file mode 100644
index 0000000..0b0de8a
--- /dev/null
+++ b/docs/handbook/unicode/Makefile.in
@@ -0,0 +1,511 @@
+# 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
new file mode 100644
index 0000000..362ed21
--- /dev/null
+++ b/docs/handbook/unicode/hdbk-config.docbook
@@ -0,0 +1,283 @@
+<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
new file mode 100644
index 0000000..b3295d3
--- /dev/null
+++ b/docs/handbook/unicode/hdbk-intro.docbook
@@ -0,0 +1,166 @@
+<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
new file mode 100644
index 0000000..ef5b88e
--- /dev/null
+++ b/docs/handbook/unicode/hdbk-operation.docbook
@@ -0,0 +1,832 @@
+<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
new file mode 100644
index 0000000..0324b2f
--- /dev/null
+++ b/docs/handbook/unicode/hdbk-start.docbook
@@ -0,0 +1,122 @@
+<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
new file mode 100644
index 0000000..9ac0c50
--- /dev/null
+++ b/docs/handbook/unicode/hdbk-toolbars.docbook
@@ -0,0 +1,734 @@
+<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
new file mode 100644
index 0000000..fbbd5db
--- /dev/null
+++ b/docs/handbook/unicode/index.docbook
@@ -0,0 +1,112 @@
+<?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
new file mode 100644
index 0000000..7e4ac2a
--- /dev/null
+++ b/docs/howto/Makefile.am
@@ -0,0 +1,15 @@
+# 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
new file mode 100644
index 0000000..a645d6d
--- /dev/null
+++ b/docs/howto/Makefile.in
@@ -0,0 +1,657 @@
+# 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
new file mode 100644
index 0000000..f5e17f6
--- /dev/null
+++ b/docs/howto/html/Makefile.am
@@ -0,0 +1,6 @@
+# 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
new file mode 100644
index 0000000..47fa742
--- /dev/null
+++ b/docs/howto/html/Makefile.in
@@ -0,0 +1,498 @@
+# 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
new file mode 100644
index 0000000..274e6d2
--- /dev/null
+++ b/docs/howto/html/h2-basics-approaches.html
@@ -0,0 +1,20 @@
+<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
new file mode 100644
index 0000000..0ad2bac
--- /dev/null
+++ b/docs/howto/html/h2-basics-expository.html
@@ -0,0 +1,18 @@
+<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
new file mode 100644
index 0000000..52a41af
--- /dev/null
+++ b/docs/howto/html/h2-basics-interpretation.html
@@ -0,0 +1,6 @@
+<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
new file mode 100644
index 0000000..e5ee5e9
--- /dev/null
+++ b/docs/howto/html/h2-basics-types.html
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..164fe54
--- /dev/null
+++ b/docs/howto/html/h2-basics-worksheet.html
@@ -0,0 +1,14 @@
+<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
new file mode 100644
index 0000000..542344f
--- /dev/null
+++ b/docs/howto/html/h2-basics.html
@@ -0,0 +1,18 @@
+<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
new file mode 100644
index 0000000..de904b6
--- /dev/null
+++ b/docs/howto/html/h2-importance-breathed.html
@@ -0,0 +1,30 @@
+<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
new file mode 100644
index 0000000..ca071e9
--- /dev/null
+++ b/docs/howto/html/h2-importance-exhortations.html
@@ -0,0 +1,16 @@
+<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
new file mode 100644
index 0000000..b2cd17d
--- /dev/null
+++ b/docs/howto/html/h2-importance-liberates.html
@@ -0,0 +1,12 @@
+<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
new file mode 100644
index 0000000..30eff31
--- /dev/null
+++ b/docs/howto/html/h2-importance-once.html
@@ -0,0 +1,24 @@
+<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
new file mode 100644
index 0000000..401301c
--- /dev/null
+++ b/docs/howto/html/h2-importance-supplement.html
@@ -0,0 +1,15 @@
+<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
new file mode 100644
index 0000000..9ace333
--- /dev/null
+++ b/docs/howto/html/h2-importance-wars.html
@@ -0,0 +1,2 @@
+<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
new file mode 100644
index 0000000..9ef14c1
--- /dev/null
+++ b/docs/howto/html/h2-importance-works.html
@@ -0,0 +1,40 @@
+<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
new file mode 100644
index 0000000..9d24a50
--- /dev/null
+++ b/docs/howto/html/h2-importance.html
@@ -0,0 +1,30 @@
+<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
new file mode 100644
index 0000000..c7a9021
--- /dev/null
+++ b/docs/howto/html/h2-rules-context.html
@@ -0,0 +1,20 @@
+<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
new file mode 100644
index 0000000..b14a6ec
--- /dev/null
+++ b/docs/howto/html/h2-rules-hcontest.html
@@ -0,0 +1,23 @@
+<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
new file mode 100644
index 0000000..d79fbc0
--- /dev/null
+++ b/docs/howto/html/h2-rules-normal.html
@@ -0,0 +1,22 @@
+<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
new file mode 100644
index 0000000..609055e
--- /dev/null
+++ b/docs/howto/html/h2-rules-parables.html
@@ -0,0 +1,13 @@
+<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
new file mode 100644
index 0000000..c0ffd39
--- /dev/null
+++ b/docs/howto/html/h2-rules.html
@@ -0,0 +1,56 @@
+<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
new file mode 100644
index 0000000..0d05343
--- /dev/null
+++ b/docs/howto/html/index.html
@@ -0,0 +1,26 @@
+<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
new file mode 100644
index 0000000..57b377b
--- /dev/null
+++ b/docs/howto/unicode/Makefile.am
@@ -0,0 +1,24 @@
+# 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
new file mode 100644
index 0000000..864e3c2
--- /dev/null
+++ b/docs/howto/unicode/Makefile.in
@@ -0,0 +1,511 @@
+# 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/bibletime-doc/docs/en/howto/unicode/how2-basics.docbook b/docs/howto/unicode/how2-basics.docbook
index 63ab544..63ab544 100644
--- a/bibletime-doc/docs/en/howto/unicode/how2-basics.docbook
+++ b/docs/howto/unicode/how2-basics.docbook
diff --git a/bibletime-doc/docs/en/howto/unicode/how2-importance.docbook b/docs/howto/unicode/how2-importance.docbook
index 0791191..0791191 100644
--- a/bibletime-doc/docs/en/howto/unicode/how2-importance.docbook
+++ b/docs/howto/unicode/how2-importance.docbook
diff --git a/docs/howto/unicode/how2-interpretation.docbook b/docs/howto/unicode/how2-interpretation.docbook
new file mode 100644
index 0000000..b382249
--- /dev/null
+++ b/docs/howto/unicode/how2-interpretation.docbook
@@ -0,0 +1,198 @@
+<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
new file mode 100644
index 0000000..3728a56
--- /dev/null
+++ b/docs/howto/unicode/index.docbook
@@ -0,0 +1,95 @@
+<?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/bibletime-doc/docs/ksgmltools-bug-read-me.txt b/docs/ksgmltools-bug-read-me.txt
index 5a40a7f..5a40a7f 100644
--- a/bibletime-doc/docs/ksgmltools-bug-read-me.txt
+++ b/docs/ksgmltools-bug-read-me.txt
diff --git a/docs/tips b/docs/tips
new file mode 100644
index 0000000..c8bda33
--- /dev/null
+++ b/docs/tips
@@ -0,0 +1,165 @@
+<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/libtool b/libtool
deleted file mode 100755
index 1f56911..0000000
--- a/libtool
+++ /dev/null
@@ -1,6005 +0,0 @@
-#! /bin/sh
-
-# libtool - Provide generalized library-building support services.
-# Generated automatically by ltconfig (GNU libtool 1.4a (1.641.2.206mm 2001/04/03 21:47:47))
-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-#
-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# 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=" CXX"
-
-### BEGIN LIBTOOL CONFIG
-# Libtool was configured as follows, on host ekonomikrisis:
-#
-# AR="" AR_FLAGS="" LTCC="gcc" CC="gcc" \
-# CFLAGS="-DNDEBUG -O2  " CPPFLAGS="" \
-# MAGIC_CMD="" LD="/usr/bin/ld" LDFLAGS="" LIBS="" \
-# LN_S="ln -s" NM="/usr/bin/nm -B" RANLIB="ranlib" STRIP="strip" \
-# AS="" DLLTOOL="" OBJDUMP="" \
-# objext="" exeext="" reload_flag=" -r" \
-# deplibs_check_method="pass_all" \
-# file_magic_cmd="\$MAGIC_CMD" \
-#   admin/ltconfig --cache-file=./config.cache --disable-shared --with-gcc --with-gnu-ld --enable-dlopen --no-verify --build=i686-pc-linux-gnu admin/ltmain.sh i686-pc-linux-gnu
-#
-# Compiler and other test output produced by ltconfig, useful for
-# debugging ltconfig, is in ./config.log if it exists.
-
-# The version of ltconfig that generated this script.
-LTCONFIG_VERSION="1.4a"
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=no
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to optimize for fast installation.
-fast_install=needless
-
-# The host system.
-host_alias=i686-pc-linux-gnu
-host=i686-pc-linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# A language-specific compiler.
-CC="gcc"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# The linker used to build libraries.
-LD="/usr/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP=strip
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# 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=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=73729
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation ?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=yes
-
-# Whether dlopen of programs is supported.
-dlopen_self=yes
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=no
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# 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="\${libname}\${release}.so\$versuffix \${libname}\${release}.so\$major \$libname.so"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}.so\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-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"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=""
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=""
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=""
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGISTW]\\)[ 	][ 	]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern char \\1;/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | sed 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-### END LIBTOOL CONFIG
-
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
-#
-# Copyright (C) 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.
-
-# 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.4a
-TIMESTAMP=" (1.641.2.206mm 2001/04/03 21:47:47)"
-
-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'
-SP2NL='tr \040 \012'
-NL2SP='tr \015\012 \040\040'
-
-# 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
-
-if test "$LTCONFIG_VERSION" != "$VERSION"; then
-  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-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/"
-
-# 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
-
-      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
-      ;;
-    *)
-      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"
-    exit 0
-    ;;
-
-  --config)
-    sed -n -e '/^### BEGIN LIBTOOL CONFIG/,/^### END LIBTOOL CONFIG/p' < "$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" ;;
-
-  --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 test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    case $nonopt in
-    *cc | *++ | gcc* | *-gcc*)
-      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=
-    prev=
-    lastarg=
-    srcfile="$nonopt"
-    suppress_output=
-
-    user_target=no
-    for arg
-    do
-      case $prev in
-      "") ;;
-      xcompiler)
-	# Aesthetically quote the previous argument.
-	prev=
-	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-
-	case $arg in
-	# Double-quote args containing other shell metacharacters.
-	# Many Bourne shells cannot handle close brackets correctly
-	# in scan sets, so we specify it separately.
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-
-	# Add the previous argument to base_compile.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
-
-      # Accept any command-line options.
-      case $arg in
-      -o)
-	if test "$user_target" != "no"; then
-	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	  exit 1
-	fi
-	user_target=next
-	;;
-
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	lastarg=
-	IFS="${IFS= 	}"; 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.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
-
-      case $user_target in
-      next)
-	# The next one is the -o target name
-	user_target=yes
-	continue
-	;;
-      yes)
-	# We got the output file
-	user_target=set
-	libobj="$arg"
-	continue
-	;;
-      esac
-
-      # Accept the current argument as the source file.
-      lastarg="$srcfile"
-      srcfile="$arg"
-
-      # Aesthetically quote the previous argument.
-
-      # Backslashify any backslashes, double quotes, and dollar signs.
-      # These are the only characters that are still specially
-      # interpreted inside of double-quoted scrings.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      case $lastarg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      # Add the previous argument to base_compile.
-      if test -z "$base_compile"; then
-	base_compile="$lastarg"
-      else
-	base_compile="$base_compile $lastarg"
-      fi
-    done
-
-    case $user_target in
-    set)
-      ;;
-    no)
-      # Get the name of the library object.
-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    *)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSfmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.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
-      "$CC "*) ;;
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
-      *)
-        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 "*)
-              # 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
-              ;;
-	    "`$echo $CC` "*)
-	      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 invokation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      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=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-
-    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=
-
-    # 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
-	  ;;
-	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 | egrep "^# 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
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi
-
-      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: not more than one -exported-symbols argument allowed"
-	  exit 1
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      # 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*)
-	  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 "$arg" = "-lc"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # These systems don't actually have c library (as such)
-	    continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  esac
-	elif test "$arg" = "-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have math library (as such)
-	    continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody math library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	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
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	IFS="${IFS= 	}"; 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=
-	IFS="${IFS= 	}"; 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
-	;;
-
-      # 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
-	;;
-
-      *.$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 | egrep "^# 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
-	;;
-      esac
-
-      # 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
-
-    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
-      "$CC "*) ;;
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
-      *)
-        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 "*)
-              # The compiler in $compile_command matches
-              # the one in the tagged configuration.
-              # Assume this is the tagged configuration we want.
-              tagname=$z
-              break
-	      ;;
-	    "`$echo $CC` "*)
-	      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
-
-    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
-      case "$libs " in
-      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-      esac
-      libs="$libs $deplib"
-    done
-
-    if test $linkmode = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    uninst_deplibs= # uninstalled libtool libraries
-    uninst_path= # paths that contain uninstalled 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; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    # Search the libtool library
-	    lib="$searchdir/lib${name}.la"
-	    if test -f "$lib"; then
-	      found=yes
-	      break
-	    fi
-	  done
-	  if test "$found" != yes; then
-	    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
-	  ;;
-	-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
-	  continue
-	  ;;
-	-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: This library needs some functionality provided by $deplib."
-	      echo "*** I have the capability to make that library automatically link in when"
-	      echo "*** you link to this library.  But I can only do this if you have a"
-	      echo "*** shared version of the library, which you do not appear to have."
-	    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
-	  ;;
-	*.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
-	if test $found = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	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 variable installed.
-	installed=yes
-
-	# 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"
-	  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"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test $linkmode != prog && test $linkmode != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
-	  fi
-	  continue
-	fi
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$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
-
-	# 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
-	  uninst_path="$uninst_path $abs_ladir"
-	fi
-	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
-
-	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
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-	  continue
-	fi
-
-	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
-
-	  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
-	    uninst_deplibs="$uninst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-	  if test $linkmode = lib && test "$hardcode_into_libs" = all; 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*)
-		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'"
-	      IFS="${IFS= 	}"; 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'"
-	      IFS="${IFS= 	}"; 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
-
-	  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"
-	      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"
-		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"
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      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 library needs some functionality provided by $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi
-
-	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"
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
-	    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="-L$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
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="-L$absdir"
-		fi
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi
-	fi
-      done
-      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
-	  # Make sure that $var contains only unique libraries
-	  # and add them in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    case "$deplib" in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    *)
-	      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
-      fi
-    done
-    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' 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 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 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' 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.
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	current="$2"
-	revision="$3"
-	age="$4"
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $revision in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $age in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	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)
-	  major=`expr $current - $age + 1`
-	  verstring="sgi$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test $loop != 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="sgi$major.$iface:$verstring"
-	  done
-
-	  # 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 != 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=
-	  verstring="0.0"
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      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 $uninst_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 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"
-	    ;;
-	  *)
- 	    # 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 behaviour.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $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" != "" -a "$name" != "0"; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		set dummy $deplib_matches
-		deplib_match=$2
-		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		  newdeplibs="$newdeplibs $i"
-		else
-		  droppeddeps=yes
-		  echo
-		  echo "*** Warning: This library needs some functionality provided by $i."
-		  echo "*** I have the capability to make that library automatically link in when"
-		  echo "*** you link to this library.  But I can only do this if you have a"
-		  echo "*** shared version of the library, which you do not appear to have."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occured in the first compile.  Let's try to salvage the situation:
-	    # Compile a seperate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	     # If $name is empty we are operating on a -L argument.
-	      if test "$name" != "" -a "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test $? -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    echo "*** Warning: This library needs some functionality provided by $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which you do not appear to have."
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "***  make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test "$name" != "" -a "$name" != "0"; then
-	      libname=`eval \\$echo \"$libname_spec\"`
-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		    for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | sed 10q \
-			 | egrep "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		    done
-	      done
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have."
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
-	     grep . >/dev/null; then
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    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 && 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"
-	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	  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 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 x$dlname = x; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-#	# Ensure that we have .o objects for linkers which dislike .lo
-#	# (e.g. aix) in case we are running --disable-static
-#	for obj in $libobjs; do
-#	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-#	  if test "X$xdir" = "X$obj"; then
-#	    xdir="."
-#	  else
-#	    xdir="$xdir"
-#	  fi
-#	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-#	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-#	  if test ! -f $xdir/$oldobj && test "$baseobj" != "$oldobj"; then
-#	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-#	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-#	  fi
-#	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    eval cmds=\"$export_symbols_cmds\"
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd" || exit $?
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test $status -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test $status -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	      libobjs="$libobjs "`find $xdir -name \*.$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 && test "$hardcode_into_libs" = all; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# 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
-        if len=`expr "X$cmds" : ".*"` &&
-           test $len -le $max_cmd_len; 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\"
-
-	  # 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.
-          IFS="${IFS= 	}"; 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
-        IFS="${IFS= 	}"; 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 && test "$hardcode_into_libs" = all; 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
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	    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\"
-      IFS="${IFS= 	}"; 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\"
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-#     else
-#	# Just create a symlink.
-#	$show $rm $libobj
-#	$run $rm $libobj
-#	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-#	if test "X$xdir" = "X$libobj"; then
-#	  xdir="."
-#	else
-#	  xdir="$xdir"
-#	fi
-#	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-#	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-#	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
-#	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit 0
-      ;;
-
-    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
-
-      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"
-
-      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="$objs$old_deplibs"
-	    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" | sort +2 | uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#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[] =
-{\
-"
-
-	    sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
-		-e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
-		  < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr_t) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  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 ;;
-	  *) exeext= ;;
-	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:
-  uninst_deplibs='$uninst_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 (eval \$relink_command); then :
-      else
-	$rm \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	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
-	# win32 systems need to use the prog path for dll
-	# lookup to work
-	*-*-cygwin* | *-*-pw32*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      # Export the path to the program.
-      PATH=\"\$progdir:\$PATH\"
-      export PATH
-
-      exec \$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  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="$objs$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test $status -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test $status -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print | $NL2SP`
-	done
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	eval cmds=\"$old_archive_from_new_cmds\"
-      else
-#	# Ensure that we have .o objects in place in case we decided
-#	# not to build a shared library, and have fallen back to building
-#	# static libs even though --disable-static was passed!
-#	for oldobj in $oldobjs; do
-#	  if test ! -f $oldobj; then
-#	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-#	    if test "X$xdir" = "X$oldobj"; then
-#	      xdir="."
-#	    else
-#	      xdir="$xdir"
-#	    fi
-#	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-#	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-#	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-#	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
-#	  fi
-#	done
-
-        eval cmds=\"$old_archive_cmds\"
-
-        if len=`expr "X$cmds" : ".*"` &&
-             test $len -le $max_cmd_len; 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
-          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
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-              eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-              objlist=
-            fi
-          done
-	  RANLIB=$save_RANLIB
-          oldobjs=$objlist
-          eval cmds=\"\$concat_cmds~$old_archive_cmds\"
-        fi
-      fi
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    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"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-
-      # 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) 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
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test $hardcode_into_libs = all &&
-	     test "$installed" = no && test $need_relink = yes; 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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	library_names=
-	old_library=
-	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 "$hardcode_into_libs" = all && test -n "$relink_command"; then
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    continue
-	  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 "$hardcode_into_libs" = all && 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\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# 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
-
-	# Do a test to see if this is really a libtool program.
-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  uninst_deplibs=
-	  relink_command=
-
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$uninst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-	    exit 1
-	  fi
-
-	  finalize=yes
-	  for lib in $uninst_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=
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  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" | $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" | $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\"
-      IFS="${IFS= 	}"; 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 $SHELL $0 --finish$current_libdirs
-      exit 1
-    fi
-
-    exit 0
-    ;;
-
-  # 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\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || 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 \`-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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	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 | egrep "^# 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 enviroment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now actually exec the command.
-      eval "exec \$cmd$args"
-
-      $echo "$modename: cannot exec \$cmd$args"
-      exit 1
-    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=
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -*) 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=
-
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$objdir"
-      else
-	objdir="$dir/$objdir"
-      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
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $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\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      eval cmds=\"$old_postuninstall_cmds\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-	      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 | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-          # Read the .lo file
-          . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-          if test -n "$pic_object" \
-             && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-          fi
-
-	  # Add non-PIC object to the list of files to remove.
-          if test -n "$non_pic_object" \
-             && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-          fi
-	fi
-	;;
-
-      *)
-	# Do a test to see if this is a libtool program.
-	if test $mode = clean &&
-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  relink_command=
-	  . $dir/$file
-
-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	  if test "$fast_install" = yes && test -n "$relink_command"; then
-	    rmfiles="$rmfiles $objdir/lt-$name"
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles
-    done
-
-    # 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 0
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$generic_help" 1>&2
-  exit 1
-fi # test -z "$show_help"
-
-# 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."
-  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
-  -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:
-### BEGIN LIBTOOL TAG CONFIG: CXX
-# Libtool was configured as follows, on host ekonomikrisis:
-#
-# AR="" AR_FLAGS="" LTCC="gcc" CC="c++" \
-# CFLAGS="-DNDEBUG -O2 -fno-exceptions -fno-check-new" CPPFLAGS="" \
-# MAGIC_CMD="" LD="/usr/bin/ld" LDFLAGS="" LIBS="" \
-# LN_S="ln -s" NM="/usr/bin/nm -B" RANLIB="ranlib" STRIP="strip" \
-# AS="" DLLTOOL="" OBJDUMP="" \
-# objext="" exeext="" reload_flag=" -r" \
-# deplibs_check_method="pass_all" \
-# file_magic_cmd="\$MAGIC_CMD" \
-#   admin/ltconfig -o libtool --cache-file=./config.cache --disable-shared --with-gcc --with-gnu-ld --enable-dlopen --build=i686-pc-linux-gnu --add-tag=CXX admin/ltcf-cxx.sh i686-pc-linux-gnu
-#
-# Compiler and other test output produced by ltconfig, useful for
-# debugging ltconfig, is in ./config.log if it exists.
-
-# The version of ltconfig that generated this script.
-LTCONFIG_VERSION="1.4a"
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=no
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to optimize for fast installation.
-fast_install=needless
-
-# The host system.
-host_alias=i686-pc-linux-gnu
-host=i686-pc-linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# A language-specific compiler.
-CC="c++"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# The linker used to build libraries.
-LD="/usr/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP=strip
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# 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=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=73729
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation ?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=yes
-
-# Whether dlopen of programs is supported.
-dlopen_self=yes
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=no
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# 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="\${libname}\${release}.so\$versuffix \${libname}\${release}.so\$major \$libname.so"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}.so\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects="/usr/lib/crti.o /usr/lib/gcc-lib/i386-linux/2.95.4/crtbeginS.o"
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects="/usr/lib/gcc-lib/i386-linux/2.95.4/crtendS.o /usr/lib/crtn.o"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps="-lstdc++ -lm -lgcc -lc -lgcc"
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc-lib/i386-linux/2.95.4"
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGISTW]\\)[ 	][ 	]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern char \\1;/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | sed 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-### END LIBTOOL TAG CONFIG: CXX
-
diff --git a/make-messages.sh b/make-messages.sh
deleted file mode 100755
index 880085b..0000000
--- a/make-messages.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-myDir=/opt/kde2/include/
-target=../bibletime-doc
-
-current=$PWD
-
-perl ./extractrc bibletime/xml/*.rc > bibletime/rc-dummy.cpp && \
-sed "s/#define//" bibletime/tooltipdef.h > bibletime/dummy.h && \
-sed "s/#define//" bibletime/whatsthisdef.h >> bibletime/dummy.h && \
-perl ./preparetips $target/docs/en/tips > bibletime/tips-dummy.cpp && \
-xgettext -C -x $myDir/kde.pot -ki18n -kI18N_NOOP -o $target/po/bibletime.pot `find ./ -name \*.cpp` `find . -name \*.h` &&  \
-cd $target/po && make merge && rm $current/bibletime/dummy.h && rm $current/bibletime/rc-dummy.cpp && rm $current/bibletime/tips-dummy.cpp
-
-
-cd $current
-
-
-
diff --git a/packaging-howto.txt b/packaging-howto.txt
index 66d7e18..8b966aa 100644
--- a/packaging-howto.txt
+++ b/packaging-howto.txt
@@ -5,7 +5,8 @@ This is a small explanation how to create 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
+	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
diff --git a/pot/Makefile.am b/pot/Makefile.am
new file mode 100644
index 0000000..40fcb2d
--- /dev/null
+++ b/pot/Makefile.am
@@ -0,0 +1,28 @@
+# 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
new file mode 100644
index 0000000..e13c0f6
--- /dev/null
+++ b/pot/Makefile.in
@@ -0,0 +1,519 @@
+# 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/extractrc b/pot/extractrc
index 368849d..368849d 100755..100644
--- a/extractrc
+++ b/pot/extractrc
diff --git a/pot/handbook.pot b/pot/handbook.pot
new file mode 100644
index 0000000..a569559
--- /dev/null
+++ b/pot/handbook.pot
@@ -0,0 +1,3110 @@
+# 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
new file mode 100644
index 0000000..096f2c7
--- /dev/null
+++ b/pot/howto.pot
@@ -0,0 +1,1558 @@
+# 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
new file mode 100644
index 0000000..f7dee9a
--- /dev/null
+++ b/pot/messages.pot
@@ -0,0 +1,3285 @@
+# 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/preparetips b/pot/preparetips
index 1e5c35a..1e5c35a 100755
--- a/preparetips
+++ b/pot/preparetips
diff --git a/setupwizard.kdevprj b/setupwizard.kdevprj
new file mode 100644
index 0000000..95eab8c
--- /dev/null
+++ b/setupwizard.kdevprj
@@ -0,0 +1,152 @@
+[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 b/stamp-h
deleted file mode 100644
index 9788f70..0000000
--- a/stamp-h
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/stamp-h.in b/stamp-h.in
index 9788f70..e69de29 100644
--- a/stamp-h.in
+++ b/stamp-h.in
@@ -1 +0,0 @@
-timestamp
diff --git a/subdirs b/subdirs
new file mode 100644
index 0000000..0d47987
--- /dev/null
+++ b/subdirs
@@ -0,0 +1,4 @@
+bibletime
+debian
+docs
+pot
diff --git a/sword.m4 b/sword.m4
index 44e28a0..341df39 100644
--- a/sword.m4
+++ b/sword.m4
@@ -1,5 +1,5 @@
 ##	-*- autoconf -*-
-dnl This file was created by Joachim Ansorg <jansorg@gmx.de>
+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 ----------------------------------------------------------------------
@@ -13,7 +13,7 @@ dnl AC_MSG_CHECKING([for a Sword installation])
 
 dnl The option for the configure script
 AC_ARG_WITH(sword-dir,
-[  --with-sword-dir=DIR     Patch where Sword is being installed (default=/usr) ],
+[  --with-sword-dir=DIR     Path where Sword is being installed (default=/usr) ],
 [
   ac_sword_dir=$withval
 ],ac_sword_dir=/usr
@@ -30,20 +30,20 @@ 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 "$ac_static_sword" = "YES"; then
+if test "x$ac_static_sword" = "xYES"; then
 	SEARCH_LIBS="libsword.a";
 else
-	SEARCH_LIBS="libsword.a libsword.so";
+	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 "$ac_cv_sword_libdir" = "NO"; then
+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 "$ac_static_sword" = "YES"; then
+if test "x$ac_static_sword" = "xYES"; then
 	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
 else
 	LIB_SWORD="-lsword";
@@ -53,22 +53,20 @@ AC_SUBST(SWORD_LIBRARY_PATH)
 AC_SUBST(LIB_SWORD)
 all_libraries="$all_libraries -L$ac_cv_sword_libdir"
 
-if test "$ac_static_sword" = "YES"; then
+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 "$ac_cv_sword_incdir" = "NO"; then
+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 !
 ])
@@ -82,8 +80,11 @@ AC_MSG_RESULT([$ac_cv_sword_incdir])
 
 
 
-dnl -- check if Sword matches the minimum version --
-AC_MSG_CHECKING([if you have Sword $1 or later])
+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,
 [
@@ -104,38 +105,28 @@ LIBRARY_PATH=
 export LIBRARY_PATH
 
 cat > conftest.$ac_ext <<EOF
-#include <iostream.h>
+#include <iostream>
 #include <swversion.h>
 
+#ifdef SWORD_NAMESPACE_START
+using namespace sword;
+#endif
+
 int main(int argc, char* argv[]) {
-	if (argc != 2) {
-		cout << SWVersion::currentVersion << endl;
-	}
-	else if (argc == 2) 
-	{
-		if (SWVersion(&argv[[1]]) < SWVersion::currentVersion || SWVersion(&argv[[1]]) == SWVersion::currentVersion)
-		{
-			cout << 0 << endl;
-			return 0;
-		}
-		else	
-		{
-			cout << 1 << endl;
-			return 1; //version not recent enough
-		}
-	}
+	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`
-		eval sword_test_returncode=`./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
 
@@ -150,16 +141,87 @@ LIBRARY_PATH="$ac_LIBRARY_PATH"
 export LIBRARY_PATH
 AC_LANG_RESTORE
 ])
+AC_MSG_RESULT([$ac_cv_installed_sword_version])
+
+
+
 
-right_version="ok";
-if test $sword_test_returncode = 1;  then
-	right_version="wrong 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;
-	
-AC_MSG_RESULT([$ac_cv_installed_sword_version])
-if test $right_version != "ok"; then
-        AC_MSG_ERROR([Your Sword installation is not recent enoought! Please
-upgrade to version $1!]);
+
+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;
 
 ])