pause rec button should not remain pressed

svn path=/trunk/kdenlive/; revision=1158
Rec button down while capturing from firewire
2025-12-08 01:09:59 +01:00 · 2006-12-03 23:35:26 +00:00 · 2006-12-03 23:31:12 +00:00 · 2006-12-03 22:42:20 +00:00 · 2006-12-03 22:36:29 +00:00 · 2006-12-03 17:15:34 +00:00
562 changed files with 79032 additions and 86336 deletions
--- a/2
+++ b/2
@@ -1,2 +1,4 @@
 Jason Wood <jasonwood@blueyonder.co.uk> : main developer and maintainer.
 Gilles Caulier <caulier.gilles@free.fr> : i18n, French translations.
+Marco Gittler <g.marco@freenet.de>
+Jean-Baptiste Mardelle <jb@ader.ch>
--- a/53
+++ b/53
@@ -0,0 +1,53 @@
+Kdenlive development version
+----------------------------
+
+2004-10-13 Jean-Michel Pouré
+        * Docking windows fix (provided by Jason)
+	* Single bootstrap code (in admin/ directory).
+        * Set default PIAVE path to /usr/bin/piave
+
+2004-07-04 Gilles Caulier <caulier dot gilles at free.fr>
+	* German GUI translation.
+	* German and Italian handbooks.        
+
+Kdenlive 0.2.4
+--------------
+
+2004-01-05  Daniele Medri <madrid@linuxmeeting.net>
+	* Italian Translation.
+
+2003-12-14  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Initial support for loading kino project files.
+
+2003-12-13  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Implemented "play selected" button in kdenlive.
+
+2003-12-11  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Implemented new load/save framework to allow multiple project formats
+	* Added mimetype for kdenlive projects.
+
+2003-12-02  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Partial fix to put splashscreen on a particular screen on a multi-screen display. Unfortunately, it doesn't yet put it on the right screen.
+	* Re-implemented deletion of clips from the project list, it now works with undo as well.
+
+2003-12-01  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Play button now "sticks down" and changes into a pause button when playing.
+	* Added context menu to monitors.
+	* Added "Fit to width" command for timeline.
+
+2003-11-30  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Made The "Ignore Messages" option on the debug window persist.
+	* The clip monitor now updates inpoints/outpoints as clips on timeline are resized.
+
+2003-11-30  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Added preliminary support for snap markers
+
+2003-11-26  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Bug fixes allow you to drag clips onto the project list again, including dragging project clips.
+
+2003-11-24  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Some bug fixes
+
+2003-11-16  Jason Wood  <jasonwood@blueyonder.co.uk>
+	* Refactored clip framework to allow sub clips and to allow updating via commands (so is undoable).
+	* Added preliminary project configuration dialog
--- a/admin2_5/Doxyfile.global
+++ b/admin2_5/Doxyfile.global
@@ -1,4 +1,4 @@
-# Doxyfile 1.2.15
+# Doxyfile 1.2.18

 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -17,28 +17,29 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.

-PROJECT_NAME           = 
+PROJECT_NAME           = Kdenlive

 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.

-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = 0.2.4

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.

-OUTPUT_DIRECTORY       = ../apidocs/
+OUTPUT_DIRECTORY       = 	./Documentation

 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Chinese, Croatian, Czech, Danish, Dutch, Finnish, French, 
-# German, Greek, Hungarian, Italian, Japanese, Korean, Norwegian, Polish, 
-# Portuguese, Romanian, Russian, Slovak, Slovene, Spanish and Swedish.
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
+# (Japanese with english messages), Korean, Norwegian, Polish, Portuguese, 
+# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish and Ukrainian.

 OUTPUT_LANGUAGE        = English

@@ -57,13 +58,13 @@ EXTRACT_PRIVATE        = NO
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.

-EXTRACT_STATIC         = YES
+EXTRACT_STATIC         = NO

 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
 # defined locally in source files will be included in the documentation. 
 # If set to NO only classes defined in header files are included.

-EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_LOCAL_CLASSES  = YES

 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
 # undocumented members of documented classes, files or namespaces. 
@@ -71,7 +72,7 @@ EXTRACT_LOCAL_CLASSES  = NO
 # various overviews, but no documentation section is generated. 
 # This option has no effect if EXTRACT_ALL is enabled.

-HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_MEMBERS     = YES

 # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
 # undocumented classes that are normally visible in the class hierarchy. 
@@ -80,6 +81,13 @@ HIDE_UNDOC_MEMBERS     = NO

 HIDE_UNDOC_CLASSES     = YES

+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
 # the file and class documentation (similar to JavaDoc). 
@@ -98,7 +106,7 @@ REPEAT_BRIEF           = YES
 # Doxygen will generate a detailed section even if there is only a brief 
 # description.

-ALWAYS_DETAILED_SEC    = YES
+ALWAYS_DETAILED_SEC    = NO

 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
 # members of a class in the documentation of that class as if those members were 
@@ -173,6 +181,21 @@ SHOW_INCLUDE_FILES     = YES

 JAVADOC_AUTOBRIEF      = YES

+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = NO
+
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # reimplements.
@@ -189,7 +212,7 @@ INLINE_INFO            = YES
 # alphabetically by member name. If set to NO the members will appear in 
 # declaration order.

-SORT_MEMBER_DOCS       = NO
+SORT_MEMBER_DOCS       = YES

 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
 # tag is set to YES, then doxygen will reuse the documentation of the first 
@@ -201,19 +224,19 @@ DISTRIBUTE_GROUP_DOC   = NO
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.

-TAB_SIZE               = 4
+TAB_SIZE               = 

 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
 # commands in the documentation.

-GENERATE_TODOLIST      = NO
+GENERATE_TODOLIST      = YES

 # The GENERATE_TESTLIST tag can be used to enable (YES) or 
 # disable (NO) the test list. This list is created by putting \test 
 # commands in the documentation.

-GENERATE_TESTLIST      = NO
+GENERATE_TESTLIST      = YES

 # The GENERATE_BUGLIST tag can be used to enable (YES) or 
 # disable (NO) the bug list. This list is created by putting \bug 
@@ -221,6 +244,11 @@ GENERATE_TESTLIST      = NO

 GENERATE_BUGLIST       = YES

+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
 # This tag can be used to specify a number of aliases that acts 
 # as commands in the documentation. An alias has the form "name=value". 
 # For example adding "sideeffect=\par Side Effects:\n" will allow you to 
@@ -228,15 +256,7 @@ GENERATE_BUGLIST       = YES
 # will result in a user defined paragraph with heading "Side Effects:". 
 # You can put \n's in the value part of an alias to insert newlines.

-# @ref in KDE docu are for kdoc, doxygen doesn't need them, so we alias them
-# to nothing here
-
-ALIASES                = libdoc=@mainpage \
-                         sect=<p><b> \
-                         reimplemented= \
-                         "deprecated=<b>This class or method is obsolete, it is provided for compatibility only.</b>" \
-                         obsolete=@deprecated \
-			 ref=
+ALIASES                = 

 # The ENABLED_SECTIONS tag can be used to enable conditional 
 # documentation sections, marked by \if sectionname ... \endif.
@@ -251,7 +271,7 @@ ENABLED_SECTIONS       =
 # documentation can be controlled using \showinitializer or \hideinitializer 
 # command in the documentation regardless of this setting.

-MAX_INITIALIZER_LINES  = 30
+MAX_INITIALIZER_LINES  = 

 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
 # only. Doxygen will then generate output that is more tailored for C. 
@@ -280,7 +300,7 @@ SHOW_USED_FILES        = YES
 # The QUIET tag can be used to turn on/off the messages that are generated 
 # by doxygen. Possible values are YES and NO. If left blank NO is used.

-QUIET                  = YES
+QUIET                  = NO

 # The WARNINGS tag can be used to turn on/off the warning messages that are 
 # generated by doxygen. Possible values are YES and NO. If left blank 
@@ -292,14 +312,14 @@ WARNINGS               = YES
 # for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
 # automatically be disabled.

-WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_UNDOCUMENTED   = YES

 # The WARN_FORMAT tag determines the format of the warning messages that 
 # doxygen can produce. The string should contain the $file, $line, and $text 
 # tags, which will be replaced by the file and line number from which the 
 # warning originated and the warning text.

-WARN_FORMAT            = 
+WARN_FORMAT            = "$file:$line: $text"

 # The WARN_LOGFILE tag can be used to specify a file to which warning 
 # and error messages should be written. If left blank the output is written 
@@ -316,7 +336,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.

-INPUT                  = 
+INPUT                  = ./kdenlive

 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -325,10 +345,10 @@ INPUT                  =
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
 # *.h++ *.idl *.odl

-FILE_PATTERNS          = *.h \
-                         *.cpp \
-                         *.cc \
-                         *.hpp
+FILE_PATTERNS          = *.cpp \
+                         *.h \
+                         *.ui \
+                         *.pl

 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 
@@ -351,12 +371,7 @@ EXCLUDE_SYMLINKS       = NO
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
 # certain files from those directories.

-EXCLUDE_PATTERNS       = *.moc.* \
-                         moc* \
-                         *.all_cpp.* \
-                         *unload.* \
-                         */test/* \
-                         */tests/*
+EXCLUDE_PATTERNS       = 

 # The EXAMPLE_PATH tag can be used to specify one or more files or 
 # directories that contain example code fragments that are included (see 
@@ -395,7 +410,7 @@ INPUT_FILTER           =

 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
 # INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse.
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).

 FILTER_SOURCE_FILES    = NO

@@ -446,7 +461,7 @@ COLS_IN_ALPHA_INDEX    = 3
 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
 # should be ignored while generating the index headers.

-IGNORE_PREFIX          = K
+IGNORE_PREFIX          = 

 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
@@ -455,13 +470,13 @@ IGNORE_PREFIX          = K
 # If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
 # generate HTML output.

-GENERATE_HTML          = NO
+GENERATE_HTML          = YES

 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `html' will be used as the default path.

-HTML_OUTPUT            = 
+HTML_OUTPUT            = html

 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
@@ -473,20 +488,20 @@ HTML_FILE_EXTENSION    = .html
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.

-HTML_HEADER            = ../apidocs/common/header.html
+HTML_HEADER            = 

 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.

-HTML_FOOTER            = ../apidocs/common/footer.html
+HTML_FOOTER            = 

 # The HTML_STYLESHEET tag can be used to specify a user defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet

-HTML_STYLESHEET        = ../apidocs/common/doxygen.css
+HTML_STYLESHEET        = 

 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
@@ -501,6 +516,20 @@ HTML_ALIGN_MEMBERS     = YES

 GENERATE_HTMLHELP      = NO

+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output dir.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non empty doxygen will try to run 
+# the html help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
 # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
 # controls if a separate .chi index file is generated (YES) or that 
 # it should be included in the master .chm file (NO).
@@ -522,12 +551,12 @@ TOC_EXPAND             = NO
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.

-DISABLE_INDEX          = YES
+DISABLE_INDEX          = NO

 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.

-ENUM_VALUES_PER_LINE   = 4
+ENUM_VALUES_PER_LINE   = 

 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
 # generated containing a tree-like index structure (just like the one that 
@@ -543,7 +572,7 @@ GENERATE_TREEVIEW      = NO
 # used to set the initial width (in pixels) of the frame in which the tree 
 # is shown.

-TREEVIEW_WIDTH         = 250
+TREEVIEW_WIDTH         = 

 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -552,13 +581,13 @@ TREEVIEW_WIDTH         = 250
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
 # generate Latex output.

-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES

 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `latex' will be used as the default path.

-LATEX_OUTPUT           = 
+LATEX_OUTPUT           = latex

 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be invoked. If left blank `latex' will be used as the default command name.

@@ -628,7 +657,7 @@ GENERATE_RTF           = NO
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `rtf' will be used as the default path.

-RTF_OUTPUT             = 
+RTF_OUTPUT             = rtf

 # If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
 # RTF documents. This may be useful for small projects and may help to 
@@ -669,12 +698,12 @@ GENERATE_MAN           = NO
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `man' will be used as the default path.

-MAN_OUTPUT             = 
+MAN_OUTPUT             = man

 # The MAN_EXTENSION tag determines the extension that is added to 
 # the generated man pages (default is the subroutine's section .3)

-MAN_EXTENSION          = .kde3
+MAN_EXTENSION          = .3

 # If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
 # then it will generate one additional man file for each entity 
@@ -682,7 +711,7 @@ MAN_EXTENSION          = .kde3
 # only source the real man page, but without them the man command 
 # would be unable to find the correct page. The default is NO.

-MAN_LINKS              = YES
+MAN_LINKS              = NO

 #---------------------------------------------------------------------------
 # configuration options related to the XML output
@@ -696,6 +725,18 @@ MAN_LINKS              = YES

 GENERATE_XML           = NO

+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -723,7 +764,7 @@ ENABLE_PREPROCESSING   = YES
 # compilation will be performed. Macro expansion can be done in a controlled 
 # way by setting EXPAND_ONLY_PREDEF to YES.

-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES

 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
@@ -755,7 +796,7 @@ INCLUDE_FILE_PATTERNS  =
 # or name=definition (no spaces). If the definition and the = are 
 # omitted =1 is assumed.

-PREDEFINED             = QT_VERSION=305
+PREDEFINED             = 

 # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
@@ -766,8 +807,9 @@ EXPAND_AS_DEFINED      =

 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line and do not end with a semicolon. Such function macros are typically 
-# used for boiler-plate code, and will confuse the parser if not removed.
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse the 
+# parser if not removed.

 SKIP_FUNCTION_MACROS   = YES

@@ -794,12 +836,12 @@ ALLEXTERNALS           = NO
 # in the modules index. If set to NO, only the current project's groups will 
 # be listed.

-EXTERNAL_GROUPS        = NO
+EXTERNAL_GROUPS        = YES

 # The PERL_PATH should be the absolute path and name of the perl script 
 # interpreter (i.e. the result of `which perl').

-PERL_PATH              = 
+PERL_PATH              = /usr/bin/perl

 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool   
@@ -813,12 +855,18 @@ PERL_PATH              =

 CLASS_DIAGRAMS         = YES

+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
 # available from the path. This tool is part of Graphviz, a graph visualization 
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default)

-HAVE_DOT               = NO
+HAVE_DOT               = YES

 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
@@ -839,12 +887,6 @@ COLLABORATION_GRAPH    = YES

 TEMPLATE_RELATIONS     = YES

-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = NO
-
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
 # tags are set to YES then doxygen will generate a graph for each documented 
 # file showing the direct and indirect include dependencies of the file with 
@@ -862,7 +904,7 @@ INCLUDED_BY_GRAPH      = YES
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.

-GRAPHICAL_HIERARCHY    = NO
+GRAPHICAL_HIERARCHY    = YES

 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
 # generated by dot. Possible values are png, jpg, or gif
@@ -887,7 +929,7 @@ DOTFILE_DIRS           =
 # the specified constraint. Beware that most browsers cannot cope with very 
 # large images.

-MAX_DOT_GRAPH_WIDTH    = 800
+MAX_DOT_GRAPH_WIDTH    = 900

 # The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
 # (in pixels) of the graphs generated by dot. If a graph becomes larger than 
@@ -895,7 +937,7 @@ MAX_DOT_GRAPH_WIDTH    = 800
 # the specified constraint. Beware that most browsers cannot cope with very 
 # large images.

-MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_HEIGHT   = 

 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
@@ -922,7 +964,7 @@ SEARCHENGINE           = NO
 # starts the search engine (doxysearch) with the correct parameters. 
 # A script with this name will be generated by doxygen.

-CGI_NAME               = 
+CGI_NAME               = search.cgi

 # The CGI_URL tag should be the absolute URL to the directory where the 
 # cgi binaries are located. See the documentation of your http daemon for 
@@ -945,7 +987,7 @@ DOC_ABSPATH            =
 # The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
 # is installed.

-BIN_ABSPATH            = 
+BIN_ABSPATH            = /usr/local/bin/

 # The EXT_DOC_PATHS tag can be used to specify one or more paths to 
 # documentation generated for other projects. This allows doxysearch to search 
--- a/37
+++ b/37
@@ -14,10 +14,10 @@ where x.x.x is the version number.
 Once extracted, you can enter the directory and configure and build kdenlive.

 cd kdenlive
-./configure
+./configure --prefix=`kde-config --prefix`
 make

-To install, become root.
+To install, become root:

 su
 (enter root password at prompt)
@@ -42,34 +42,19 @@ Installing from CVS
 ===================
 if you are checking out CVS :

-Type:
-
+Connect to the CVS repository:
 cvs -d:pserver:anonymous@cvs.kdenlive.sourceforge.net:/cvsroot/kdenlive login

-
-When asked for a password, press return (there is no password).
-Then type:
-
+When asked for a password, press return (there is no password). Then checkout Kdenlive source code:
 cvs -z3 -d:pserver:anonymous@cvs.kdenlive.sourceforge.net:/cvsroot/kdenlive co kdenlive

-Once the sourcecode has been downloaded, create a link called admin to the directory
-that matches the version of automake you are using.
-
-For 2.13 or similar :
-
-ln -s admin2_13 admin
-
-For 2.5x :
-
-ln -s admin2_5 admin
-
-Then, type the following commands to compile and install kdenlive.
-
+Create a ./configure script:
 cd kdenlive
-make -f admin/Makefile.common
-./configure
-make
+sh bootstrap

+Compile Kdenlive:
+./configure --prefix=`kde-config --prefix`
+make

 To install, become root

@@ -78,7 +63,6 @@ su

 make install

-
 ./configure takes a number of options, type ./configure --help to
 discover what these are. The most important one is --prefix, which
 specifies where your KDE installation is when installing. For Mandrake,
@@ -94,9 +78,6 @@ the README file for details.
 Have Fun!


-
-
-
 Basic Installation
 ==================

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SUBDIRS = kdenlive po doc icons graphics 
-
-EXTRA_DIST = kdenlive.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO kdenlive.lsm kdenlive.spec 
-
-####### kdevelop will overwrite this part!!! (end)############
-# not a GNU package. You can remove this line, if 
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 
+SUBDIRS = $(TOPSUBDIRS)

 $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
@@ -20,10 +11,17 @@ $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/ad

 MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 

+messages: rc.cpp
+	$(EXTRACTRC) kdenlive/*.rc >> kdenlive/rc.cpp
+	$(XGETTEXT) kdenlive/*.cpp -L C++    -o po/kdenlive.pot
+	$(XGETTEXT) kdenlive/*.ui  -L C++ -j -o po/kdenlive.pot
+
 package-messages:
-	$(MAKE) -f admin/Makefile.common package-messages
+	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages
 	$(MAKE) -C po merge

+EXTRA_DIST = admin %{LICENSEFILE} configure.in.in
+
 dist-hook:
 	cd $(top_distdir) && perl admin/am_edit -padmin
 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -0,0 +1,10 @@
+all: 
+	@echo "This Makefile is only for the CVS repository"
+	@echo "This will be deleted before making the distribution"
+	@echo ""
+	$(MAKE) -f admin/Makefile.common cvs
+
+dist:
+	$(MAKE) -f admin/Makefile.common dist
+
+.SILENT:
--- a/3
+++ b/3
@@ -0,0 +1,3 @@
+This file is required by the build system
+
+version 0.3: Porting to MLT
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-Kdenlive V 0.2.3 by Jason Wood <jasonwood@blueyonder.co.uk>
+Kdenlive V 0.2.4 by Jason Wood <jasonwood@blueyonder.co.uk>

 Kdenlive is a video editing application for KDE. It will eventually run on
 any machine that KDE can run on.
@@ -13,7 +13,7 @@ the following webpage :

 http://modesto.sourceforge.net/piave/

-This version of Kdenlive requires Piave version 0.2.3. It may work with different 
+This version of Kdenlive requires Piave version 0.2.4. It may work with different 
 versions, but this is not guaranteed, or (at this stage of development) likely.

 Then, go to the Settings->configure Kdenlive menu, and type in or browse to
--- a/19
+++ b/19
@@ -1,18 +1,23 @@
 TODO List

-* Support for file formats.
-* Export file dialog box
-* KDockWidget layouts need to be saved on exit/opened on loading.
-* Dragging a clip to the timeline with undefined length should become full-length once it's duration is known.
+Urgent
+- effect detection / editing for kdenlive
+- other-than-DV support for piave (ffmpeg?)
+- DV capture dialog

+Less urgent
+* (Kdenlive) KDockWidget layouts need to be saved on exit/opened on loading.
+* (Kdenlive) Dragging a clip to the timeline with undefined length should become full-length once it's duration is known.

 This is not a comprehensive list :-) If you are interested in helping
 with the development of Kdenlive, then please join the development
-mailing list, or contact me directly at uchian@blueyonder.co.uk
+mailing list, or contact us directly on Kdenlive mailing list.

 Homepage:
-http://www.uchian.pwp.blueyonder.co.uk/kdenlive.html
-
+http://kdenlive.sourceforge.net

 Development Mailing List:
 https://lists.sourceforge.net/lists/listinfo/kdenlive-devel
+
+Developer IRC channel:
+irc.freenode.net#kdenlive 
--- a/acinclude.m4
+++ b/acinclude.m4
--- a/admin2_13/ChangeLog
+++ b/admin2_13/ChangeLog
@@ -1,753 +0,0 @@
-2001-11-07  Walter Tasin <tasin@kdevelop.org>
-
-	* now #MIN_CONFIG tag takes parameters for KDE_USE_QT, too.
-          e.g. #MIN_CONFIG(2.2) for qt 2.2 usage
-
-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 ;)
--- a/admin2_13/Makefile.common
+++ b/admin2_13/Makefile.common
@@ -1,381 +0,0 @@
-
-SHELL=/bin/sh
-
-cvs:
-	if test -x /usr/bin/autoconf2.50 ; then \
-	   AUTOCONF="/usr/bin/autoconf2.50" ;\
-	else \
-	   AUTOCONF="autoconf" ;\
-	fi; \
-	AUTOCONF_VERSION=`$$AUTOCONF --version` ;\
-	if test "x$$AUTOCONF_VERSION" = "xAutoconf version 2.13"; then \
-	   echo "*** YOU'RE USING AUTOCONF 2.13. We suggest updating." ;\
-	   echo "*** autoconf 2.5x works best for now, we will drop" ;\
-	   echo "*** support for autoconf 2.13 soon."; \
-	   test ! -f admin/libtool.m4.in || mv admin/libtool.m4.in admin/new-libtool.m4.in ;\
-	   test ! -f admin/ltmain.sh || mv admin/ltmain.sh admin/new-ltmain.sh ;\
-	   for file in libtool.m4.in ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig ltmain.sh; do \
-		rm -f admin/$$file ;\
-		ln -s old-$$file admin/$$file ;\
-	   done ;\
-	fi 
-	@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; \
-	perl -e '\
-	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 ("");'
-
-
-# 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 ;\
-	kde_use_qt_param= ; \
-	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 "^#MIN_CONFIG\(" configure.in.in` ;\
-	      if test -n "$$line"; then \
-		  kde_use_qt_param=`echo $$line | sed -e "s/#MIN_CONFIG(\(.*\))/\1/"` ;\
-	      fi ;\
-	   fi ;\
-	   if head -2 configure.in.in | egrep "^#MIN_CONFI(G|G\(.*\))$$" > /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="\"3.0.3\"";  \
-	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
-	@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_CONFI(G|G\(.*\))$$" > /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 -ktr2i18n \
-	   -kI18N_NOOP -ktranslate -kaliasLocale \
-	   -x $${includedir:-$$KDEDIR/include}/kde.pot" \
-	   messages ) 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 \
-	  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 \
-	   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
-
-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:
-
-.PHONY: cvs test dist cvs-clean package-merge package-messages
-
--- a/admin2_13/acinclude.m4.in
+++ b/admin2_13/acinclude.m4.in
--- a/admin2_13/am_edit
+++ b/admin2_13/am_edit
--- a/admin2_13/conf.change.pl
+++ b/admin2_13/conf.change.pl
@@ -1,177 +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@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 File::Basename;
-
-my $ac_aux_dir = dirname($0);
-my ($flag);
-local $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;
-
-sub insert_main_loop {
-
-  if ($ac_version == 250) {
-    &insert_main_loop_250();
-  }
-  else {
-    &insert_main_loop_213();
-  }
-}
-
-sub insert_main_loop_250 {
-
-  print <<EOF;
-  #echo Doing the fast build of Makefiles -- autoconf $ac_version
-EOF
-    if ($vpath_seen) {
-        print <<EOF;
-        # VPATH subst was seen in original config.status main loop
-  echo '/^[ 	]*VPATH[ 	]*=[^:]*\$/d' >>\$tmp/subs.sed
-EOF
-      }
-  print <<EOF;
-  rm -f \$tmp/subs.files
-  for ac_file in .. \$CONFIG_FILES ; do
-      if test "x\$ac_file" != x..; then
-          echo \$ac_file >> \$tmp/subs.files
-      fi
-  done
-  if test -f \$tmp/subs.files ; then
-      perl $ac_aux_dir/config.pl "\$tmp/subs.sed" "\$tmp/subs.files" "\$srcdir" "\$INSTALL"
-  fi
-  rm -f \$tmp/subs.files
-
-fi
-EOF
-  return;
-}
-
-sub insert_main_loop_213 {
-    print <<EOF;
-#echo Doing the fast build of Makefiles -- autoconf $ac_version
-if test "x\$ac_cs_root" = "x" ; then
-    ac_cs_root=conftest
-fi
-EOF
-    if ($vpath_seen) {
-      print <<EOF;
-# VPATH subst was seen in original config.status main loop
-echo '/^[ 	]*VPATH[ 	]*=[^:]*\$/d' >> \$ac_cs_root.subs
-EOF
-    }
-    print <<EOF;
-rm -f \$ac_cs_root.sacfiles
-for ac_file in .. \$CONFIG_FILES ; do
-    if test "x\$ac_file" != x..; then
-        echo \$ac_file >> \$ac_cs_root.sacfiles
-    fi
-done
-if test -f \$ac_cs_root.sacfiles ; then
-    perl $ac_aux_dir/config.pl "\$ac_cs_root.subs" "\$ac_cs_root.sacfiles" "\$ac_given_srcdir" "\$ac_given_INSTALL"
-fi
-rm -f \$ac_cs_root.s*
-
-EOF
-    return;
-}
--- a/admin2_13/config.guess
+++ b/admin2_13/config.guess
--- a/admin2_13/config.pl
+++ b/admin2_13/config.pl
@@ -1,234 +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@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.
-
-my $ac_subs=$ARGV[0];
-my $ac_sacfiles = $ARGV[1];
-my $ac_given_srcdir=$ARGV[2];
-my $ac_given_INSTALL=$ARGV[3];
-
-#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 ($srcdir, $top_srcdir);
-my $INSTALL;
-my $bad_perl = ($] < 5.005);
-
-open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
-my @subs = <CF>;
-close(CF);
-chomp @subs;
-@comp_match=();
-@comp_subs=();
-
-if ($bad_perl) {
-    print "Using perl older than version 5.005\n";
-    foreach my $pat (@subs) {
-	if (  ($pat =~ /s%([^%]*)%([^%]*)%g/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/g% )
-	   || ($pat =~ /s%([^%]*)%([^%]*)%;t/ )
-	   || ($pat =~ m%/([^/]*)/([^/]*)/;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;
-            $repl =~ s/\\(.)/$1/g;
-	    push @comp_subs, make_closure($srch, $repl);
-
-	} elsif ( ($pat =~ /%([^%]*)%d/ )
-	   || ($pat =~ m%/([^/]*)/d% )
-	   ) {
-	    push @comp_subs, make_closure($1, "");
-	} else {
-	    die "Uhh. Malformed pattern in $ac_subs ($pat)"
-		unless ( $pat =~ /^\s*$/ );   # ignore white lines
-	}
-    }
-} else {
-    foreach my $pat (@subs) {
-       if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
-            ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
-            ($pat =~ /s,([^,]*),(.*),;t/) ) {
-         # form : s%bla%blubb%g
-         # or     s%bla%blubb%;t t   (autoconf > 2.13 and < 2.52 ?)
-         # or     s,bla,blubb,;t t   (autoconf 2.52)
-         my $srch = $1;
-         my $repl = $2;
-         push @comp_match, eval "qr/\Q$srch\E/";  # compile match pattern
-         $repl =~ s/\\(.)/$1/g;
-         push @comp_subs, $repl;
-      } elsif ( ($pat =~ /%([^%]*)%d/ )
-                || ($pat =~ m%/([^/]*)/d% )
-              ) {
-        push @comp_match, eval "qr/\Q$1\E/";
-        push @comp_subs, "";
-      } else {
-          die "Uhh. Malformed pattern in $ac_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_sacfiles") || die "can't open $ac_sacfiles: $!";
-my @ac_files = <CF>;
-close(CF);
-chomp @ac_files;
-
-
-my $ac_file;
-foreach $ac_file (@ac_files) {
-    next if $ac_file =~ /\.\./;
-    next if $ac_file =~ /^\s*$/;
-    my $ac_file_in;
-    my ($ac_dir, $ac_dots, $ac_dir_suffix);
-
-    if ($ac_file =~ /.*:.*/ ) {
-	($ac_file_in = $ac_file) =~ s%[^:]*:%%;
-	$ac_file =~ s%:.*%%;
-    } else {
-	$ac_file_in = $ac_file.".in";
-    }
-
-# Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-# Remove last slash and all that follows it.  Not all systems have dirname.
-    ($ac_dir = $ac_file) =~ s%/[^/][^/]*$%%;
-    if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) {
-# The file is in a subdirectory.
-	if (! -d "$ac_dir") { 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;
-}
--- a/admin2_13/config.sub
+++ b/admin2_13/config.sub
--- a/admin2_13/configure.in.min
+++ b/admin2_13/configure.in.min
@@ -1,57 +0,0 @@
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
- 
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
- 
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
- 
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl    Boston, MA 02111-1307, USA.
-
-# Original Author was Kalle@kde.org
-# I lifted it in some mater. (Stephan Kulow)
-# I used much code from Janos Farkas
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM 
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-KDE_PROG_LIBTOOL
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
-
-dnl KDE_USE_QT
-AC_PATH_KDE
--- a/admin2_13/debianrules
+++ b/admin2_13/debianrules
@@ -1,114 +0,0 @@
-#!/usr/bin/perl -w
-
-use Shell qw(mv cp mkdir rm) ;
-use File::Find;
-use Cwd;
-
-$origPwd = `pwd`;
-chomp $origPwd;
-
-$kde_confdir		=	"/etc/kde3";
-$kde_prefix		=	"/usr";
-$kde_bindir		=	"$kde_prefix/bin";
-$kde_includedir		=	"$kde_prefix/include/kde";
-$kde_libdir		=	"$kde_prefix/lib";
-$kde_cgidir		=	"$kde_prefix/lib/cgi-bin";
-$kde_moduledir		=	"$kde_prefix/lib/kde3";
-$kde_appsdir		=	"$kde_prefix/share/applnk";
-$kde_datadir		=	"$kde_prefix/share/apps";
-$kde_htmldir		=	"$kde_prefix/share/doc/kde/HTML";
-$kde_icondir		=	"$kde_prefix/share/icons";
-$kde_locale		=	"$kde_prefix/share/locale";
-$kde_mimedir		=	"$kde_prefix/share/mimelnk";
-$kde_servicesdir	=	"$kde_prefix/share/services";
-$kde_servicetypesdir	=	"$kde_prefix/share/servicetypes";
-$kde_sounddir		=	"$kde_prefix/share/sounds";
-$kde_templatesdir	=	"$kde_prefix/share/templates";
-$kde_wallpaperdir	=	"$kde_prefix/share/wallpapers";
-
-$mandir			=	"$kde_prefix/share/man";
-$infodir		=	"$kde_prefix/share/info";
-$sysconfdir		=	"/etc";
-
-$QTDIR			=	"/usr/share/qt";
-$IDL			=	"$kde_bindir/cuteidl";
-$DCOPIDL		=	"$kde_bindir/dcopidl";
-$DCOPIDL2CPP		=	"$kde_bindir/dcopidl2cpp";
-$KDB2HTML		=	"$kde_bindir/kdb2html";
-$MCOPIDL		=	"$kde_bindir/mcopidl";
-$ARTSCCONFIG		=	"$kde_bindir/artsc-config";
-
-if (defined $ENV{DEB_BUILD_OPTIONS} &&
-    $ENV{DEB_BUILD_OPTIONS} =~ /\bdebug\b/) {
-  $enable_debug="--enable-debug";
-  $enable_final="";
-}
-else {
-  $enable_debug="--disable-debug";
-  $enable_final="--enable-final";
-}
-
-if (@ARGV && $ARGV[0] eq 'echodirs') {
-  print STDOUT "export kde_confdir=$kde_confdir\n";
-  print STDOUT "export kde_prefix=$kde_prefix\n";
-  print STDOUT "export kde_bindir=$kde_bindir\n";
-  print STDOUT "export kde_includedir=$kde_includedir\n";
-  print STDOUT "export kde_libdir=$kde_libdir\n";
-  print STDOUT "export kde_cgidir=$kde_cgidir\n";
-  print STDOUT "export kde_moduledir=$kde_moduledir\n";
-  print STDOUT "export kde_appsdir=$kde_appsdir\n";
-  print STDOUT "export kde_datadir=$kde_datadir\n";
-  print STDOUT "export kde_htmldir=$kde_htmldir\n";
-  print STDOUT "export kde_icondir=$kde_icondir\n";
-  print STDOUT "export kde_locale=$kde_locale\n";
-  print STDOUT "export kde_mimedir=$kde_mimedir\n";
-  print STDOUT "export kde_servicesdir=$kde_servicesdir\n";
-  print STDOUT "export kde_servicetypesdir=$kde_servicetypesdir\n";
-  print STDOUT "export kde_sounddir=$kde_sounddir\n";
-  print STDOUT "export kde_templatesdir=$kde_templatesdir\n";
-  print STDOUT "export kde_wallpaperdir=$kde_wallpaperdir\n";
-
-  print STDOUT "export mandir=$mandir\n";
-  print STDOUT "export infodir=$infodir\n";
-  print STDOUT "export sysconfdir=$sysconfdir\n";
-
-  print STDOUT "export QTDIR=$QTDIR\n";
-  print STDOUT "export IDL=$IDL\n";
-  print STDOUT "export DCOPIDL=$DCOPIDL\n";
-  print STDOUT "export DCOPIDL2CPP=$DCOPIDL2CPP\n";
-  print STDOUT "export KDB2HTML=$KDB2HTML\n";
-  print STDOUT "export MCOPIDL=$MCOPIDL\n";
-  print STDOUT "export ARTSCCONFIG=$ARTSCCONFIG\n";
-  print STDOUT "export INSTALL_DATA=install -p -c -m 644\n";
-
-  print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\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/qt --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html\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/qt --mandir=\$(mandir) --infodir=\$(infodir)\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
-}
--- a/admin2_13/depcomp
+++ b/admin2_13/depcomp
@@ -1,411 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-
-   tmpdepfile1="$object.d"
-   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-   if test "$libtool" = yes; then
-      "$@" -Wc,-MD
-   else
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  # X makedepend
-  (
-    shift
-    cleared=no
-    for arg in "$@"; do
-      case $cleared in no)
-        set ""; shift
-	cleared=yes
-      esac
-      case "$arg" in
-        -D*|-I*)
-	  set fnord "$@" "$arg"; shift;;
-	-*)
-	  ;;
-	*)
-	  set fnord "$@" "$arg"; shift;;
-      esac
-    done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
--- a/admin2_13/install-sh
+++ b/admin2_13/install-sh
@@ -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
--- a/admin2_13/libtool.m4.in
+++ b/admin2_13/libtool.m4.in
--- a/admin2_13/ltconfig
+++ b/admin2_13/ltconfig
@@ -1,4 +0,0 @@
-#! /bin/sh
-# Written by <matz@kde.org> and placed into the public domain ;-)
-echo "This file shouldn't be called.  It exists solely for the purpose"
-echo "to make automake 1.4 cope with newer libtools."
--- a/admin2_13/ltmain.sh
+++ b/admin2_13/ltmain.sh
--- a/admin2_13/missing
+++ b/admin2_13/missing
@@ -1,283 +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.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
--run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.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_ac}'.  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_ac}'.  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_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  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)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar ${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
--- a/admin2_13/mkinstalldirs
+++ b/admin2_13/mkinstalldirs
@@ -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$
-
-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
--- a/admin2_13/old-libtool.m4.in
+++ b/admin2_13/old-libtool.m4.in
@@ -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*)
-  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)
-])
--- a/admin2_13/old-ltcf-c.sh
+++ b/admin2_13/old-ltcf-c.sh
@@ -1,815 +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 $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' -o $lib'
-      archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $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"' $libobjs $deplibs $compiler_flags '"$hardcode_libdir_flag_spec"' -o $lib'
-        archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_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'
-      ;;
-
-    linux*)
-      case "$CC" in
-        ccc*)
-          # Compaq C
-          # It appears that all Alpha
-          # Linux and Compaq Tru64 Unix objects are PIC.
-          ac_cv_prog_cc_static='-non_shared'
-          ;;
-	KCC*)
-	  # KAI C++
-	  ac_cv_prog_cc_pic='-fPIC'
-	  ac_cv_prog_cc_wl='--backend -Wl,'
-	  ac_cv_prog_cc_static='-Bstatic'
-	  ;;
-        *)
-          ;;
-      esac
-      ;;
-
-    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
--- a/admin2_13/old-ltcf-cxx.sh
+++ b/admin2_13/old-ltcf-cxx.sh
--- a/admin2_13/old-ltcf-gcj.sh
+++ b/admin2_13/old-ltcf-gcj.sh
@@ -1,636 +0,0 @@
-#### This script is meant to be sourced by ltconfig.
-
-# ltcf-gcj.sh - Create a GCJ compiler specific configuration
-#
-# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# Original GCJ support by:
-#    Alexandre Oliva <oliva@lsd.ic.unicamp.br>
-#
-# 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 Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-
-## 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*)
-    # 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'
-    ;;
-
-  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
-
-  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
-      # Test if we are trying to use run time linking, or normal AIX style linking.
-      # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
-      aix_use_runtimelinking=no
-      for ld_flag in $LDFLAGS; do
-        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
-          aix_use_runtimelinking=yes
-          break
-        fi
-      done
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-    # -bexpall does not export symbols beginning with underscore (_)
-    always_export_symbols=yes
-    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'
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-      archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-    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
-        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
-    ;;
-
-  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='${wl}-R$libdir'
-    hardcode_direct=yes
-    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'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$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
-
-# 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_wl='-Wl,'
-    ac_cv_prog_cc_static='-static'
-
-    case $host_os in
-    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    aix*)
-      # Below there is a dirty hack to force normal static linking with -ldl
-      # The problem is because libdl dynamically linked with both libc and
-      # libC (AIX C++ library), which obviously doesn't included in libraries
-      # list by gcc. This cause undefined symbols with -static flags.
-      # This hack allows C programs to be linked with "-static -ldl", but
-      # we not sure about C++ programs.
-      ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
-      ;;
-    *djgpp*)
-      # DJGPP does not suppot shared libraries at all
-      ac_cv_prog_cc_pic=
-      ;;
-    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'
-      ;;
-    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'
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	 ac_cv_prog_cc_pic=-Kconform_pic
-      fi
-      ;;
-    *)
-      ac_cv_prog_cc_pic='-fPIC'
-      ;;
-    esac
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-need_lc=no
-
-# All existing releases of GCJ support `-c -o'.
-lt_cv_compiler_c_o=yes
--- a/admin2_13/old-ltconfig
+++ b/admin2_13/old-ltconfig
--- a/admin2_13/old-ltmain.sh
+++ b/admin2_13/old-ltmain.sh
--- a/admin2_13/ylwrap
+++ b/admin2_13/ylwrap
@@ -1,143 +0,0 @@
-#! /bin/sh
-# ylwrap - wrapper for lex/yacc invocations.
-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Usage:
-#     ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-# * INPUT is the input file
-# * OUTPUT is file PROG generates
-# * DESIRED is file we actually want
-# * PROGRAM is program to run
-# * ARGS are passed to PROG
-# Any number of OUTPUT,DESIRED pairs may be used.
-
-# The input.
-input="$1"
-shift
-case "$input" in
- [\\/]* | ?:[\\/]*)
-    # Absolute path; do nothing.
-    ;;
- *)
-    # Relative path.  Make it absolute.
-    input="`pwd`/$input"
-    ;;
-esac
-
-# The directory holding the input.
-input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-# Quote $INPUT_DIR so we can use it in a regexp.
-# FIXME: really we should care about more than `.' and `\'.
-input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
-
-echo "got $input_rx"
-
-pairlist=
-while test "$#" -ne 0; do
-   if test "$1" = "--"; then
-      shift
-      break
-   fi
-   pairlist="$pairlist $1"
-   shift
-done
-
-# The program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
- [\\/]* | ?:[\\/]*) ;;
- *[\\/]*) prog="`pwd`/$prog" ;;
-esac
-
-# FIXME: add hostname here for parallel makes that run commands on
-# other machines.  But that might take us over the 14-char limit.
-dirname=ylwrap$$
-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
-mkdir $dirname || exit 1
-
-cd $dirname
-
-$prog ${1+"$@"} "$input"
-status=$?
-
-if test $status -eq 0; then
-   set X $pairlist
-   shift
-   first=yes
-   # Since DOS filename conventions don't allow two dots,
-   # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-   # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-   y_tab_nodot="no"
-   if test -f y_tab.c || test -f y_tab.h; then
-      y_tab_nodot="yes"
-   fi
-
-   while test "$#" -ne 0; do
-      from="$1"
-      # Handle y_tab.c and y_tab.h output by DOS
-      if test $y_tab_nodot = "yes"; then
-	 if test $from = "y.tab.c"; then
-	    from="y_tab.c"
-	 else
-	    if test $from = "y.tab.h"; then
-	       from="y_tab.h"
-	    fi
-	 fi
-      fi
-      if test -f "$from"; then
-         # If $2 is an absolute path name, then just use that,
-         # otherwise prepend `../'.
-         case "$2" in
-	   [\\/]* | ?:[\\/]*) target="$2";;
-	   *) target="../$2";;
-	 esac
-
-	 # Edit out `#line' or `#' directives.  We don't want the
-	 # resulting debug information to point at an absolute srcdir;
-	 # it is better for it to just mention the .y file with no
-	 # path.
-	 sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
-      else
-	 # A missing file is only an error for the first file.  This
-	 # is a blatant hack to let us support using "yacc -d".  If -d
-	 # is not specified, we don't want an error when the header
-	 # file is "missing".
-	 if test $first = yes; then
-	    status=1
-	 fi
-      fi
-      shift
-      shift
-      first=no
-   done
-else
-   status=$?
-fi
-
-# Remove the directory.
-cd ..
-rm -rf $dirname
-
-exit $status
--- a/admin2_5/ChangeLog
+++ b/admin2_5/ChangeLog
@@ -1,761 +0,0 @@
-2002-10-03  Stephan Kulow  <coolo@kde.org>
-	
-	* made config.h.bot obsolete
-
-2002-04-26  Stephan Kulow  <coolo@kde.org>
-
-	* acinclude.m4.in removed bogus message
-
-2001-11-07  Walter Tasin <tasin@kdevelop.org>
-
-	* now #MIN_CONFIG tag takes parameters for KDE_USE_QT, too.
-          e.g. #MIN_CONFIG(2.2) for qt 2.2 usage
-
-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 ;)
--- a/admin2_5/Doxyfile.am
+++ b/admin2_5/Doxyfile.am
@@ -1,163 +0,0 @@
-## generate API documentation with doxygen
-apidox-am-yes:
-	@if test "$(subdir)" != "."; then \
-		$(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\
-		if test ! -x $(top_builddir)/apidocs/common; then \
-			if test -d $(top_srcdir)/doc/common; then \
-			   common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\
-			else \
-	   		   common_dir=$(kde_libs_htmldir)/en/common ;\
-			fi ;\
-			$(LN_S) $$common_dir $(top_builddir)/apidocs/common; \
-		fi ;\
-		cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
-		echo "PROJECT_NAME           = \"$(subdir) Library\"" >> Doxyfile; \
-		echo "PROJECT_NUMBER         = \"Version $(VERSION)\"" >> Doxyfile; \
-		echo "INPUT                  = $(srcdir)" >> Doxyfile; \
-		echo "IMAGE_PATH             = $(top_srcdir)/doc/api" >> Doxyfile ;\
-		echo "OUTPUT_DIRECTORY       = $(top_builddir)/apidocs" >> Doxyfile; \
-		echo "HTML_OUTPUT            = $(subdir)/html" >> Doxyfile; \
-		echo "LATEX_OUTPUT           = $(subdir)/latex" >> Doxyfile; \
-		echo "RTF_OUTPUT             = $(subdir)/rtf" >> Doxyfile; \
-		echo "MAN_OUTPUT             = $(subdir)/man" >> Doxyfile; \
-		echo "GENERATE_HTML          = $(GENERATE_FLAG)" >> Doxyfile ;\
-		echo "GENERATE_MAN          = $(GENERATE_FLAG)" >> Doxyfile ;\
-		echo "GENERATE_LATEX          = $(GENERATE_FLAG)" >> Doxyfile ;\
-		if test -n "$(DOXYGEN_EXCLUDE)"; then \
-			echo "EXCLUDE_PATTERNS      += $(DOXYGEN_EXCLUDE)" >> Doxyfile; \
-		fi ;\
-		echo "TAGFILES = \\" >> Doxyfile; \
-		tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \
-			tagpath= ;\
-			path="../../$$tag" ;\
-			if test -f $(top_builddir)/apidocs/$$tag/$$tag.tag; then \
-				tagpath="$(top_builddir)/apidocs/$$tag/$$tag.tag" ;\
-			else \
-				tagpath=`ls -1 $(kde_htmldir)/en/*-apidocs/$$tag/$$tag.tag 2> /dev/null` ;\
-				if test -n "$$tagpath"; then \
-					path=`echo $$tagpath | sed -e "s,.*/\([^/]*-apidocs\)/$$tag/$$tag.tag,../../../\1/$$tag,"` ;\
-				fi ;\
-			fi ;\
-			if test "$$tag" = qt; then \
-				echo $$tagpath=$(QTDOCDIR) >> Doxyfile ;\
-			else if test -n "$$tagpath"; then \
-				echo "$$tagpath=$$path/html \\" >> Doxyfile ;\
-			    fi ;\
-			fi ;\
-		done ;\
-		echo "GENERATE_TAGFILE       = $(top_builddir)/apidocs/$(subdir)/$(subdir).tag" >> Doxyfile ;\
-		echo "IGNORE_PREFIX          = K" >> Doxyfile ;\
-		echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\
-		$(DOXYGEN) Doxyfile ;\
-	fi
-
-apidox-am-no:
-
-install-data-local: install-apidox
-
-## install API documentation
-install-apidox:
-	@if test "$(subdir)" != "."; then \
-		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html ; \
-		if test -f $(top_builddir)/apidocs/$(subdir)/$(subdir).tag; then \
-		echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
-		$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
-		fi; \
-		if test -d $(top_builddir)/apidocs/$(subdir)/html; then \
-			list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \
-			for file in $$list; do \
-				echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
-					$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
-		done; \
-		fi; \
-		rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
-		$(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
-	else\
-		if test -d $(top_builddir)/apidocs; then \
-		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
-		list=`cd $(top_builddir)/apidocs && ls -1`; \
-		for file in $$list; do \
-			if test -f $(top_builddir)/apidocs/$$file; then \
-				echo $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
-				$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
-			fi; \
-		done ; fi; \
-	fi
-
-uninstall-local: uninstall-apidox
-
-## uninstall API documentation
-uninstall-apidox:
-	@if test "$(subdir)" != "."; then \
-		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
-			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
-		fi\
-	else\
-		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
-			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
-		fi\
-	fi
-
-apidox:
-	@if test "$(subdir)" != "."; then \
-		$(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\
-	else \
-		$(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\
-	fi
-	@set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
-	    list='$(SUBDIRS)'; \
-	    for subdir in $$list; do \
-		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \
-		echo "Making apidox in $$subdir"; \
-		if test "$$subdir" != "."; then \
-			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no apidox) || exit 1; \
-		fi ; fi ;\
-	    done; \
-	    for subdir in $$list; do \
-		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \
-		echo "Making apidox in $$subdir"; \
-		if test "$$subdir" != "."; then \
-			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=yes apidox) || exit 1; \
-		fi ; fi ;\
-	    done; \
-	fi
-
-apidox-am-toplevel-no:
-apidox-am-toplevel-yes:
-	@echo "*** Creating API documentation main page"; \
-	cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
-	echo "PROJECT_NAME           = $(DOXYGEN_PROJECT_NAME)" >> Doxyfile ; \
-	echo "PROJECT_NUMBER         = $(DOXYGEN_PROJECT_NUMBER)" >> Doxyfile ; \
-	echo "INPUT                  = $(top_srcdir)" >> Doxyfile ; \
-	echo "OUTPUT_DIRECTORY       = $(top_builddir)/apidocs" >> Doxyfile ; \
-	echo "FILE_PATTERNS          = *.dox" >> Doxyfile ; \
-	echo "RECURSIVE              = NO" >> Doxyfile ; \
-	echo "SOURCE_BROWSER         = NO" >> Doxyfile ; \
-	echo "ALPHABETICAL_INDEX     = NO" >> Doxyfile ; \
-	echo "HTML_OUTPUT            = ." >> Doxyfile ; \
-	echo "HTML_HEADER            = apidocs/common/mainheader.html" >> Doxyfile ; \
-	echo "HTML_FOOTER            = apidocs/common/mainfooter.html" >> Doxyfile ; \
-	echo "HTML_STYLESHEET        = apidocs/common/doxygen.css" >> Doxyfile ; \
-	echo "GENERATE_LATEX         = NO" >> Doxyfile ; \
-	echo "GENERATE_RTF           = NO" >> Doxyfile ; \
-	echo "GENERATE_MAN           = NO" >> Doxyfile ; \
-	echo "GENERATE_XML           = NO" >> Doxyfile ; \
-	echo "GENERATE_AUTOGEN_DEF   = NO" >> Doxyfile ; \
-	echo "ENABLE_PREPROCESSING   = NO" >> Doxyfile ; \
-	echo "CLASS_DIAGRAMS         = NO" >> Doxyfile ; \
-	echo "HAVE_DOT               = NO" >> Doxyfile ; \
-	echo "GENERATE_HTML          = YES" >> Doxyfile ;\
-	$(mkinstalldirs) $(top_builddir)/apidocs ; \
-	rm -f $(top_builddir)/apidocs/common ; \
-	if test -d $(top_srcdir)/doc/common; then \
-	   common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\
-	else \
-	   common_dir=$(kde_libs_htmldir)/en/common ;\
-	fi ;\
-	$(LN_S) $$common_dir $(top_builddir)/apidocs/common ;\
-	doxygen Doxyfile; \
-	rm -f Doxyfile
-
-# Local Variables:
-# mode: makefile
-# End:
--- a/admin2_5/Makefile.common
+++ b/admin2_5/Makefile.common
@@ -1,34 +0,0 @@
-### Makefile.common
-###
-### Copyright (C) 2002 by the KDE developers
-
-### All the real work is done by the shellscript cvs.sh
-
-SHELL=/bin/sh
-
-cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge:
-	@admindir=$(admindir); \
-	if test "x$$admindir" = x; then \
-	  admindir=.; until test -f $$admindir/admin/cvs.sh; do \
-	    admindir=$$admindir/..; \
-	    if test `cd $$admindir && pwd` = / ; then break; fi; \
-	  done; \
-	  admindir=$$admindir/admin; \
-	  if test -f $$admindir/cvs.sh; then :; else \
-	    echo "Can't find the admin/ directory in any parent of the"; \
-	    echo "current directory.  Please set it with admindir=..."; \
-	    exit 1; \
-	  fi; \
-	fi; \
-	if test "$@" = "package-merge"; then \
-		MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
-	  	$(SHELL) $$admindir/cvs.sh package-merge ;\
-	else MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
-	fi
-
-configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs
-configure.files: subdirs
-
-.SILENT:
-
-.PHONY: cvs dist cvs-clean package-merge package-messages
--- a/admin2_5/acinclude.m4.in
+++ b/admin2_5/acinclude.m4.in
--- a/admin2_5/am_edit
+++ b/admin2_5/am_edit
--- a/admin2_5/compile
+++ b/admin2_5/compile
@@ -1,99 +0,0 @@
-#! /bin/sh
-
-# Wrapper for compilers which do not understand `-c -o'.
-
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-   case "$1" in
-    -o)
-       # configure might choose to run compile as `compile cc -o foo foo.c'.
-       # So we do something ugly here.
-       ofile=$2
-       shift
-       case "$ofile" in
-	*.o | *.obj)
-	   ;;
-	*)
-	   args="$args -o $ofile"
-	   ofile=
-	   ;;
-       esac
-       ;;
-    *.c)
-       cfile=$1
-       args="$args $1"
-       ;;
-    *)
-       args="$args $1"
-       ;;
-   esac
-   shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-   # If no `-o' option was seen then we might have been invoked from a
-   # pattern rule where we don't need one.  That is ok -- this is a
-   # normal compilation that the losing compiler can handle.  If no
-   # `.c' file was seen then we are probably linking.  That is also
-   # ok.
-   exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-   if mkdir $lockdir > /dev/null 2>&1; then
-      break
-   fi
-   sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-   mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
--- a/admin2_5/conf.change.pl
+++ b/admin2_5/conf.change.pl
@@ -1,190 +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@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 File::Basename;
-
-my $ac_aux_dir = dirname($0);
-my ($flag);
-local $ac_version = 0;
-my $vpath_seen = 0;
-$flag = 0;
-
-while (<>) {
-# usage of $flag: 0 -- we have seen nothing yet
-#   1 -- we are in (1)
-#   2 -- we have ended (1)
-#   3 -- we are in (2)
-#   4 -- we ended (2)
-
-    if ($flag == 4) {
-        print;
-    } elsif ($flag == 0) {
-# 1. begins with (including): "ac_max_sed_\S+\s*=\s*[0-9]+..."
-#    ends with (excluding) "CONFIG_FILE=..."
-#    in later autoconf (2.14.1) there is no CONFIG_FILES= line,
-#    but instead the (2) directly follow (1)
-        if (/^\s*ac_max_sed_([a-z]+).*=\s*([0-9]+)/ ) {
-	    $flag = 1;
-	    if ($1 eq 'lines') {
-                # lets hope its different with 2141, 
-                # wasn't able to verify that
-              if ($2 eq '48') {
-                $ac_version = 250;
-              }
-              else {
-	        $ac_version = 2141;
-              }
-	    } elsif ($1 eq 'cmds') {
-	        $ac_version = 213;
-	    }
-	    # hmm, we don't know the autoconf version, but we try anyway
-	} else {
-	    print;
-	}
-    } elsif ($flag == 1) {
-        if (/^\s*CONFIG_FILES=/ && ($ac_version != 250)) {
-	     print;
-	     $flag = 2;
-	} elsif (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) {
-	     $flag = 3;
-	}
-    } elsif ($flag == 2) {
-# 2. begins with: "for ac_file in.*CONFIG_FILES"  (the next 'for' after (1))
-#    end with: "rm -f conftest.s\*"
-# on autoconf 250, it ends with '# CONFIG_HEADER section'
-#
-# gg: if a post-processing commands section is found first, 
-#    stop there and insert a new loop to honour the case/esac.
-# (pattern: /^\s+#\sRun the commands associated with the file./)
-
-	if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) {
-	    $flag = 3;
-	} else {
-	    print;
-	}
-    } elsif ($flag == 3) {
-        if (/^\s*rm\s+-f\s+conftest/ ) {
-	    $flag = 4;
-	    &insert_main_loop();
-	} elsif (/^\s*rm\s+-f\s+.*ac_cs_root/ ) {
-	    $flag = 4;
-	    &insert_main_loop();
-	    #die "hhhhhhh";
-	    if ($ac_version != 2141) {
-	        print STDERR "hmm, don't know autoconf version\n";
-	    }
-        } elsif (/^\#\s*CONFIG_HEADER section.*|^\s+#\s(Run) the commands associated/) {
-          $flag = 4;
-          $commands = defined $1;
-          &insert_main_loop();
-          $commands && insert_command_loop();
-          if($ac_version != 250) {
-            print STDERR "hmm, something went wrong :-(\n";
-          }
-	} elsif (/VPATH/ ) {
-	    $vpath_seen = 1;
-	}
-    }
-}
-
-die "wrong input (flag != 4)" unless $flag == 4;
-print STDERR "hmm, don't know autoconf version\n" unless $ac_version;
-
-sub insert_main_loop {
-
-  if ($ac_version == 250) {
-    &insert_main_loop_250();
-  }
-  else {
-    &insert_main_loop_213();
-  }
-}
-
-sub insert_main_loop_250 {
-
-  print <<EOF;
-  #echo Doing the fast build of Makefiles -- autoconf $ac_version
-EOF
-    if ($vpath_seen) {
-        print <<EOF;
-        # VPATH subst was seen in original config.status main loop
-  echo '/^[ 	]*VPATH[ 	]*=[^:]*\$/d' >>\$tmp/subs.sed
-EOF
-      }
-  print <<EOF;
-  rm -f \$tmp/subs.files
-  for ac_file in .. \$CONFIG_FILES ; do
-      if test "x\$ac_file" != x..; then
-          echo \$ac_file >> \$tmp/subs.files
-      fi
-  done
-  if test -f \$tmp/subs.files ; then
-      perl $ac_aux_dir/config.pl "\$tmp/subs.sed" "\$tmp/subs.files" "\$srcdir" "\$INSTALL"
-  fi
-  rm -f \$tmp/subs.files
-
-fi
-EOF
-  return;
-}
-
-sub insert_main_loop_213 {
-    print <<EOF;
-#echo Doing the fast build of Makefiles -- autoconf $ac_version
-if test "x\$ac_cs_root" = "x" ; then
-    ac_cs_root=conftest
-fi
-EOF
-    if ($vpath_seen) {
-      print <<EOF;
-# VPATH subst was seen in original config.status main loop
-echo '/^[ 	]*VPATH[ 	]*=[^:]*\$/d' >> \$ac_cs_root.subs
-EOF
-    }
-    print <<EOF;
-rm -f \$ac_cs_root.sacfiles
-for ac_file in .. \$CONFIG_FILES ; do
-    if test "x\$ac_file" != x..; then
-        echo \$ac_file >> \$ac_cs_root.sacfiles
-    fi
-done
-if test -f \$ac_cs_root.sacfiles ; then
-    perl $ac_aux_dir/config.pl "\$ac_cs_root.subs" "\$ac_cs_root.sacfiles" "\$ac_given_srcdir" "\$ac_given_INSTALL"
-fi
-rm -f \$ac_cs_root.s*
-
-EOF
-    return;
-}
-
-sub insert_command_loop {
-    print <<EOF;
-  for ac_file in .. \$CONFIG_FILES ; do
-EOF
-}
--- a/admin2_5/config.guess
+++ b/admin2_5/config.guess
--- a/admin2_5/config.pl
+++ b/admin2_5/config.pl
@@ -1,235 +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@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.
-
-my $ac_subs=$ARGV[0];
-my $ac_sacfiles = $ARGV[1];
-my $ac_given_srcdir=$ARGV[2];
-my $ac_given_INSTALL=$ARGV[3];
-
-#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 ($srcdir, $top_srcdir);
-my $INSTALL;
-my $bad_perl = ($] < 5.005);
-
-open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
-my @subs = <CF>;
-close(CF);
-chomp @subs;
-@comp_match=();
-@comp_subs=();
-
-if ($bad_perl) {
-    print "Using perl older than version 5.005\n";
-    foreach my $pat (@subs) {
-	if (  ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
-	   || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
-           || ($pat =~ m/s,([^,]*),(.*),;t/)
-	   || ($pat =~ m%s/([^/]*)/([^/]*)/g% )
-	   || ($pat =~ m%s/([^/]*)/([^/]*)/;t% )
-	   ) {
-            # form : s%bla%blubb%g
-            # or     s%bla%blubb%;t t   (autoconf > 2.13 and < 2.52 ?)
-            # or     s,bla,blubb,;t t   (autoconf 2.52)
-            my $srch = $1;
-            my $repl = $2;
-            $repl =~ s/\\(.)/$1/g;
-	    push @comp_subs, make_closure($srch, $repl);
-
-	} elsif ( ($pat =~ /%([^%]*)%d/ )
-	   || ($pat =~ m%/([^/]*)/d% )
-	   ) {
-	    push @comp_subs, make_closure($1, "");
-	} else {
-	    die "Uhh. Malformed pattern in $ac_subs ($pat)"
-		unless ( $pat =~ /^\s*$/ );   # ignore white lines
-	}
-    }
-} else {
-    foreach my $pat (@subs) {
-       if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
-            ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
-            ($pat =~ /s,([^,]*),(.*),;t/) ) {
-         # form : s%bla%blubb%g
-         # or     s%bla%blubb%;t t   (autoconf > 2.13 and < 2.52 ?)
-         # or     s,bla,blubb,;t t   (autoconf 2.52)
-         my $srch = $1;
-         my $repl = $2;
-         push @comp_match, eval "qr/\Q$srch\E/";  # compile match pattern
-         $repl =~ s/\\(.)/$1/g;
-         push @comp_subs, $repl;
-      } elsif ( ($pat =~ /%([^%]*)%d/ )
-                || ($pat =~ m%/([^/]*)/d% )
-              ) {
-        push @comp_match, eval "qr/\Q$1\E/";
-        push @comp_subs, "";
-      } else {
-          die "Uhh. Malformed pattern in $ac_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_sacfiles") || die "can't open $ac_sacfiles: $!";
-my @ac_files = <CF>;
-close(CF);
-chomp @ac_files;
-
-
-my $ac_file;
-foreach $ac_file (@ac_files) {
-    next if $ac_file =~ /\.\./;
-    next if $ac_file =~ /^\s*$/;
-    my $ac_file_in;
-    my ($ac_dir, $ac_dots, $ac_dir_suffix);
-
-    if ($ac_file =~ /.*:.*/ ) {
-	($ac_file_in = $ac_file) =~ s%[^:]*:%%;
-	$ac_file =~ s%:.*%%;
-    } else {
-	$ac_file_in = $ac_file.".in";
-    }
-
-# Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-# Remove last slash and all that follows it.  Not all systems have dirname.
-    ($ac_dir = $ac_file) =~ s%/[^/][^/]*$%%;
-    if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) {
-# The file is in a subdirectory.
-	if (! -d "$ac_dir") { 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, $identline) = @_;
-    my $filedata;
-    my @infiles=split(' ', $infiles);
-    my $i=0;
-
-    foreach my $name (@infiles) {
-	if (open(CF, "< $name")) {
-	    while (<CF>) {
-		$filedata .= $_;
-	    }
-	    close(CF);
-	} else {
-	    print STDERR "can't open $name: $!"."\n";
-	}
-    }
-    if ($identline) {
-	# Put the ident in the second line.  For shitty automake 1.6x.
-	$filedata =~ s%\n%\n$identline%;
-    }
-
-    $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;
-}
--- a/admin2_5/config.sub
+++ b/admin2_5/config.sub
--- a/admin2_5/configure.in.bot.end
+++ b/admin2_5/configure.in.bot.end
@@ -1,12 +0,0 @@
-if test "$all_tests" = "bad"; then
-  if test ! "$cache_file" = "/dev/null"; then
-    echo ""    
-    echo "Please remove the file $cache_file after changing your setup"
-    echo "so that configure will find the changes next time."
-    echo ""
-  fi
-else
-  echo ""
-  echo "Good - your configure finished. Start make now"
-  echo ""
-fi
--- a/admin2_5/configure.in.min
+++ b/admin2_5/configure.in.min
@@ -1,57 +0,0 @@
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
- 
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
- 
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
- 
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl    Boston, MA 02111-1307, USA.
-
-# Original Author was Kalle@kde.org
-# I lifted it in some mater. (Stephan Kulow)
-# I used much code from Janos Farkas
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM 
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-KDE_PROG_LIBTOOL
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
-
-dnl KDE_USE_QT
-AC_PATH_KDE
--- a/admin2_5/cvs-clean.pl
+++ b/admin2_5/cvs-clean.pl
@@ -1,87 +0,0 @@
-#! /usr/bin/perl
-
-#
-# This script recursively (beginning with the current directory)
-# wipes out everything not registered in CVS.
-#
-# written by Oswald Buddenhagen <ossi@kde.org>
-#  inspired by the "old" cvs-clean target from Makefile.common
-#
-# This file is free software in terms of the BSD licence. 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 ("");
--- a/admin2_5/cvs.sh
+++ b/admin2_5/cvs.sh
@@ -1,521 +0,0 @@
-#! /bin/sh
-#
-# cvs.sh
-#
-# This file contains support code from Makefile.common
-# It defines a shell function for each known target
-# and then does a case to call the correct function.
-
-call_and_fix_autoconf()
-{
-  $AUTOCONF || exit 1
-  if test -r configure.in.in ; then
-    perl -pi -e "print \"if test \\\"x\\\$with_fast_perl\\\" = \\\"xyes\\\"; then\
-    \\n  perl -i.bak \\\$ac_aux_dir/conf.change.pl \\\$CONFIG_STATUS\
-    \\\\\\n    || mv \\\$CONFIG_STATUS.bak \\\$CONFIG_STATUS\
-    \\n  rm -f \\\$CONFIG_STATUS.bak\\nfi\
-    \\n\" if /^\\s*chmod\\s+.*\\+x\\s+.*CONFIG_STATUS/;" configure
-  fi
-}
-
-strip_makefile()
-{
-  if test -f $makefile_wo; then :; else
-    perl -e '$in=0; while ( <> ) { $in = 1 if ($_=~ m/^if /); print $_ unless ($in); $in = 0 if ($_ =~ m/^endif/); }' < Makefile.am.in > $makefile_wo
-  fi
-}
-
-check_autotool_versions()
-{
-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 2.52, 2.53 or 2.54"
-    exit 1
-    ;;
-  * )
-    echo "*** YOU'RE USING $AUTOCONF_VERSION."
-    echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
-    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 2.52 or 2.53 (part of autoconf)"
-    exit 1
-    ;;
-  * )
-    echo "*** YOU'RE USING $AUTOHEADER_VERSION."
-    echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
-    exit 1
-    ;;
-esac
-
-AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
-case $AUTOMAKE_STRING in
-  automake*1.5d* | automake*1.5* | automake*1.5-* )
-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
-    echo "*** KDE requires automake 1.6.1 or newer"
-    exit 1
-    ;;
-  automake*1.6.* | automake*1.7* ) : ;;
-  "" )
-    echo "*** AUTOMAKE NOT FOUND!."
-    echo "*** KDE requires automake 1.6.1 or newer"
-    exit 1
-    ;;
-  unsermake* ) :
-    echo "*** YOU'RE USING UNSERMAKE."
-    echo "*** GOOD LUCK!! :)"
-    ;;
-  * )
-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
-    echo "*** KDE requires automake 1.6"
-    exit 1
-    ;;
-esac
-}
-
-cvs()
-{
-check_autotool_versions
- 
-### Produce acinclude.m4
-if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
-  echo "*** Creating acinclude.m4"
-  rm -f acinclude.m4 configure.files
-  
-  strip_makefile
-  $MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4
-fi
-
-### 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 subdirs configure.in
-  echo "*** Creating list of subdirectories"
-  subdirs
-  echo "*** Creating configure.in"
-  configure_files
-  strip_makefile
-  $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
-fi
-
-echo "*** Creating aclocal.m4"
-$ACLOCAL || 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"
-###
-if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
-  strip_makefile
-  $MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4
-fi
-if test -r configure.in.in; then
-  subdirs
-  configure_files
-  strip_makefile
-  $MAKE -f $makefile_wo top_srcdir=. ./configure.in
-fi
-$ACLOCAL
-$AUTOHEADER
-$AUTOMAKE --foreign --include-deps
-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
-$AUTOHEADER
-$AUTOMAKE --foreign --include-deps
-perl -w ../admin/am_edit
-call_and_fix_autoconf
-}
-
-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; }
-cat `fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"` > configure.in.new
-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
-  done
-fi
-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 inst-apps; then
-    if grep "^$topleveldir" inst-apps > /dev/null 2>&1; then :; else
-	continue
-    fi
-  fi
-  if test -f $topleveldir/configure.in; then
-	continue
-  fi
-  if test -f $i/Makefile.am; then :; else
-	continue
-  fi
-  if test "$i" = "."; then
-     echo "AC_CONFIG_FILES([ Makefile ])" >> configure.in.new
-  else
-     echo "AC_CONFIG_FILES([ $i/Makefile ])" >> configure.in.new
-  fi
-  if test -n "$UNSERMAKE"; then
-      if test "$i" = "."; then
-        echo "AC_CONFIG_FILES([ Makefile.rules ])" >> configure.in.new
-      else
-        echo "AC_CONFIG_FILES([ $i/Makefile.rules ])" >> configure.in.new
-      fi
-  fi
-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.1.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()
-{
-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
-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" | sort`"
-   done
-else
-   list=`find . -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | sort`
-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
-}
-
-subdirs()
-{
-dirs=
-idirs=
-if test -f inst-apps; then
-   idirs=`cat inst-apps`
-else
-   idirs=`ls -1`
-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 -f Makefile.am.in; then
-  if test -n "$UNSERMAKE"; then
-    cp 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
-if test -r subdirs && diff subdirs _SUBDIRS > /dev/null; then
-  rm -f _SUBDIRS
-fi
-test -r _SUBDIRS && mv _SUBDIRS subdirs || true
-}
-
-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
-  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>) { next if (/^(if|else|endif)\s/); 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 -ktranslate -kaliasLocale -x ${includedir:-$KDEDIR/include}/kde.pot" \
-	messages 
-   ) 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
-}
-
-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
-if test -f Makefile.am.in; then
-  makefile_am=Makefile.am.in
-  makefile_wo=Makefile.am.in.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 ) $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.am.in.wo; then
-  rm Makefile.am.in.wo
-fi
-
-exit 0
--- a/admin2_5/debianrules
+++ b/admin2_5/debianrules
@@ -1,119 +0,0 @@
-#!/usr/bin/perl -w
-
-use Shell qw(mv cp mkdir rm) ;
-use File::Find;
-use Cwd;
-
-$origPwd = `pwd`;
-chomp $origPwd;
-
-$kde_confdir		=	"/etc/kde3";
-$kde_prefix		=	"/usr";
-$kde_bindir		=	"$kde_prefix/bin";
-$kde_includedir		=	"$kde_prefix/include/kde";
-$kde_libdir		=	"$kde_prefix/lib";
-$kde_cgidir		=	"$kde_prefix/lib/cgi-bin";
-$kde_moduledir		=	"$kde_prefix/lib/kde3";
-$kde_appsdir		=	"$kde_prefix/share/applnk";
-$kde_datadir		=	"$kde_prefix/share/apps";
-$kde_htmldir		=	"$kde_prefix/share/doc/kde/HTML";
-$kde_icondir		=	"$kde_prefix/share/icons";
-$kde_locale		=	"$kde_prefix/share/locale";
-$kde_mimedir		=	"$kde_prefix/share/mimelnk";
-$kde_servicesdir	=	"$kde_prefix/share/services";
-$kde_servicetypesdir	=	"$kde_prefix/share/servicetypes";
-$kde_sounddir		=	"$kde_prefix/share/sounds";
-$kde_templatesdir	=	"$kde_prefix/share/templates";
-$kde_wallpaperdir	=	"$kde_prefix/share/wallpapers";
-
-$mandir			=	"$kde_prefix/share/man";
-$infodir		=	"$kde_prefix/share/info";
-$sysconfdir		=	"/etc";
-
-$QTDIR			=	"/usr/share/qt3";
-$IDL			=	"$kde_bindir/cuteidl";
-$DCOPIDL		=	"$kde_bindir/dcopidl";
-$DCOPIDL2CPP		=	"$kde_bindir/dcopidl2cpp";
-$KDB2HTML		=	"$kde_bindir/kdb2html";
-$MCOPIDL		=	"$kde_bindir/mcopidl";
-$ARTSCCONFIG		=	"$kde_bindir/artsc-config";
-
-if (defined $ENV{DEB_BUILD_OPTIONS} &&
-    $ENV{DEB_BUILD_OPTIONS} =~ /\bdebug\b/) {
-  $enable_debug="--enable-debug";
-  $enable_final="";
-}
-else {
-  $enable_debug="--disable-debug";
-   if (defined $ENV{DEB_BUILD_OPTIONS} &&
-      $ENV{DEB_BUILD_OPTIONS} =~ /\bnofinal\b/) {
-      $enable_final="";
-   } else {
-      $enable_final="--enable-final";
-   }
-}
-
-if (@ARGV && $ARGV[0] eq 'echodirs') {
-  print STDOUT "export kde_confdir=$kde_confdir\n";
-  print STDOUT "export kde_prefix=$kde_prefix\n";
-  print STDOUT "export kde_bindir=$kde_bindir\n";
-  print STDOUT "export kde_includedir=$kde_includedir\n";
-  print STDOUT "export kde_libdir=$kde_libdir\n";
-  print STDOUT "export kde_cgidir=$kde_cgidir\n";
-  print STDOUT "export kde_moduledir=$kde_moduledir\n";
-  print STDOUT "export kde_appsdir=$kde_appsdir\n";
-  print STDOUT "export kde_datadir=$kde_datadir\n";
-  print STDOUT "export kde_htmldir=$kde_htmldir\n";
-  print STDOUT "export kde_icondir=$kde_icondir\n";
-  print STDOUT "export kde_locale=$kde_locale\n";
-  print STDOUT "export kde_mimedir=$kde_mimedir\n";
-  print STDOUT "export kde_servicesdir=$kde_servicesdir\n";
-  print STDOUT "export kde_servicetypesdir=$kde_servicetypesdir\n";
-  print STDOUT "export kde_sounddir=$kde_sounddir\n";
-  print STDOUT "export kde_templatesdir=$kde_templatesdir\n";
-  print STDOUT "export kde_wallpaperdir=$kde_wallpaperdir\n";
-
-  print STDOUT "export mandir=$mandir\n";
-  print STDOUT "export infodir=$infodir\n";
-  print STDOUT "export sysconfdir=$sysconfdir\n";
-
-  print STDOUT "export QTDIR=$QTDIR\n";
-  print STDOUT "export IDL=$IDL\n";
-  print STDOUT "export DCOPIDL=$DCOPIDL\n";
-  print STDOUT "export DCOPIDL2CPP=$DCOPIDL2CPP\n";
-  print STDOUT "export KDB2HTML=$KDB2HTML\n";
-  print STDOUT "export MCOPIDL=$MCOPIDL\n";
-  print STDOUT "export ARTSCCONFIG=$ARTSCCONFIG\n";
-  print STDOUT "export INSTALL_DATA=install -p -c -m 644\n";
-
-  print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir)\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\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)\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
-}
--- a/admin2_5/depcomp
+++ b/admin2_5/depcomp
@@ -1,411 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-
-   tmpdepfile1="$object.d"
-   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-   if test "$libtool" = yes; then
-      "$@" -Wc,-MD
-   else
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  # X makedepend
-  (
-    shift
-    cleared=no
-    for arg in "$@"; do
-      case $cleared in no)
-        set ""; shift
-	cleared=yes
-      esac
-      case "$arg" in
-        -D*|-I*)
-	  set fnord "$@" "$arg"; shift;;
-	-*)
-	  ;;
-	*)
-	  set fnord "$@" "$arg"; shift;;
-      esac
-    done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
--- a/admin2_5/detect-autoconf.sh
+++ b/admin2_5/detect-autoconf.sh
@@ -1,81 +0,0 @@
-#! /bin/sh
-
-# Global variables...
-AUTOCONF="autoconf"
-AUTOHEADER="autoheader"
-AUTOM4TE="autom4te"
-AUTOMAKE="automake"
-ACLOCAL="aclocal"
-
-
-# We don't use variable here for remembering the type ... strings.
-# local variables are not that portable, but we fear namespace issues with
-# our includer.  The repeated type calls are not that expensive.
-checkAutoconf()
-{
-  if test -x "`$WHICH autoconf-2.5x`" ; then	
-    AUTOCONF="`$WHICH autoconf-2.5x`"
-  elif test -x "`$WHICH autoconf-2.54`" ; then
-    AUTOCONF="`$WHICH autoconf-2.54`"
-  elif test -x "`$WHICH autoconf-2.53`" ; then
-    AUTOCONF="`$WHICH autoconf-2.53`"
-  elif test -x "`$WHICH autoconf-2.53a`" ; then
-    AUTOCONF="`$WHICH autoconf-2.53a`"
-  elif test -x "`$WHICH autoconf-2.52`" ; then
-    AUTOCONF="`$WHICH autoconf-2.52`"
-  elif test -x "`$WHICH autoconf2.50`" ; then
-    AUTOCONF="`$WHICH autoconf2.50`"
-  fi
-}
-
-checkAutoheader()
-{
-  if test -x "`$WHICH autoheader-2.5x`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.5x`"
-    AUTOM4TE="`$WHICH autom4te-2.5x`"
-  elif test -x "`$WHICH autoheader-2.54`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.54`"
-    AUTOM4TE="`$WHICH autom4te-2.54`"
-  elif test -x "`$WHICH autoheader-2.53`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.53`"
-    AUTOM4TE="`$WHICH autom4te-2.53`"
-  elif test -x "`$WHICH autoheader-2.53a`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.53a`"
-    AUTOM4TE="`$WHICH autom4te-2.53a`"
-  elif test -x "`$WHICH autoheader-2.52`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.52`"
-  elif test -x "`$WHICH autoheader2.50`" ; then
-    AUTOHEADER="`$WHICH autoheader2.50`"
-  fi
-}
-
-checkAutomakeAclocal ()
-{
-  if test -z "$UNSERMAKE"; then
-    if test -x "`$WHICH automake-1.6`" ; then
-      AUTOMAKE="`$WHICH automake-1.6`"
-      ACLOCAL="`$WHICH aclocal-1.6`"
-    elif test -x "`$WHICH automake-1.7`" ; then
-      AUTOMAKE="`$WHICH automake-1.7`"
-      ACLOCAL="`$WHICH aclocal-1.7`"
-    fi
-  else
-     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
--- a/admin2_5/install-sh
+++ b/admin2_5/install-sh
@@ -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
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f "$src" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		:
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		:
-	fi
-
-# Make a 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 :;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 rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
--- a/admin2_5/libtool.m4.in
+++ b/admin2_5/libtool.m4.in
--- a/admin2_5/ltmain.sh
+++ b/admin2_5/ltmain.sh
--- a/admin2_5/missing
+++ b/admin2_5/missing
@@ -1,336 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
--run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
--- a/admin2_5/mkinstalldirs
+++ b/admin2_5/mkinstalldirs
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
--- a/admin2_5/nmcheck
+++ b/admin2_5/nmcheck
@@ -1,371 +0,0 @@
-#!/usr/bin/perl -w
-
-# Check namespace cleanness of a library.
-# Allowed symbols are passed as arguments.
-# They may have trailing * = wildcard.
-# Wildcards may be also specified as *::* (e.g. K*::* for all KDE classes)
-# Symbols are listed as full function unmangled names without arguments,
-# e.g. 'foo bar* nspace::*' allows foo(), foo(int), bar(), barbar()
-# and all symbols in namespace/class nspace.
-# If an argument has comma in it, it's a filename of a file containing
-# allowed symbols, one per line.
-
-
-$thisProg   = "$0";     # This programs name
-
-$library = "";
-$allowed_symbols = "";
-$debug = 0;
-$allowed_weak = "";
-$weak_specified = 0;
-
-while( defined( $ARGV[ 0 ] ))
-{
-    $_ = shift;
-    if( /^--verbose$|^-v$/ )
-    {
-	$debug = 1;
-    }
-    elsif( /^--help$|^-h$/ )
-    {
-        print STDOUT "Usage $thisProg [OPTION] ... library [allowed symbols] ...\n",
-                "\n",
-		"Check if the given library has only allowed public symbols.\n",
-                "\n",
-		"  --allowweak=[symbol] allow only these weak symbols\n",
-                "  -v, --verbose        verbosely list files processed\n",
-                "  -h, --help           print this help, then exit\n";
-        exit 0;
-    }
-    elsif( /^--allowweak=(.*)$/ )
-    {
-	$allowed_weak .= " " . $1;
-	$weak_specified = 1;
-    }
-    elsif( /^--allowweak$/ ) # simply list all weak
-    {
-	$allowed_weak .= " ";
-	$weak_specified = 1;
-    }
-    elsif( /^--*/ )
-    {
-	die "Invalid argument!\n";
-    }
-    else
-    {
-	if( ! $library )
-	{
-	    $library = $_;
-	}
-	else
-	{
-	    $allowed_symbols .= " " . $_;
-	}
-    }
-}
-
-if( ! $weak_specified )
-{
-    $allowed_weak = "*"; 
-    # allow all weak symbols by default
-    # instances of templates and similar stuff - unfortunately includes also things from other libraries,
-    # so it cannot be on by default
-}
-
-print STDERR "library:" . $library . "\n" if $debug;
-print STDERR "allowed_symbols:" . $allowed_symbols . "\n" if $debug;
-print STDERR "allowed_weak:" . $allowed_weak . "\n" if $debug;
-
-$default_symbols = "_fini _init";  # system symbols
-# on my system, every .so has :
-# A _DYNAMIC
-# A _GLOBAL_OFFSET_TABLE_
-# A __bss_start
-# A _edata
-# A _end
-# T _fini
-# T _init
-# no need to list A symbols in $default_symbols
-
-print STDERR "default_symbols: " . $default_symbols . "\n" if $debug;
-
-print STDOUT "Namespace cleanness check for " . $library . " :\n";
-
-$lib_file = "";
-if( $library =~ /\.la$/ )
-{
-    # get the real library file from .la
-    open( FILEIN, $library ) || die "Couldn't open $! !\n";
-    while( $line = <FILEIN> )
-    {
-	if( $line =~ /library_names=\'([^ ]*).*/o )
-	{
-	    $lib_file = $1;
-	}
-    }
-    close( FILEIN );
-    if( ! $lib_file )
-    {
-	print STDERR "Library file not found in .la file!\n";
-	exit 1;
-    }
-    my $libpath = $library;
-    $libpath =~ s%[^/]*$%%;
-    if(  -e $libpath . ".libs/" . $lib_file )
-    {
-	$lib_file = $libpath . ".libs/" . $lib_file;
-    }
-    else
-    {
-	$lib_file = $libpath . $lib_file;
-    }
-}
-else
-{
-    $lib_file = $library;
-}
-
-print STDERR "libfile: ". $lib_file . "\n" if $debug;
-
-$allowed_symbols .= " " . $default_symbols;
-
-sub process_symbols($\@\%\@);
-
-@wildcards = ();
-%exacts = ();
-@regwildcards = ();
-process_symbols( $allowed_symbols, @wildcards, %exacts, @regwildcards );
-@weak_wildcards = ();
-%weak_exacts = ();
-@weak_regwildcards = ();
-process_symbols( $allowed_weak, @weak_wildcards, %weak_exacts, @weak_regwildcards );
-
-# grep is for stripping not exported symbols, which don't have address (=first column)
-$nm_command = "nm -BDCg " . $lib_file . " | grep -v '^ ' |";
-
-# TODO how portable is this nmcheck stuff?
-
-print STDERR "nm command:" . $nm_command . "\n" if $debug;
-
-open( FILEIN, $nm_command ) || die "nm command failed\n";
-
-my $exit_code = 0;
-
-while( $line = <FILEIN> )
-{
-    my $type;
-    my $symbol;
-    if( $line =~ /^[^ ]* (.) (.*)$/o )
-    {
-	$type = $1;
-	$symbol = $2;
-    }
-    else
-    {
-	die "Invalid line: " . $line . "\n";
-    }
-    
-    print STDERR "Type: " . $type . " , symbol: " . $symbol . "\n" if $debug;
-    if( $type eq "A" )
-    { # these should be system symbols, so ignore them
-	next;
-    }
-
-    my $orig_symbol = $symbol;
-
-    if( $symbol =~ /\(anonymous namespace\)/o )
-    { # TODO tell to prefer named namespaces? (shorter symbols)
-	next;
-    }
-
-    # strip prefixes
-    # the :: appending is to make "CLASS::*" work also for "vtable for CLASS"
-    $symbol =~ s/^typeinfo for (.*)$/$1::/o;
-    $symbol =~ s/^typeinfo fn for (.*)$/$1::/o;
-    $symbol =~ s/^typeinfo name for (.*)$/$1::/o;
-    $symbol =~ s/^vtable for (.*)$/$1::/o;
-    $symbol =~ s/^guard variable for (.*)$/$1::/o;
-    $symbol =~ s/^reference temporary for (.*)$/$1::/o;
-    $symbol =~ s/^VTT for (.*)$/$1::/o;
-    $symbol =~ s/^virtual thunk \[[^\]]*\] to (.*)$/$1::/o;
-    $symbol =~ s/^non-virtual thunk \[[^\]]*\] to (.*)$/$1::/o;
-    $symbol =~ s/^covariant return thunk \[[^\]]*\] to (.*)$/$1::/o;
-    $symbol =~ s/^construction vtable thunk for (.*)$/$1::/o;
-    $symbol =~ s/^construction vtable for .*-in-(.*) [0-9]*$/$1::/o;
-
-    # templates seem to have also return types mangled in their name, and nm prints it too
-    # they have also template arguments in the symbol
-    # get rid of both of those
-    while( $symbol =~ /<.*>/o )
-    {
-        $symbol =~ s/<[^<>]*>//o; # strip innermost <>
-    }
-    if( $symbol !~ /operator\(\)/o )
-    {
-	$symbol =~ s/ ?\(.*\).*$//o;  # strip () and all after it
-    }
-    else
-    {
-	$symbol =~ s/(^|:| )operator\(\) ?\(.*\).*$//o;  # strip () and all after it
-    }
-    $symbol =~ s/\[.*\] *$//o;   # strip [in-charge] etc.
-    if( $symbol =~ /(^|:| )operator /o )
-    {
-	$symbol =~ s/.* ([^\s]*)operator /$1/o; # strip everything before 'X::operator blah'
-    }
-    else
-    {
-	$symbol =~ s/.* ([^\s]+) *$/$1/o;  # get last word (strip return type)
-    }
-
-    # print STDERR "Processed symbol: " . $symbol . "\n" if $debug;
-    
-    my $found = 0;
-    if( $exacts{ $symbol } )
-    {
-	$found = 1;
-    }
-    if( ! $found )
-    {
-	for my $wild ( @wildcards )
-	{
-	    if( index( $symbol, $wild ) == 0 )
-	    {
-		$found = 1;
-		last;
-	    }
-	}
-    }
-    if( ! $found )
-    {
-	for my $wild ( @regwildcards )
-	{
-	    if( $symbol =~ /^$wild$/ )
-	    {
-		$found = 1;
-		last;
-	    }
-	}
-    }
-    if( ( ! $found ) && ( $type eq "W" || $type eq "V" ))
-    {
-	if( $weak_exacts{ $symbol } )
-	{
-	    $found = 1;
-	}
-	if( ! $found )
-	{
-	    for my $wild ( @weak_wildcards )
-	    {
-	        if( index( $symbol, $wild ) == 0 )
-	        {
-	    	    $found = 1;
-		    last;
-		}
-	    }
-	}
-	if( ! $found )
-	{
-	    for my $wild ( @weak_regwildcards )
-	    {
-	        if( $symbol =~ /^$wild$/ )
-	        {
-		    $found = 1;
-		    last;
-	        }
-	    }
-	}
-    }
-
-    if( ! $found )
-    {
-	print STDERR "Public symbol " . $orig_symbol . " is not allowed!\n";
-	$exit_code = 1;
-    }
-}
-
-close( FILEIN );
-
-print STDOUT $exit_code == 0 ? "OK\n" : "FAILED\n";
-
-exit $exit_code;
-
-sub process_symbols($\@\%\@)
-{
-    my $allowed_symbols = $_[ 0 ];
-    my $wildcards_ref = $_[ 1 ];
-    my $exacts_ref = $_[ 2 ];
-    my $regwildcards_ref = $_[ 3 ];
-    
-    $allowed_symbols =~ s/^ *//o;  # strip whitespace
-    $allowed_symbols =~ s/ *$//o;
-
-    if( $allowed_symbols eq "NONE" )
-    {
-	$allowed_symbols = "";
-    }
-
-    my @symbols1 = split( ' ', $allowed_symbols );
-    my $i = 0;
-    my @symbols2 = ();
-    while( defined( $symbols1[ $i ] ))
-    {
-	my $symbol = $symbols1[ $i ];
-	if( $symbol =~ /\./ )  # dot in name -> file
-	{
-	    open( SYMIN, $symbol ) || die ( "Cannot open file " . $symbol . "!" );
-	    while( $line = <SYMIN> )
-	    {
-		$line =~ s/^\s*//o;  # strip whitespace
-		$line =~ s/\s*$//o;
-		if( $line !~ /^$/o  # empty line
-		    &&  $line !~ /^\s*#/ ) # comment line starting with #
-		{
-		    $symbols2[ $#symbols2 + 1 ] = $line;
-		}
-	    }
-	    close( SYMIN );
-	}
-	else
-	{
-	    $symbols2[ $#symbols2 + 1 ] = $symbol;
-	}
-	$i++;
-    }
-    $i = 0;
-    while( defined( $symbols2[ $i ] ))
-    {
-	my $symbol = $symbols2[ $i ];
-	if( $symbol =~ /__/
-	    || $symbol =~ /^_[A-Z]/ )
-	{ # ISO C++ 2.10.2
-	    die "Symbols containing a double underscore or beginning with an underscore and an upper-case letter are reserved!\n";
-	}
-	elsif( $symbol eq "main"
-	    || $symbol eq "main*" )
-	{
-	    die "Symbol main is not allowed!\n";
-	}
-	if( $symbol =~ /^([^\*]*)\*$/o   # trailing * without any * before it
-	    && $symbol !~ /operator\*$/o )
-        {
-	    print STDERR "wildcard:" . $symbol . "\n" if $debug;
-    	    $wildcards_ref->[ $#{$wildcards_ref} + 1 ] = $1;
-	}
-	elsif( $symbol =~ /\*$/o
-	    && ( $symbol =~ /\*::/o || $symbol =~ /::\*/o )
-	    && $symbol !~ /^\*/o
-	    && $symbol !~ /operator\*$/o )
-	{
-	    print STDERR "regwildcard:" . $symbol . "\n" if $debug;
-	    $symbol =~ s/\*/\.\*/go;  # change * to .* (regexp)
-	    $regwildcards_ref->[ $#{$regwildcards_ref} + 1 ] = $symbol;
-	}
-	else
-	{
-	    print STDERR "exact:" . $symbol . "\n" if $debug;
-	    $exacts_ref->{ $symbol } = 1;
-	}
-	$i++;
-    }
-}
--- a/admin2_5/ylwrap
+++ b/admin2_5/ylwrap
@@ -1,143 +0,0 @@
-#! /bin/sh
-# ylwrap - wrapper for lex/yacc invocations.
-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Usage:
-#     ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-# * INPUT is the input file
-# * OUTPUT is file PROG generates
-# * DESIRED is file we actually want
-# * PROGRAM is program to run
-# * ARGS are passed to PROG
-# Any number of OUTPUT,DESIRED pairs may be used.
-
-# The input.
-input="$1"
-shift
-case "$input" in
- [\\/]* | ?:[\\/]*)
-    # Absolute path; do nothing.
-    ;;
- *)
-    # Relative path.  Make it absolute.
-    input="`pwd`/$input"
-    ;;
-esac
-
-# The directory holding the input.
-input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-# Quote $INPUT_DIR so we can use it in a regexp.
-# FIXME: really we should care about more than `.' and `\'.
-input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
-
-echo "got $input_rx"
-
-pairlist=
-while test "$#" -ne 0; do
-   if test "$1" = "--"; then
-      shift
-      break
-   fi
-   pairlist="$pairlist $1"
-   shift
-done
-
-# The program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
- [\\/]* | ?:[\\/]*) ;;
- *[\\/]*) prog="`pwd`/$prog" ;;
-esac
-
-# FIXME: add hostname here for parallel makes that run commands on
-# other machines.  But that might take us over the 14-char limit.
-dirname=ylwrap$$
-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
-mkdir $dirname || exit 1
-
-cd $dirname
-
-$prog ${1+"$@"} "$input"
-status=$?
-
-if test $status -eq 0; then
-   set X $pairlist
-   shift
-   first=yes
-   # Since DOS filename conventions don't allow two dots,
-   # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-   # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-   y_tab_nodot="no"
-   if test -f y_tab.c || test -f y_tab.h; then
-      y_tab_nodot="yes"
-   fi
-
-   while test "$#" -ne 0; do
-      from="$1"
-      # Handle y_tab.c and y_tab.h output by DOS
-      if test $y_tab_nodot = "yes"; then
-	 if test $from = "y.tab.c"; then
-	    from="y_tab.c"
-	 else
-	    if test $from = "y.tab.h"; then
-	       from="y_tab.h"
-	    fi
-	 fi
-      fi
-      if test -f "$from"; then
-         # If $2 is an absolute path name, then just use that,
-         # otherwise prepend `../'.
-         case "$2" in
-	   [\\/]* | ?:[\\/]*) target="$2";;
-	   *) target="../$2";;
-	 esac
-
-	 # Edit out `#line' or `#' directives.  We don't want the
-	 # resulting debug information to point at an absolute srcdir;
-	 # it is better for it to just mention the .y file with no
-	 # path.
-	 sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
-      else
-	 # A missing file is only an error for the first file.  This
-	 # is a blatant hack to let us support using "yacc -d".  If -d
-	 # is not specified, we don't want an error when the header
-	 # file is "missing".
-	 if test $first = yes; then
-	    status=1
-	 fi
-      fi
-      shift
-      shift
-      first=no
-   done
-else
-   status=$?
-fi
-
-# Remove the directory.
-cd ..
-rm -rf $dirname
-
-exit $status
--- a/6
+++ b/6
@@ -1 +1,7 @@
+#! /bin/sh
+
+echo "Bootstrap is now trying to create a ./configure script suitable for Kdenlive"
+echo "WARNING: running bootstrap is only usefull when checking out Kdenlive from CVS."
+echo ""
+
 make -f admin/Makefile.common
--- a/configure.in
+++ b/configure.in
@@ -1,93 +0,0 @@
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
- 
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
- 
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
- 
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl    Boston, MA 02111-1307, USA.
-
-# Original Author was Kalle@kde.org
-# I lifted it in some mater. (Stephan Kulow)
-# I used much code from Janos Farkas
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM 
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdenlive, 0.2.3) 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
-
-KDE_USE_QT(3)
-AC_PATH_KDE
-#MIN_CONFIG(3)
-
-dnl PACKAGE set before
-
-dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
-dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
-dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
-
-dnl KDE_NEED_FLEX dnl __kdevelop__
-dnl AC_PROG_YACC dnl __kdevelop__
-
-KDE_CREATE_SUBDIRSLIST
-AC_CONFIG_FILES([ Makefile ])
-AC_CONFIG_FILES([ doc/Makefile ])
-AC_CONFIG_FILES([ doc/en/Makefile ])
-AC_CONFIG_FILES([ doc/fr/Makefile ])
-AC_CONFIG_FILES([ graphics/Makefile ])
-AC_CONFIG_FILES([ icons/Makefile ])
-AC_CONFIG_FILES([ icons/hicolor/Makefile ])
-AC_CONFIG_FILES([ icons/hicolor/32x32/Makefile ])
-AC_CONFIG_FILES([ icons/hicolor/32x32/actions/Makefile ])
-AC_CONFIG_FILES([ kdenlive/Makefile ])
-AC_CONFIG_FILES([ po/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
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,11 +1,78 @@
-#MIN_CONFIG(3)
+#MIN_CONFIG(3.2.0)

-AM_INIT_AUTOMAKE(kdenlive,0.2.3)
+AM_INIT_AUTOMAKE(kdenlive, 0.4)
+AC_C_BIGENDIAN
+AC_CHECK_KDEMAXPATHLEN

-dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
-dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
-dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
+KDE_FIND_PATH(mlt-config, MLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+	AC_MSG_WARN([Could not find mlt-config anywhere, check http://mlt.sourceforge.net/])
+	HELP_SUBDIR=
+])
+
+if test -n "$MLT_CONFIG"; 
+then
+	vers=`$MLT_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	if test -n "$vers" && test "$vers" -ge 0001001 
+	then
+		LIBMLT_LIBS="`$MLT_CONFIG --libs`"
+
+		LIBMLT_RPATH=
+		for args in $LIBMLT_LIBS; do
+			case $args in
+				-L*)
+					LIBMLT_RPATH="$LIBMLT_RPATH $args"
+					;;
+			esac
+		done
+
+		LIBMLT_RPATH=`echo $LIBMLT_RPATH | sed -e "s/-L/-R/g"`
+		LIBMLT_CFLAGS="`$MLT_CONFIG --cflags`"
+	else
+		AC_MSG_WARN([You need at least mlt 0.1.1])	
+		HELP_SUBDIR=
+	fi
+fi	
+
+AC_SUBST(LIBMLT_LIBS)
+AC_SUBST(LIBMLT_CFLAGS)
+
+dnl check libraries
+
+# LIBRAW1394
+
+#PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.1.0)
+#AC_SUBST(LIBRAW1394_CFLAGS)
+#AC_SUBST(LIBRAW1394_LIBS)
+
+# LIBIEC61883
+
+PKG_CHECK_MODULES(LIBIEC61883, libiec61883 >= 1.0.0, 
+[use_iec61883=yes],
+[use_iec61883=no])
+AC_SUBST(LIBIEC61883_CFLAGS)
+AC_SUBST(LIBIEC61883_LIBS)
+
+# LIBAVC1394
+
+AC_CHECK_HEADER([libavc1394/avc1394.h],
+[use_avc=yes],
+[use_avc=no])
+
+#AC_CHECK_LIB(avc1394, avc1394_vcr_play,[use_avc2=yes],
+#[use_avc2=no], [$LIBRAW1394_LIBS -lm])
+
+if test "$use_iec61883" = "yes"; then
+  CXXFLAGS="$CXXFLAGS -DENABLE_FIREWIRE"
+fi
+
+AM_CONDITIONAL(ENABLE_FIREWIRE, test "$use_iec61883" = "yes")
+AC_OUTPUT
+if test "$use_iec61883" = "no"; then
+ echo " ****************************************** "
+ echo "WARNING: You do not have LIBIEC61883 >= 1.0.0."
+ echo "Firewire export / import will be disabled."
+ echo "Please install it from: www.linux1394.org"
+ echo " ****************************************** "
+fi

-dnl KDE_NEED_FLEX dnl __kdevelop__
-dnl AC_PROG_YACC dnl __kdevelop__

--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+kdenlive (0.3) unstable; urgency=low
+
+  * Initial Release.
+
+ -- one <jbm@kdemail.org>  Wed, 17 May 2006 21:04:42 +0200
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+4
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: kdenlive
+Section: multimedia
+Priority: optional
+Maintainer: Jean-Baptiste Mardelle <jbm@kdemail.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev
+Standards-Version: 3.6.2
+
+Package: kdenlive
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Non linear video editor for KDE
+ Kdenlive is a multi track video editor. It is based on the MLT
+ video framework and the FFMPEG libraries. You can directly
+ insert files in many formats (MPEG, dv, AVI, DIVX, PNG, JPEG, WAV, MP3)
+ and mix them using effects and transitions.
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,26 @@
+This is kdenlive, written and maintained by one <jbm@kdemail.org>
+on Wed, 17 May 2006 21:04:42 +0200.
+
+The original source can always be found at:
+	ftp://ftp.debian.org/dists/unstable/main/source/
+
+Copyright (C) 2005  one
+
+License:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the 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 package; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- a/debian/dirs
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,109 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	#$(MAKE)
+	unsermake
+	#docbook-to-man debian/kdenlive.sgml > kdenlive.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/kdenlive.
+	#$(MAKE) install DESTDIR=$(CURDIR)/debian/kdenlive
+	unsermake install PREFIX=$(CURDIR)/debian/kdenlive/usr
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,2 @@
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SUBDIRS = en fr
-
-####### kdevelop will overwrite this part!!! (end)############
-
+KDE_DOCS = AUTO
+SUBDIRS = $(AUTODIRS)
--- a/doc/de/Makefile.am
+++ b/doc/de/Makefile.am
@@ -0,0 +1,2 @@
+KDE_DOCS = kdenlive
+KDE_LANG = de
--- a/doc/de/debug_tab.png
+++ b/doc/de/debug_tab.png
--- a/doc/de/index.docbook
+++ b/doc/de/index.docbook
--- a/doc/de/index_de.po
+++ b/doc/de/index_de.po
--- a/doc/de/mainwindow.png
+++ b/doc/de/mainwindow.png
--- a/doc/de/monitor_panel.png
+++ b/doc/de/monitor_panel.png
--- a/doc/de/project_panel.png
+++ b/doc/de/project_panel.png
--- a/doc/de/project_with_clips.png
+++ b/doc/de/project_with_clips.png
--- a/doc/de/rendering_project.png
+++ b/doc/de/rendering_project.png
--- a/doc/de/setup_renderer.png
+++ b/doc/de/setup_renderer.png
--- a/doc/de/timeline_panel.png
+++ b/doc/de/timeline_panel.png
--- a/doc/devel/build.sh
+++ b/doc/devel/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+make
+make index.html
--- a/doc/devel/index.docbook
+++ b/doc/devel/index.docbook
@@ -0,0 +1,702 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdenlive '<application>Kdenlive</application>'>
+  <!ENTITY piave '<application>Piave</application>'>
+  <!ENTITY kino '<application>Kino</application>'>
+  <!ENTITY kapp "&kdenlive;"><!-- replace kdenlive here -->
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE"><!-- change language only here -->
+  
+  
+  <!-- Do not define any other entities; instead, use the entities
+       from kde-genent.entities and $LANG/user.entities. -->
+]>
+<!-- kdoctemplate v0.8 October 1 1999 
+     Minor update to "Credits and Licenses" section on August 24, 2000
+     Removed "Revision history" section on 22 January 2001   -->
+
+<!--
+This template was designed by: David Rugge davidrugge@mindspring.com
+with lots of help from: Eric Bischoff ebisch@cybercable.tm.fr
+and Frederik Fouvry fouvry@sfs.nphil.uni-tuebingen.de
+of the KDE DocBook team.
+
+You may freely use this template for writing any sort of KDE documentation.
+If you have any changes or improvements, please let us know.
+
+In the future, we may want to change from SGML-based DocBook to XML-based
+DocBook. To make this change easier, please be careful :
+- in XML, the case of the <tags> and attributes is relevant ;
+- also, quote all attributes.
+
+Please don't forget to remove all these comments in your final documentation,
+thanks ;-).
+-->
+
+<!-- ................................................................ -->
+
+<!-- The language must NOT be changed here. -->
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title>The &kdenlive; Developers Handbook</title>
+
+<authorgroup>
+<author>
+<firstname>Jason</firstname>
+<othername>M.</othername>
+<surname>Wood</surname>
+<affiliation>
+<address><email>jasonwood@blueyonder.co.uk</email></address>
+</affiliation>
+</author>
+</authorgroup>
+
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+
+<copyright>
+<year>2004</year>
+<holder>Jason Wood</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook 
+     and in the FDL itself on how to use it. -->
+<legalnotice>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (DD/MM/YYYY) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date>17/04/2004</date>
+<releaseinfo>0.3.0</releaseinfo>
+
+<!-- Abstract about this handbook -->
+
+<abstract>
+<para>
+	&kdenlive; is a non-linear video editor for KDE. This handbook provides information to aid developers to
+	start work on the project. It provides both overviews and indepth reviews of the architecture of &kdenlive;
+	as well as insight into why that &kdenlive; is designed like it is.
+</para>
+
+<para>
+	Please contact me at <email>jasonwood@blueyonder.co.uk</email> if you have any questions.
+</para>
+
+<para>
+	Cheers,
+</para>
+<para>
+	Jason
+</para>
+
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword>KDE</keyword>
+<keyword>video editor</keyword>
+<keyword>kdenlive</keyword>
+<keyword>development</keyword>
+</keywordset>
+
+</bookinfo>
+
+
+
+<!-- The contents of the documentation begin here.  Label
+each chapter so with the id attribute. This is necessary for two reasons: it
+allows you to easily reference the chapter from other chapters of your
+document, and if there is no ID, the name of the generated HTML files will vary
+from time to time making it hard to manage for maintainers and for the CVS
+system. Any chapter labelled (OPTIONAL) may be left out at the author's
+discretion. Other chapters should not be left out in order to maintain a
+consistent documentation style across all KDE apps. -->
+
+<chapter id="introduction">
+	<title>What is &kapp;?</title>
+
+<!-- The introduction chapter contains a brief introduction for the
+application that explains what it does and where to report
+problems. Basically a long version of the abstract.  Don't include a
+revision history. (see installation appendix comment) -->
+
+<para>
+	&kapp; is a non-linear video editor for KDE. To be more accurate, &kapp; is a non-linear video editing
+	frontend that uses a backend renderer (&piave;) to perform all necessary video operations, including 
+	the playback and display of all video.
+</para>
+<para>	
+	If you have any questions, please direct them to me at <email>jasonwood@blueyonder.co.uk</email>
+</para>
+</chapter>
+
+<chapter id="architecture-introduction">
+	<title>Architecture Introduction</title>
+
+	<sect1 id="client-server-model">
+		<title>The Client-Server Model</title>
+		<para>
+			&kdenlive; uses a client/server model approach to connect to the back end renderer. There are
+			a number of advantages to this. It enforces the connection between the user interface and
+			the rendering to be asynchronous. This leaves us with a smooth user experience even when
+			complex rendering tasks are happening in the background. Conversely, it also ensures that
+			the user interface will never get in the way of video operations, such as capture.
+		</para>
+		<para>
+			The client server approach also increases robustness of the application - video playback
+			and recording is a complex process that requires low level programming and is more prone
+			to stability issues than the user interface because of this. With the user interface in
+			a separate application, we can guarantee that unless the renderer takes the computer down
+			when it crashes, the user can still save there work. Indeed, in most cases, &kdenlive; will
+			be able to restart the offending process with little inconvenience to the user.
+		</para>
+		<note>
+			<para>
+				Not much work has been put into &kdenlive; yet to provide this convenience to the user,
+				it is planned to happen before version 1.0 but it would be a good task for somebody
+				new to &kdenlive; programming to take on and clean up.
+			</para>
+		</note>
+		<screenshot>
+			<mediaobject>
+				<imageobject>
+					<imagedata fileref="overall architecture.png" format="PNG"/>
+				</imageobject>
+		      		<textobject>
+					<phrase>The current client/server model</phrase>
+				</textobject>
+			</mediaobject>
+		</screenshot>
+		<para>
+			There are three parts to the client-server model, as seen in the above picture. &kdenlive; acts
+			as the client, and provides the user experience to the user. &piave; is the video renderer. It
+			performs all video operations and video rendering, including the display of the video monitor 
+			on-screen. &kdenlive; and &piave; communicate to each other over TCP sockets using VEML, an XML 
+			based communication protocol.
+		</para>
+		<note>
+			<para>
+				When we say all video operations are performed in &piave; we mean it. &kdenlive; cannot
+				load AVI files, DV files, mp3 files, etc. It has no idea what these formats are, and it
+				does not care. When we import a clip into &kdenlive; the first thing it does is query
+				&piave; to find out what the clip is. This is an intentional design decision and should
+				under no circumstances be circumvented.
+			</para>
+		</note>
+		<sect2 id="scheduler-introduction">
+			<title>Background Rendering and the Scheduler</title>
+			<note>
+				<para>
+					The scheduler has not yet been started, it is currently slated for version 0.7/
+					0.8. What is described here is the current plan on how to implement it.
+				</para>
+			</note>
+			<para>There is another advantage to the client-server model - it makes it very straight forward
+				to provide support for background rendering, and batch farm rendering. The scheduler
+				will act as a proxy for communications from &kdenlive; and will manage multiple instances
+			 	of &piave;. When a new scene file needs to be handled, the scheduler will intercept and
+				examine it. Any parts that have previously been renderered will be inserted into the file,
+				and any parts that needs to be renderered will be fired off to various piave instances to
+				render. When newly renderered parts of the scenelist return, they will be inserted into
+				the scenelist until it has been simplified to something that can be played in 
+				realtime.
+			</para>
+			<para>
+				Since the scheduler is a proxy, neither &kdenlive; or &piave; need to know that they are
+				using it. The scheduler acts completely transparently. However, &kdenlive; will have
+				a dialog for controlling the scheduler if one is used.
+			</para>
+			<screenshot>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="scheduler architecture.png" format="PNG"/>
+					</imageobject>
+			      		<textobject>
+						<phrase>How the architecture will look when the scheduler proxy
+							appears</phrase>
+					</textobject>
+				</mediaobject>
+			</screenshot>
+		</sect2>
+	</sect1>
+
+	<sect1 id="architecture-summary">
+		<title>&kdenlive; Architecture</title>
+		<para>
+			&kdenlive; follows the Model-View-Controller model of class design. However, it did not start
+			out purely like this; it has evolved as the design of the application started to take place.
+			So expect the odd inconsistancy. However inconsistancys should be considered to be architectural
+			bugs and should be fixed when they are found.
+		</para>
+		<screenshot>
+			<mediaobject>
+				<imageobject>
+					<imagedata fileref="model view controller.png" format="PNG"/>
+				</imageobject>
+		      		<textobject>
+					<phrase>The model/view/controller architecture of &kdenlive;</phrase>
+				</textobject>
+			</mediaobject>
+		</screenshot>
+		<para>
+			The view consists of all of those classes that display something on the screen. All qt widgets
+			fall under this category, as well as the various dialogs, and the numerous classes that make
+			up the timeline widget. These widgets may be capable of creating commands that alter the document,
+			but they should not alter the document model directly themselves.
+		</para>
+		<para>
+			The Model contains everything that makes up the project itself. KdenliveDoc is the base class for
+			the document model, with DocClipBase, DocClipRef, DocTrackBase, the Effect classes and other 
+			such classes making up the model.
+		</para>
+		<para>
+			The controller consists of a command stack (provided by the KDE class KCommandStack) and a list
+			of commands that can be used to manipulate the document model. A command must be reversible - you
+			will notice that every command has an "unexecute" method, which must be filled in for the undo/redo
+			framework to work consistently. If you are trying to write a command and cannot write an
+			unexecute method for it, your command was not the correct choice to make.
+		</para>
+		<para>
+			From the diagram, we see that all control flows in a circle - the view displays the document,
+			and issues commands when manipulations of the view are attempted by the user. (Commands make
+			up the "controller") Commands modify the document model. When the document model changes, it
+			updates the view classes.
+		</para>
+
+		<para>
+			The document does not "know" about the viewer - we use the QT signal and slots mechanisms
+			to hook the two together. For the moment this is the preferred method, although an alternative
+			would be the Observer (also known as the Listener) Pattern.
+		</para>
+		<para>
+			The Viewer should never directly manipulate the document model. It should always create and
+			execute a command that manipulates the document model. This is to ensure that we remain inside
+			of the undo/redo architecture. See the chapter on <link linkend="commands">Commands</link> for
+			more details.
+		</para>
+	</sect1>
+	
+	<sect1 id="veml-summary">
+		<title>VEML</title>
+		<para>There needs to be a communication layer between &kdenlive; and &piave;. This is provided by
+			VEML - the Video Editing Markup Language. VEML provides the general communication
+			between &kdenlive; and &piave; such as starting videos playing, and requesting the properties 
+			of a video. More importantly, VEML also defines the scenelist definition that determines
+			what does and does not get rendered on the screen. For more information see the
+			<link linkend="veml">chapter on VEML</link></para>
+	</sect1>
+
+	<sect1 id="embedding-piave">
+		<title>Embedding &piave; into &kdenlive;</title>
+		<para>Although &kdenlive; and &piave; are separate applications, we do not want this to be exposed
+			to the user unless the user wants it to be exposed. It is vitally important that &piave;
+			integrates into the user interface. This works as follows.
+		</para>
+		<para>When &kdenlive; starts an instance of &piave; that is destined to be a video monitor, is
+			sends a VEML request asking &piave; to create a video window. When &piave; succeeds,
+			it sends a VEML reply back to &kdenlive; reporting it's success and providing a X11
+			window Id.
+		</para>
+		<para>&kdenlive; then uses this Id to embed &piave; into the relevant monitor window.</para>
+		<para>It is important to realise that &piave; is still in charge of the video window, and it
+			is equally important to note that &kdenlive; is in charge of all of the user interface
+			buttons that surround the window - &kdenlive; sends VEML commands to &piave; when a
+			button is pressed, and &piave; sends VEML reply's to &kdenlive; when the state of the
+			video window changes and needs to be updated in &kdenlive;
+		</para>
+	</sect1>
+</chapter>
+
+<chapter id="coding-conventions">
+	<title>Coding Conventions</title>
+	<para>
+		Never hack features in, unless there is no obvious way to avoid it. Whenever a more generic
+		solution presents itself to you and seems appropriate, use it. A good example of this is the
+		timeline. Initially, the timeline was heavily dependent on KdenliveDoc and DocTrackBase. Each
+		track type (video, sound, keyframe) knew how to draw the clips on that specific track, and knew
+		how to manipulate the clips on that track. Also, the timeline class laid itself out with certain
+	       	widgets that were specific to it's use as the main document timeline.
+	</para>
+	<para>
+		This was fine as far as it went, but had problems. Firstly, there was a certain amount of code
+		duplication in drawing clips on different tracks - fundamentally, all clips need to draw their
+		background in some color. There was also duplication of functionality - all clips on any track
+		can be moved and resized in similar ways.
+	</para>
+	<para>
+		However, this biggest problem that caused a redesign was in the design of the effect keyframe
+		dialog. Fundamentally, it required a timeline class that was almost identical to the main
+		document timeline but with certain differences - it would be displaying a single clip instead
+		of a track, and it would not need the same track panel options as the main timeline.
+	</para>
+	<para>
+		I had two options - I could write a new timeline widget (which would probably have been quicker),
+		or I could refactor the current one so that it was capable of the functionality I desired. In the
+		refactor, functionality, design and finally, the placement of clips were completely separated from
+		each other.
+	</para>
+	<note>
+		<para>
+			Take caution here - Only generalise when you need to, or it may be wasted effort. For instance,
+			don't add member functions to a class that you will never use. The one exception to this is :
+			even if you do not need them right away, always add cleanup code to the classes, and never
+			design a class that is static unless you are absolutely sure you will never need to dynamically
+			modify it.
+		</para>
+	</note>
+	<para>
+		&kdenlive; is a KDE application, and makes as much use of the KDE framework as it can. This goes
+		right down to coding styles. See the KDE coding guidelines for an in-depth description of how to
+		lay out your code in &kdenlive;. However, here is a quick run-down of the most important points.
+	</para>
+	<para>
+		All class member variables should begin with m_. For example, m_duration, m_time, m_lastPosition.
+		Parameters of methods and local variables have no prefix. For example, int count, GenTime temporary.
+		Static members should start with the prefix s_, for example s_maximumClients. As you notice, the
+		first word in a variable name should start with a lower case letter, all following words should
+		start with a capital letter. So, m_someVariable is correct, while m_SomeVariable and m_somevariable
+		are wrong.
+	</para>
+	<para>
+		Something that I have been trying to become consistant on is the use of design patterns in the
+		names of relevant classes. Design Patterns are patterns of class design, and naming common ones
+		serves the same purpose as naming common algorithms, and naming common data structures. For example,
+		a Decorator is an example of Design Pattern, A Linked List is an example of a data structure, and
+		a Quick Sort is an example of an algorithm. By using a standard jargon of names for patterns,
+		it makes it easier for developers to understand what is going on in the code.
+		Note that not all class names recognize which pattern they are a part of - this is because my
+		use of pattern names is a relatively new thing, and a lot of code was written before-hand.
+	</para>
+</chapter>
+
+<chapter id="document">
+	<title>The Document Classes</title>
+	<para>
+		The document classes are the core of &kdenlive;. They hold the data that makes up the user's
+		project.
+	</para>
+	<para>
+		KdenliveDoc was originally (and still kind-of is) the main document class. It acts as a wrapper 
+		around the other classes, and provides the overall document interface to the outside world. 
+		However, I will admit that with the changes in architecture, it is starting to look redundant. 
+		Most of the methods in KdenliveDoc are pass-through methods to DocClipProject.
+	</para>
+
+	<para>
+		DocClipProject is the base class for the document tree. A DocClipProject holds a list of tracks.
+		There are several types of track (At present only video is used, but there is a stub audio track
+		class), and they all inherit DocTrackBase. A track is a container that holds clips references
+		(DocClipRef).
+	</para>
+	<para>
+		Clip references exist to prevent &kdenlive; from making unnecessary requests of &piave; for clip
+		information, and to ensure that if the information contained in a clip changed all references get
+		updated instantly. Finally, by using references, we do not unnecessarily copy information around,
+		and save memory.
+	</para>
+	<para>
+		A DocClipRef holds a reference to a DocClipBase clip, which contains information about the clip
+		that we are using. Each reference stores information that is unique to each clip on the timeline.
+		Where on the parent track this clip starts (m_trackStart), where in the clip we should start 
+		playing from (m_cropStart), and how long the clip is on the timeline (m_cropDuration).
+	</para>
+	<note>
+		<para>
+			Do not confuse cropDuration() with duration(). cropDuration() will provide you with the
+			length of the clip on the timeline, while duration() will provide you with the total
+			duration of the DocClipBase clip that we are references. In video editing terms,
+			cropStart() will provide you the inpoint of the clip, and cropDuration() is the
+			duration between the inpoint and the outpoint of the clip.
+		</para>
+	</note>
+
+	<para>
+		There are a number of classes that inherit from DocClipBase - the two most important at the moment
+		are DocClipAVFile, and DocClipProject. DocClipAVFile is a representation of a video or audio (or both)
+		clip.
+	</para>
+	<para>
+		DocClipProject is also a DocClipBase. This means that you can reference entire projects and treat them
+		as a single clip. This behaviour is recursive, so you can have a DocClipProject with clips inside
+		referencing other DocClipProjects, which can have clips inside referencing other DocClipProjects,
+		with clips inside referencing DocClipPr...
+	</para>
+	<para>
+		Detail the document classes KdenliveDoc, DocClipBase, ClipManager, etc. Give an overview of how
+		it all fits together and why it is done the way it is. Provide some insight into the outstanding
+		issues.
+	</para>
+</chapter>
+
+<chapter id="timeline">
+	<title>The Timeline Classes</title>
+	<para>
+		The graphical interface that depicts the timeline, and the logic that goes behind the manipulations
+		of the timeline are implemented using quite a complex set of classes, which I will do my best to
+		detail here. The complexity comes from trying to make the timeline into a reusable widget,
+		and it is capable of quite a lot. The timeline is capable of :
+		<itemizedlist>
+			<listitem><para>Unlimited, scrolling tracks</para></listitem>
+			<listitem><para>Various time scales</para></listitem>
+			<listitem><para>Tracks can contain potentially any kind of information (video clips,
+			audio clips, subtitles, keyframe information, color gradients, etc.)</para></listitem>
+			<listitem><para>Common display code and tool functionality can be shared amongst tracks 	
+			that hold different information</para></listitem>
+			<listitem><para>Multiple tools can be defined, and common functionality can be shared 
+			across tools.</para></listitem>
+		</itemizedlist>
+	</para>
+	<para>
+		The base timeline class is KTimeline.
+		
+		Detail the timeline classes, including an overview of the decorator pattern and what we are
+		trying to achieve with it. Express that the timeline should do no direct manipulation of the
+		document model, and any manipulations that are done are a throwback to earlier code and need
+		to be reationalised.
+	</para>
+</chapter>
+
+<chapter id="commands">
+	<title>The Command (controller) Classes</title>
+	<para>
+		In &kdenlive; the controller is made up of a number of commands. Commands are the only way in
+		which you should manipulate the document model.
+	</para>
+	<note>
+		<para>
+			In some places in code at the moment, this is not strictyly true. Sometimes commands
+			are created for manipulations that have already occured, for instance, when moving
+			and resizing clips, and when we load/save the project, we do not do it via the
+			command interface. However, these should be considered exceptions to the rule.
+		</para>
+	</note>
+	<para>
+		A command knows all of the details necessary to make a particular change to the document,
+		and more importantly, it contains all of the details to reverse that change again. Every
+		command has two methods, an "execute" method which performs the desired change, and an
+		"unexecute" method that performs the opposite of the change.
+	</para>
+	<para>
+		For example - The KMoveClips command has all of the information required to move the currently
+		selected clips to a new location. It also has the necessary information to move them back to
+		where they started. The KAddClips command can add a clip, and stores the necessary information
+		to be able to delete that same clip afterwards.
+	</para>
+	<para>
+		When a command is created, it is added to the command stack (the KDE class KCommandStack implements
+		this). The command stack allows us to traverse forwards and backwards through the commands in the
+		stack, and this ability gives us complete undo/redo support.
+	</para>
+	<note>
+		<para>
+			It is essential that a command's unexecure method returns the document to the exact same
+			state it was in before the command's execute method was called.
+		</para>
+	</note>
+	<para>
+		Be careful when implementing commands to only use data that will not change during the lifetime
+		of the command. Do not use pointers to clips, tracks, etc. since these will change if a later
+		command deletes those pointers (when unexecuted, the document will be in a correct state, but
+		the pointers will have different values). 
+	</para>
+
+	<para>
+		In the future, &kdenlive; will become scriptable. It is envisaged that the command classes will
+		become the "basic primitive" methods that will be available via this scripting language. Try
+		to keep this in mind when you put together your classes.
+	</para>
+</chapter>
+
+<chapter id="communication">
+	<title>Communication with the Renderer</title>
+	<para>
+		This chapter provides details on how &kdenlive; talks to the renderer, and how it should and
+		should not go about this. For details on the communication protocol, see the 
+		<link linkend="veml">veml</link> chapter.
+	</para>
+</chapter>
+
+<chapter id="veml">
+	<title>VEML - Video Editing Markup Language</title>
+	<para>
+		VEML serves two purposes between &kdenlive; and &piave;. The first purpose is to serve as the
+		communication protocol between the two applications to tell each other what to do. For instance,
+		&kdenlive; will send a VEML command to &piave; to start a video playing or request the length of
+		a video. &piave; will send a VEML command in reply to these commands, and will also send VEML
+		commands to &kdenlive; to report changes in it's state - for instance, when rendering, &piave;
+		sends a VEML command to &kdenlive; to alert it to it's progress.
+	</para>
+	<para>The other purpose of VEML is to define a scenelist definition. The scenelist defines exactly what
+		the video output of the renderer should be. The scenelist serves a similar purpose to SMIL, and
+		for that reason the format of VEML is converging with that of SMIL, apart from in some places where
+		SMIL is deficient for our purposes. </para>
+	<para>VEML is an XML protocol.</para>
+	
+</chapter>
+
+<chapter id="credits">
+
+<!-- Include credits for the programmers, documentation writers, and
+contributors here. The license for your software should then be included below
+the credits with a reference to the appropriate license file included in the KDE
+distribution. -->
+
+<title>Credits and License</title>
+
+<para>
+&kapp;
+</para>
+<para>
+	Program copyright 2002-2004 Jason Wood <email>jasonwood@blueyonder.co.uk</email>
+</para>
+<para>
+	Contributors:
+	<itemizedlist>
+		<listitem>
+			<para>
+				Caulier Gilles <email>caulier.Gilles@free.fr</email> : &kdenlive; and &piave; i18n, French translations, splashscreen
+			</para>
+		</listitem>
+		<listitem>
+			<para>
+				Rolf Dubitzky <email>dubitzky@pktw06.phy.tu-dresden.de</email> : &piave; implementations
+			</para>
+		</listitem>
+	</itemizedlist>
+</para>
+
+<para>
+	Documentation copyright 2004 Jason Wood <email>jasonwood@blueyonder.co.uk</email>
+</para>
+
+<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+
+&underFDL;               <!-- FDL: do not remove. Commercial development should -->
+<!-- replace this with their copyright and either remove it or re-set this.-->
+
+<!-- Determine which license your application is licensed under, 
+     and delete all the remaining licenses below:
+
+     (NOTE:  All documentation are licensed under the FDL, 
+     regardless of what license the application uses) -->
+
+&underGPL;        	 <!-- GPL License -->
+
+</chapter>
+
+<appendix id="installation">
+<title>Installation</title>
+
+<sect1 id="getting-kdenlive">
+<title>How to obtain &kdenlive;</title>
+
+<para>
+	The &kdenlive; WEB site is 
+	<ulink url="http://www.uchian.pwp.blueyonder.co.uk/kdenlive.html">http://www.uchian.pwp.blueyonder.co.uk/kdenlive.html</ulink>.
+	&kdenlive; can be found in the SourceForge project page on
+	<ulink url="http://sourceforge.net/projects/kdenlive/">http://sourceforge.net/projects/kdenlive/</ulink>
+</para>
+</sect1>
+
+<sect1 id="requirements">
+<title>Requirements</title>
+
+<!--
+List any special requirements for your application here. This should include:
+.Libraries or other software that is not included in kdesupport,
+kdelibs, or kdebase.
+.Hardware requirements like amount of RAM, disk space, graphics card
+capabilities, screen resolution, special expansion cards, etc.
+.Operating systems the app will run on. If your app is designed only for a
+specific OS, (you wrote a graphical LILO configurator for example) put this
+information here.
+-->
+
+<para>
+	In order to successfully use &kdenlive;, you need KDE 3.0 or higher. Additionally,
+	you need piave in order to do anthing useful - kdenlive itself is after all, just
+       	an interface :-)
+</para>
+
+<para>
+	All required libraries as well as &kdenlive; itself can be found on or via 
+	<ulink url="http://pwp.blueyonder.co.uk/kdenlive.html">The &kdenlive; home page</ulink>.
+</para>
+
+<!-- For a list of updates, you may refer to the application web site
+or the ChangeLog file, or ... -->
+<para>
+	You can find a list of changes at <ulink url="http://pwp.blueyonder.co.uk/kdenlive.html">http://pwp.blueyonder.co.uk/kdenlive.html</ulink>. FIXME : this link does not actually point at a changelog.
+</para>
+</sect1>
+
+<sect1 id="compilation">
+	<title>Compilation and Installation</title>
+
+	<para>
+		In order to compile and install &kdenlive; on your system, type the following in the base
+		directory of the &kdenlive; distribution:
+		<screen width="40">
+                        <prompt>%</prompt> <userinput>./configure</userinput>
+		</screen>
+		<screen width="40">
+                        <prompt>%</prompt> <userinput>make</userinput>
+		</screen>
+		<screen width="40">
+                        <prompt>%</prompt> <userinput>make install</userinput>
+		</screen>
+	</para>
+
+	<para>
+		Additional parameters for ./configure script may be required. Type the following in the base
+		directory of the &kdenlive; distribution:
+		<screen width="40">
+			<prompt>%</prompt> <userinput>./configure --help</userinput>
+		</screen>
+	</para>
+
+	<para>
+		Since &kdenlive; uses autoconf and automake you should have not trouble compiling it.
+		Should you run into problems please report them to 
+		<email>jasonwood@blueyonder.co.uk</email>.
+	</para>
+
+</sect1>
+
+</appendix>
+
+&documentation.index;
+</book>
+<!--
+Local Variables:
+mode: sgml
+sgml-minimize-attributes:nil
+sgml-general-insert-case:lower
+sgml-indent-step:0
+sgml-indent-data:nil
+End:
+-->
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/doc/devel/model
+++ b/doc/devel/model
--- a/doc/devel/model
+++ b/doc/devel/model
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   id="svg1"
+   sodipodi:version="0.32"
+   inkscape:version="0.37"
+   width="210mm"
+   height="297mm"
+   sodipodi:docbase="/home/uchian/cvs/kdenlive/doc/devel"
+   sodipodi:docname="model view controller.svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+   xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.20386146"
+     inkscape:cx="300.357984"
+     inkscape:cy="638.447767"
+     inkscape:window-width="1017"
+     inkscape:window-height="688"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <g
+     id="g911"
+     transform="matrix(1.706637,0.000000,0.000000,1.706637,-37.02610,-16.81949)">
+    <g
+       id="g737"
+       transform="matrix(0.507957,0.000000,0.000000,0.515633,0.465472,-21.13016)"
+       style="font-size:12;">
+      <rect
+         style="font-size:12;fill:#ffc58f;fill-rule:evenodd;stroke:#000000;stroke-width:1.08063;"
+         id="rect639"
+         width="290.80676270"
+         height="112.48296337"
+         x="427.75222778"
+         y="286.32366856" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="99.0830062"
+         y="74.0831070"
+         id="text640"
+         sodipodi:linespacing="100%"
+         transform="scale(4.567937,4.567937)"><tspan
+           x="99.0830078"
+           y="74.0831070"
+           sodipodi:role="line"
+           id="tspan641">Controller</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;text-anchor:middle;"
+         x="176.515335"
+         y="181.653570"
+         id="text643"
+         sodipodi:linespacing="100%"
+         transform="translate(396.6403,178.5920)"><tspan
+           x="176.515335"
+           y="181.653564"
+           sodipodi:role="line"
+           id="tspan644">KAddClipCommand, KMoveClipCommand,</tspan><tspan
+           sodipodi:role="line"
+           id="tspan708"
+           x="176.515335"
+           y="193.653564">KAddEffect, and all other commands</tspan><tspan
+           sodipodi:role="line"
+           id="tspan714"
+           x="176.515335"
+           y="205.653564">in the Command namespace.</tspan></text>
+    </g>
+    <g
+       id="g780"
+       transform="matrix(0.507957,0.000000,0.000000,0.515633,37.91266,-21.66555)"
+       style="font-size:12;">
+      <rect
+         style="font-size:12;fill:#ffc58f;fill-rule:evenodd;stroke:#000000;stroke-width:1.01449;"
+         id="rect574"
+         width="209.81738281"
+         height="137.40277564"
+         x="88.21985626"
+         y="88.17840032" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="25.6578684"
+         y="34.9862480"
+         id="text577"
+         sodipodi:linespacing="100%"
+         transform="matrix(4.567937,0.000000,0.000000,4.567937,16.61321,-13.49823)"><tspan
+           x="25.6578693"
+           y="34.9862480"
+           sodipodi:role="line"
+           id="tspan582">View</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;text-anchor:middle;"
+         x="176.515335"
+         y="181.653570"
+         id="text584"
+         sodipodi:linespacing="100%"
+         transform="translate(16.61321,-13.49823)"><tspan
+           x="176.515335"
+           y="181.653564"
+           sodipodi:role="line"
+           id="tspan591">Timeline, Effect Dialogs, Clip</tspan><tspan
+           x="176.515335"
+           y="193.653564"
+           sodipodi:role="line"
+           id="tspan593">Monitor Windows, debug window,</tspan><tspan
+           x="176.515335"
+           y="205.653564"
+           sodipodi:role="line"
+           id="tspan595">project view window, all other</tspan><tspan
+           x="176.515335"
+           y="217.653564"
+           sodipodi:role="line"
+           id="tspan597">dialogs.</tspan></text>
+    </g>
+    <path
+       style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.659691pt;"
+       d="M 369.10594 130.19813 C 479.56273 130.19813 499.70894 224.07689 499.70894 224.07689 "
+       id="path800"
+       transform="matrix(0.747100,0.000000,0.000000,0.747100,-77.50943,-49.05748)" />
+    <path
+       style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.70306pt;"
+       d="M 501.23755 316.2306 C 474.08208 427.69069 374.63697 406.35484 374.63697 406.35484 "
+       id="path801"
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.747100,0.000000,0.000000,0.747100,-77.50943,-49.05748)" />
+    <path
+       style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.728714pt;"
+       d="M 252.12018 350.20409 C 214.57262 300.03986 236.94138 232.67648 262.50566 196.12826 "
+       id="path802"
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.747100,0.000000,0.000000,0.747100,-77.50943,-49.05748)" />
+    <path
+       style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.488182pt;"
+       d="M 369.43271 405.35317 L 383.66335 418.30817 L 385.61524 396.25197 L 369.43271 405.35317 z "
+       id="path804"
+       sodipodi:nodetypes="cccc"
+       transform="matrix(0.747100,0.000000,0.000000,0.747100,-77.50943,-49.05748)" />
+    <path
+       style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.488182pt;"
+       d="M 262.21641 193.86116 L 247.1467 205.79842 L 268.19073 211.63479 L 262.21641 193.86116 z "
+       id="path805"
+       sodipodi:nodetypes="cccc"
+       transform="matrix(0.747100,0.000000,0.000000,0.747100,-77.50943,-49.05748)" />
+    <path
+       style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.488182pt;"
+       d="M 496.47573 232.46499 L 508.77716 217.61316 L 486.99813 216.33674 L 496.47573 232.46499 z "
+       id="path806"
+       sodipodi:nodetypes="cccc"
+       transform="matrix(0.747100,0.000000,0.000000,0.747100,-77.50943,-49.05748)" />
+    <g
+       id="g901">
+      <rect
+         style="font-size:12;fill:#ffc58f;fill-rule:evenodd;stroke:#000000;stroke-width:1.03064;"
+         id="rect653"
+         width="285.61514282"
+         height="104.17636684"
+         x="48.24429321"
+         y="475.47375284"
+         transform="matrix(0.507957,0.000000,0.000000,0.515633,27.89159,-29.69650)" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="37.4798994"
+         y="103.460038"
+         id="text654"
+         sodipodi:linespacing="100%"
+         transform="scale(2.320316,2.355379)"><tspan
+           x="37.4799004"
+           y="103.460037"
+           sodipodi:role="line"
+           id="tspan655">Model</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;text-anchor:middle;"
+         x="176.515335"
+         y="181.653570"
+         id="text657"
+         sodipodi:linespacing="100%"
+         transform="matrix(0.507957,0.000000,0.000000,0.515633,35.27553,161.2817)"><tspan
+           x="176.515335"
+           y="181.653564"
+           sodipodi:role="line"
+           id="tspan658">KdenliveDoc, DocClipBase, DocClipRef, Effect</tspan><tspan
+           sodipodi:role="line"
+           id="tspan749"
+           x="176.515335"
+           y="193.653564">and all other document related classes.</tspan></text>
+    </g>
+  </g>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:helvetica;font-style:normal;font-weight:normal;font-size:12px;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;"
+     x="336.764463"
+     y="72.8582446"
+     id="text860"
+     transform="scale(1.248556,1.248556)"><tspan
+       id="tspan861">Creates Commands and adds </tspan><tspan
+       sodipodi:role="line"
+       id="tspan863"
+       x="336.764465"
+       y="84.8582458">them to the command stack.</tspan></text>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:helvetica;font-style:normal;font-weight:normal;font-size:12px;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;"
+     x="339.607141"
+     y="311.367143"
+     id="text865"
+     transform="scale(1.268463,1.268463)"><tspan
+       id="tspan866">Executes commands in the </tspan><tspan
+       sodipodi:role="line"
+       id="tspan868"
+       x="339.607147"
+       y="323.367157">command stack.</tspan></text>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:helvetica;font-style:normal;font-weight:normal;font-size:12px;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;"
+     x="111.323106"
+     y="191.250604"
+     id="text870"
+     transform="scale(1.230418,1.230418)"><tspan
+       id="tspan871">Updates via signals and</tspan><tspan
+       sodipodi:role="line"
+       id="tspan873"
+       x="111.323105"
+       y="203.250610">slots when the model</tspan><tspan
+       sodipodi:role="line"
+       id="tspan875"
+       x="111.323105"
+       y="215.250610">changes.</tspan></text>
+</svg>
--- a/doc/devel/overall
+++ b/doc/devel/overall
--- a/doc/devel/overall
+++ b/doc/devel/overall
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   id="svg1"
+   sodipodi:version="0.32"
+   inkscape:version="0.37"
+   width="210mm"
+   height="297mm"
+   sodipodi:docbase="/home/uchian/cvs/kdenlive/doc/devel"
+   sodipodi:docname="overall architecture.svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+   xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient575">
+      <stop
+         style="stop-color:#000;stop-opacity:1;"
+         offset="0"
+         id="stop576" />
+      <stop
+         style="stop-color:#fff;stop-opacity:1;"
+         offset="1"
+         id="stop577" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient575"
+       id="linearGradient578" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.23387297"
+     inkscape:cx="259.808927"
+     inkscape:cy="668.330755"
+     inkscape:window-width="1017"
+     inkscape:window-height="688"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <g
+     id="g1219"
+     transform="matrix(1.930005,0.000000,0.000000,1.713175,150.4793,-58.40811)">
+    <rect
+       style="font-size:12;fill:#ffff6b;fill-opacity:0.75;fill-rule:evenodd;stroke-width:0.625;"
+       id="rect1082"
+       width="113.28893280"
+       height="196.31208801"
+       x="37.54014624"
+       y="34.02360348" />
+    <path
+       style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ad5800;stroke-width:0.714365;"
+       d="M 150.74194 33.601445 L 150.74194 231.052 "
+       id="path1097" />
+    <path
+       style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ad5800;stroke-width:0.714365;"
+       d="M 38.256559 33.601445 L 38.256559 231.052 "
+       id="path1101" />
+  </g>
+  <g
+     id="g789"
+     transform="translate(14.18298,7.091492)">
+    <rect
+       style="font-size:12;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.613809;stroke-dashoffset:0;fill:#00ff00;"
+       id="rect588"
+       width="254.58990479"
+       height="49.97110436"
+       x="458.55001831"
+       y="53.48257894" />
+    <text
+       xml:space="preserve"
+       style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+       x="195.695480"
+       y="37.3953281"
+       id="text589"
+       transform="scale(2.376363,2.376363)"
+       sodipodi:linespacing="100%"><tspan
+         x="195.695480"
+         y="37.3953285"
+         sodipodi:role="line"
+         id="tspan596">Piave</tspan></text>
+  </g>
+  <g
+     id="g794"
+     transform="translate(14.18298,60.34955)">
+    <rect
+       style="font-size:12;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.613809;stroke-dashoffset:0;fill:#00ff00;"
+       id="rect795"
+       width="254.58990479"
+       height="49.97110436"
+       x="458.55001831"
+       y="53.48257894" />
+    <text
+       xml:space="preserve"
+       style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+       x="195.695480"
+       y="37.3953281"
+       id="text796"
+       transform="scale(2.376363,2.376363)"
+       sodipodi:linespacing="100%"><tspan
+         x="195.695480"
+         y="37.3953285"
+         sodipodi:role="line"
+         id="tspan797">Piave</tspan></text>
+  </g>
+  <g
+     id="g799"
+     transform="translate(14.18298,113.6076)">
+    <rect
+       style="font-size:12;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.613809;stroke-dashoffset:0;fill:#00ff00;"
+       id="rect800"
+       width="254.58990479"
+       height="49.97110436"
+       x="458.55001831"
+       y="53.48257894" />
+    <text
+       xml:space="preserve"
+       style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+       x="195.695480"
+       y="37.3953281"
+       id="text801"
+       transform="scale(2.376363,2.376363)"
+       sodipodi:linespacing="100%"><tspan
+         x="195.695480"
+         y="37.3953285"
+         sodipodi:role="line"
+         id="tspan802">Piave</tspan></text>
+  </g>
+  <g
+     id="g804"
+     transform="translate(14.18298,204.2398)">
+    <rect
+       style="font-size:12;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.613809;stroke-dashoffset:0;fill:#00ff00;"
+       id="rect805"
+       width="254.58990479"
+       height="49.97110436"
+       x="458.55001831"
+       y="53.48257894" />
+    <text
+       xml:space="preserve"
+       style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+       x="195.695480"
+       y="37.3953281"
+       id="text806"
+       transform="scale(2.376363,2.376363)"
+       sodipodi:linespacing="100%"><tspan
+         x="195.695480"
+         y="37.3953285"
+         sodipodi:role="line"
+         id="tspan807">Piave</tspan></text>
+  </g>
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.75;"
+     d="M 245.81189 42.892454 C 245.81189 42.892454 245.81189 42.892454 245.81189 42.892454 "
+     id="path621" />
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:middle;writing-mode:lr;"
+     x="148.858163"
+     y="14.4918892"
+     id="text625"
+     transform="scale(2.287292,2.287292)"
+     sodipodi:linespacing="100%"><tspan
+       x="148.858170"
+       y="14.4918890"
+       sodipodi:role="line"
+       id="tspan698">VEML</tspan><tspan
+       x="148.858170"
+       y="26.4918890"
+       sodipodi:role="line"
+       id="tspan700">Communication</tspan></text>
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-linejoin:bevel;stroke-linecap:round;"
+     d="M 459.86886 189.572 L 211.33123 189.572 L 174.42434 176.49107 L 211.33123 283.94156 L 460.80322 283.94156 M 464.54063 86.793281 L 208.52817 86.793281 L 174.54242 176.66562 L 211.33123 138.18265 L 464.54062 138.18265 "
+     id="path639"
+     sodipodi:nodetypes="cccccccccc" />
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:helvetica;font-style:normal;font-weight:normal;font-size:12px;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;"
+     x="262.720625"
+     y="100.808569"
+     id="text640"><tspan
+       id="tspan641">Clip Monitor Communication</tspan><tspan
+       sodipodi:role="line"
+       id="tspan643"
+       x="262.720612"
+       y="112.808571"></tspan></text>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:start;writing-mode:lr;"
+     x="245.902281"
+     y="150.329222"
+     id="text645"
+     sodipodi:linespacing="100%"><tspan
+       x="245.902283"
+       y="150.329224"
+       sodipodi:role="line"
+       id="tspan650">Workspace Monitor Communication</tspan><tspan
+       x="245.902283"
+       y="162.329224"
+       sodipodi:role="line"
+       id="tspan652"></tspan></text>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:middle;writing-mode:lr;"
+     x="334.665724"
+     y="210.127744"
+     id="text654"
+     sodipodi:linespacing="100%"><tspan
+       x="334.665710"
+       y="210.127747"
+       sodipodi:role="line"
+       id="tspan683">Document Communication</tspan><tspan
+       x="334.665710"
+       y="222.127747"
+       sodipodi:role="line"
+       id="tspan685">(rendering, video file properties,</tspan><tspan
+       x="334.665710"
+       y="234.127747"
+       sodipodi:role="line"
+       id="tspan687">renderer capabilities, etc.)</tspan><tspan
+       x="334.665710"
+       y="246.127747"
+       sodipodi:role="line"
+       id="tspan689"></tspan></text>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:middle;writing-mode:lr;"
+     x="646.739240"
+     y="77.6438730"
+     id="text702"
+     sodipodi:linespacing="100%"><tspan
+       x="646.739258"
+       y="77.6438751"
+       sodipodi:role="line"
+       id="tspan715">Piave Instance that</tspan><tspan
+       x="646.739258"
+       y="89.6438751"
+       sodipodi:role="line"
+       id="tspan717">displays the clip</tspan><tspan
+       x="646.739258"
+       y="101.643875"
+       sodipodi:role="line"
+       id="tspan719">monitor video</tspan></text>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:middle;writing-mode:lr;"
+     x="643.001875"
+     y="128.839132"
+     id="text721"
+     sodipodi:linespacing="100%"><tspan
+       x="643.001892"
+       y="128.839127"
+       sodipodi:role="line"
+       id="tspan752">Piave Instance that displays</tspan><tspan
+       x="643.001892"
+       y="140.839127"
+       sodipodi:role="line"
+       id="tspan754">the workspace monitor</tspan><tspan
+       x="643.001892"
+       y="152.839127"
+       sodipodi:role="line"
+       id="tspan756">video</tspan></text>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:middle;writing-mode:lr;"
+     x="645.804914"
+     y="182.097196"
+     id="text758"
+     sodipodi:linespacing="100%"><tspan
+       x="645.804932"
+       y="182.097198"
+       sodipodi:role="line"
+       id="tspan765">Piave Instance that handles</tspan><tspan
+       x="645.804932"
+       y="194.097198"
+       sodipodi:role="line"
+       id="tspan767">video information requests</tspan><tspan
+       x="645.804932"
+       y="206.097198"
+       sodipodi:role="line"
+       id="tspan769">and renders the final video</tspan></text>
+  <text
+     xml:space="preserve"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:middle;writing-mode:lr;"
+     x="645.804853"
+     y="274.598036"
+     id="text771"
+     sodipodi:linespacing="100%"><tspan
+       x="645.804871"
+       y="274.598022"
+       sodipodi:role="line"
+       id="tspan778">Redundant piave instance</tspan><tspan
+       x="645.804871"
+       y="286.598022"
+       sodipodi:role="line"
+       id="tspan780">that Kdenlive runs that</tspan><tspan
+       x="645.804871"
+       y="298.598022"
+       sodipodi:role="line"
+       id="tspan782">needs to be removed.</tspan></text>
+  <g
+     id="g814"
+     transform="translate(-14.14098,4.541704)">
+    <rect
+       style="font-size:12;fill:#ff9000;fill-rule:evenodd;stroke:#000000;stroke-width:0.382318;stroke-dashoffset:0;"
+       id="rect574"
+       width="133.25221252"
+       height="37.03978421"
+       x="22.39913559"
+       y="151.08258057" />
+    <text
+       xml:space="preserve"
+       style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:helvetica;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:0;"
+       x="24.0378813"
+       y="39.7498998"
+       id="text579"
+       transform="matrix(2.376363,0.000000,0.000000,2.376363,-21.41863,84.02695)"><tspan
+         id="tspan580"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:0;">Kdenlive</tspan></text>
+  </g>
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.45445pt;stroke-linejoin:bevel;"
+     d="M 455.19711 81.187157 L 455.19711 93.501026 L 466.87201 86.760518 L 455.19711 81.187157 z "
+     id="path820" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.45445pt;stroke-linejoin:bevel;"
+     d="M 456.13146 132.57651 L 456.13146 144.89038 L 467.80636 138.14987 L 456.13146 132.57651 z "
+     id="path821" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.45445pt;stroke-linejoin:bevel;"
+     d="M 455.19711 183.94312 L 455.19711 196.257 L 466.87201 189.51649 L 455.19711 183.94312 z "
+     id="path822" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.45445pt;stroke-linejoin:bevel;"
+     d="M 455.19711 279.61249 L 455.19711 291.92637 L 466.87201 285.18586 L 455.19711 279.61249 z "
+     id="path823" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:1.00617pt;stroke-linejoin:bevel;"
+     d="M 168.38729 162.35428 L 168.38729 189.61775 L 142.53856 174.69397 L 168.38729 162.35428 z "
+     id="path824" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.499641pt;"
+     d="M 163.32336 176.74434 L 174.053 176.74434 "
+     id="path825" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;"
+     id="path826"
+     sodipodi:cx="160.70854187"
+     sodipodi:cy="169.39958191"
+     sodipodi:rx="3.73740792"
+     sodipodi:ry="5.60611153"
+     d="M 164.445950 169.399582 A 3.737408 5.606112 0 1 0 156.971134,169.399582 A 3.73741 5.60611 0 1 0 164.446 169.4 L 160.708542 169.399582 z"
+     transform="matrix(0.525641,0.000000,0.000000,0.359413,89.90991,115.6521)" />
+</svg>
--- a/doc/devel/scheduler
+++ b/doc/devel/scheduler
--- a/doc/devel/scheduler
+++ b/doc/devel/scheduler
@@ -0,0 +1,537 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   id="svg1"
+   sodipodi:version="0.32"
+   inkscape:version="0.37"
+   width="210mm"
+   height="297mm"
+   sodipodi:docbase="/home/uchian/cvs/kdenlive/doc/devel"
+   sodipodi:docname="scheduler architecture.svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+   xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient575">
+      <stop
+         style="stop-color:#000;stop-opacity:1;"
+         offset="0"
+         id="stop576" />
+      <stop
+         style="stop-color:#fff;stop-opacity:1;"
+         offset="1"
+         id="stop577" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient575"
+       id="linearGradient578" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.04378857"
+     inkscape:cx="277.526089"
+     inkscape:cy="577.979556"
+     inkscape:window-width="1017"
+     inkscape:window-height="688"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <rect
+     style="font-size:12;fill:#ffff6b;fill-opacity:0.75;fill-rule:evenodd;stroke-width:0.625;"
+     id="rect1090"
+     width="113.28893280"
+     height="276.97848511"
+     x="406.77895092"
+     y="19.52470825" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ad5800;stroke-width:0.846085;"
+     d="M 406.77894 20.535562 L 406.77894 297.51403 "
+     id="path1091" />
+  <rect
+     style="font-size:12;fill:#ffff6b;fill-opacity:0.75;fill-rule:evenodd;stroke-width:0.625;"
+     id="rect1082"
+     width="113.28893280"
+     height="196.31208801"
+     x="121.62497448"
+     y="60.36342858" />
+  <g
+     id="g814"
+     transform="matrix(0.537052,0.000000,0.000000,0.537052,-8.286477,69.24000)">
+    <rect
+       style="font-size:12;fill:#ff9000;fill-rule:evenodd;stroke:#000000;stroke-width:0.382318;stroke-dashoffset:0;"
+       id="rect574"
+       width="133.25221252"
+       height="37.03978421"
+       x="22.39913559"
+       y="151.08258057" />
+    <text
+       xml:space="preserve"
+       style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:helvetica;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:0;"
+       x="24.0378813"
+       y="39.7498998"
+       id="text579"
+       transform="matrix(2.376363,0.000000,0.000000,2.376363,-21.41863,84.02695)"><tspan
+         id="tspan580"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:0;">Kdenlive</tspan></text>
+  </g>
+  <g
+     id="g682"
+     transform="matrix(0.537052,0.000000,0.000000,0.537052,163.5242,-56.78811)">
+    <rect
+       style="font-size:12;fill:#0090dc;fill-rule:evenodd;stroke:#000000;stroke-width:0.411708;stroke-dashoffset:0;fill-opacity:1;"
+       id="rect672"
+       width="154.52668659"
+       height="37.03978348"
+       x="237.21203672"
+       y="386.60428057" />
+    <text
+       xml:space="preserve"
+       style="font-size:12;font-weight:normal;stroke-width:1pt;stroke-opacity:0;font-family:Arial;font-style:normal;text-anchor:start;writing-mode:lr;"
+       x="24.0378813"
+       y="39.7498998"
+       id="text673"
+       transform="matrix(2.376363,0.000000,0.000000,2.376363,193.3943,319.5487)"
+       sodipodi:linespacing="100%"><tspan
+         x="24.0378819"
+         y="39.7499008"
+         sodipodi:role="line"
+         id="tspan680">Scheduler</tspan></text>
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:helvetica;"
+     x="263.458028"
+     y="243.108636"
+     id="text640"
+     transform="scale(0.537052,0.537052)"><tspan
+       id="tspan641">Clip Monitor Communication</tspan><tspan
+       sodipodi:role="line"
+       id="tspan643"
+       x="263.458038"
+       y="255.108643"></tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+     x="246.639699"
+     y="295.210519"
+     id="text645"
+     sodipodi:linespacing="100%"
+     transform="scale(0.537052,0.537052)"><tspan
+       x="246.639694"
+       y="295.210510"
+       sodipodi:role="line"
+       id="tspan650">Workspace Monitor Communication</tspan><tspan
+       x="246.639694"
+       y="307.210510"
+       sodipodi:role="line"
+       id="tspan652"></tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;text-anchor:middle;"
+     x="335.403126"
+     y="340.382150"
+     id="text654"
+     sodipodi:linespacing="100%"
+     transform="scale(0.537052,0.537052)"><tspan
+       x="335.403137"
+       y="340.382141"
+       sodipodi:role="line"
+       id="tspan683">Document Communication</tspan><tspan
+       x="335.403137"
+       y="352.382141"
+       sodipodi:role="line"
+       id="tspan685">(rendering, video file properties,</tspan><tspan
+       x="335.403137"
+       y="364.382141"
+       sodipodi:role="line"
+       id="tspan687">renderer capabilities, etc.)</tspan><tspan
+       x="335.403137"
+       y="376.382141"
+       sodipodi:role="line"
+       id="tspan689"></tspan></text>
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.244063pt;stroke-linejoin:bevel;"
+     d="M 531.81343 68.557292 L 531.81343 75.170492 L 538.08346 71.550492 L 531.81343 68.557292 z "
+     id="path823" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.540366pt;stroke-linejoin:bevel;"
+     d="M 90.828826 153.44962 L 90.828826 168.09153 L 76.946702 160.07668 L 90.828826 153.44962 z "
+     id="path824" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.268333pt;"
+     d="M 88.109228 161.17783 L 93.871606 161.17783 "
+     id="path825" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;"
+     id="path826"
+     sodipodi:cx="160.70854187"
+     sodipodi:cy="169.39958191"
+     sodipodi:rx="3.73740792"
+     sodipodi:ry="5.60611153"
+     d="M 164.445950 169.399582 A 3.737408 5.606112 0 1 0 156.971134,169.399582 A 3.73741 5.60611 0 1 0 164.446 169.4 L 160.708542 169.399582 z"
+     transform="matrix(0.282296,0.000000,0.000000,0.193024,48.68237,128.3681)" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.513087pt;"
+     d="M 131.51569 85.433382 C 131.51569 85.433382 131.51569 85.433382 131.51569 85.433382 "
+     id="path621" />
+  <text
+     xml:space="preserve"
+     style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;text-anchor:middle;"
+     x="153.453174"
+     y="68.5365585"
+     id="text625"
+     transform="scale(1.173579,1.173579)"
+     sodipodi:linespacing="100%"><tspan
+       x="153.453171"
+       y="68.5365601"
+       sodipodi:role="line"
+       id="tspan698">VEML</tspan><tspan
+       x="153.453171"
+       y="80.5365601"
+       sodipodi:role="line"
+       id="tspan700">Communication</tspan></text>
+  <g
+     id="g724"
+     transform="matrix(1.692170,0.000000,0.000000,1.692170,-0.432205,-376.9285)">
+    <g
+       id="g789"
+       transform="matrix(0.368200,0.000000,0.000000,0.368200,150.6929,237.0549)">
+      <rect
+         style="font-size:12;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.613809;stroke-dashoffset:0;fill:#00ff00;"
+         id="rect588"
+         width="254.58990479"
+         height="49.97110436"
+         x="458.55001831"
+         y="53.48257894" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="195.695480"
+         y="37.3953281"
+         id="text589"
+         transform="scale(2.376363,2.376363)"
+         sodipodi:linespacing="100%"><tspan
+           x="195.695480"
+           y="37.3953285"
+           sodipodi:role="line"
+           id="tspan596">Piave</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:middle;writing-mode:lr;"
+       x="1041.82505"
+       y="714.373325"
+       id="text702"
+       sodipodi:linespacing="100%"
+       transform="scale(0.368200,0.368200)"><tspan
+         x="1041.82507"
+         y="714.373352"
+         sodipodi:role="line"
+         id="tspan715">Piave Instance that</tspan><tspan
+         x="1041.82507"
+         y="726.373352"
+         sodipodi:role="line"
+         id="tspan717">displays the clip</tspan><tspan
+         x="1041.82507"
+         y="738.373352"
+         sodipodi:role="line"
+         id="tspan719">monitor video</tspan></text>
+  </g>
+  <g
+     id="g737"
+     transform="matrix(1.692170,0.000000,0.000000,1.692170,-0.432222,-372.1815)">
+    <g
+       id="g794"
+       transform="matrix(0.368200,0.000000,0.000000,0.368200,150.6929,256.6645)">
+      <rect
+         style="font-size:12;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.613809;stroke-dashoffset:0;fill:#00ff00;"
+         id="rect795"
+         width="254.58990479"
+         height="49.97110436"
+         x="458.55001831"
+         y="53.48257894" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="195.695480"
+         y="37.3953281"
+         id="text796"
+         transform="scale(2.376363,2.376363)"
+         sodipodi:linespacing="100%"><tspan
+           x="195.695480"
+           y="37.3953285"
+           sodipodi:role="line"
+           id="tspan797">Piave</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="fill:black;fill-opacity:1;stroke:none;font-family:Arial;font-style:normal;font-weight:normal;font-size:12;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:middle;writing-mode:lr;"
+       x="1038.08763"
+       y="765.568584"
+       id="text721"
+       sodipodi:linespacing="100%"
+       transform="scale(0.368200,0.368200)"><tspan
+         x="1038.08765"
+         y="765.568604"
+         sodipodi:role="line"
+         id="tspan752">Piave Instance that displays</tspan><tspan
+         x="1038.08765"
+         y="777.568604"
+         sodipodi:role="line"
+         id="tspan754">the workspace monitor</tspan><tspan
+         x="1038.08765"
+         y="789.568604"
+         sodipodi:role="line"
+         id="tspan756">video</tspan></text>
+  </g>
+  <g
+     id="g973"
+     transform="matrix(1.692170,0.000000,0.000000,1.692170,32.86821,-367.4884)">
+    <text
+       xml:space="preserve"
+       style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;text-anchor:middle;font-style:normal;writing-mode:lr;"
+       x="1040.89069"
+       y="938.190896"
+       id="text758"
+       sodipodi:linespacing="100%"
+       transform="scale(0.368200,0.368200)"><tspan
+         x="1040.89075"
+         y="938.190918"
+         sodipodi:role="line"
+         id="tspan872">Piave Instances that handle</tspan><tspan
+         x="1040.89075"
+         y="950.190918"
+         sodipodi:role="line"
+         id="tspan874">video information requests</tspan><tspan
+         x="1040.89075"
+         y="962.190918"
+         sodipodi:role="line"
+         id="tspan876">and render video to disk</tspan></text>
+    <g
+       id="g878"
+       transform="translate(0.000000,1.870210)">
+      <rect
+         style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.13401;stroke-dashoffset:0;"
+         id="rect800"
+         width="32.95817947"
+         height="18.39935942"
+         x="300.99536133"
+         y="303.38173888" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="331.049652"
+         y="336.355020"
+         id="text801"
+         transform="matrix(0.874977,0.000000,0.000000,0.874977,14.49413,21.97497)"
+         sodipodi:linespacing="100%"><tspan
+           x="331.049652"
+           y="336.355011"
+           sodipodi:role="line"
+           id="tspan802">Piave</tspan></text>
+    </g>
+    <g
+       id="g938"
+       transform="translate(0.000000,23.84518)">
+      <rect
+         style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.13401;stroke-dashoffset:0;"
+         id="rect939"
+         width="32.95817947"
+         height="18.39935942"
+         x="300.99536133"
+         y="303.38173888" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="331.049652"
+         y="336.355020"
+         id="text940"
+         transform="matrix(0.874977,0.000000,0.000000,0.874977,14.49413,21.97497)"
+         sodipodi:linespacing="100%"><tspan
+           x="331.049652"
+           y="336.355011"
+           sodipodi:role="line"
+           id="tspan941">Piave</tspan></text>
+    </g>
+    <g
+       id="g943"
+       transform="translate(0.000000,45.82015)">
+      <rect
+         style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.13401;stroke-dashoffset:0;"
+         id="rect944"
+         width="32.95817947"
+         height="18.39935942"
+         x="300.99536133"
+         y="303.38173888" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="331.049652"
+         y="336.355020"
+         id="text945"
+         transform="matrix(0.874977,0.000000,0.000000,0.874977,14.49413,21.97497)"
+         sodipodi:linespacing="100%"><tspan
+           x="331.049652"
+           y="336.355011"
+           sodipodi:role="line"
+           id="tspan946">Piave</tspan></text>
+    </g>
+    <g
+       id="g948"
+       transform="translate(0.000000,67.79512)">
+      <rect
+         style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.13401;stroke-dashoffset:0;"
+         id="rect949"
+         width="32.95817947"
+         height="18.39935942"
+         x="300.99536133"
+         y="303.38173888" />
+      <text
+         xml:space="preserve"
+         style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+         x="331.049652"
+         y="336.355020"
+         id="text950"
+         transform="matrix(0.874977,0.000000,0.000000,0.874977,14.49413,21.97497)"
+         sodipodi:linespacing="100%"><tspan
+           x="331.049652"
+           y="336.355011"
+           sodipodi:role="line"
+           id="tspan951">Piave</tspan></text>
+    </g>
+    <path
+       transform="scale(1.877027,4.125086)"
+       style="font-size:22;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+       d="M 186.67021 84.200294 L 186.67021 84.430555 C 186.67021 84.683859 185.66761 85.462908 185.3167 85.749367 C 184.97295 86.035825 184.74378 86.426125 184.6292 86.920265 C 184.51461 87.407244 184.45374 88.248716 184.44658 89.444679 C 184.43942 90.640643 184.41793 91.428403 184.38213 91.807961 C 184.31767 92.416684 184.19593 92.900083 184.01689 93.258156 C 183.84502 93.62339 183.63017 93.913429 183.37236 94.128273 C 183.11455 94.350278 182.78512 94.518572 182.38408 94.633156 C 182.11194 94.711932 181.66793 94.75132 181.05205 94.75132 L 181.33372 94.650847 L 181.33372 93.918818 L 181.66672 93.918818 C 182.41151 93.918818 182.90566 92.828256 183.14914 92.55612 C 183.39263 92.291146 183.51438 91.689584 183.51438 90.751433 C 183.51438 88.961068 183.54661 87.825977 183.61106 87.346159 C 183.72564 86.551238 183.95481 85.917448 184.29856 85.444792 C 184.64231 84.964974 185.12929 84.592579 185.7595 84.327605 C 184.93593 83.933724 184.35585 83.414519 184.01926 82.769988 C 183.68267 82.118295 183.51438 81.022592 183.51438 79.482878 C 183.51438 78.086394 183.49648 77.252084 183.46067 76.979948 C 183.41054 76.500131 183.26731 76.167123 183.03098 75.980925 C 182.80181 75.787566 182.34706 74.786627 181.66672 74.786627 L 181.33372 74.786627 L 181.33372 74.004363 L 181.05205 74.104836 C 181.75387 74.104836 182.26233 74.162127 182.57744 74.276711 C 183.03577 74.434263 183.41533 74.699237 183.71611 75.071632 C 184.01689 75.444028 184.21025 75.913104 184.29619 76.478859 C 184.38929 77.044614 184.43942 77.972023 184.44658 79.261086 C 184.45374 80.550148 184.51461 81.44175 184.6292 81.93589 C 184.74378 82.422869 184.97295 82.809588 185.3167 83.096046 C 185.66761 83.382505 186.67021 83.94897 186.67021 84.200294 z "
+       id="path970"
+       sodipodi:nodetypes="csccccccccccccccccccccccccccccccs" />
+  </g>
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.540366pt;stroke-linejoin:bevel;"
+     d="M 274.71766 153.91169 L 274.71766 168.55361 L 288.59978 160.53875 L 274.71766 153.91169 z "
+     id="path1030" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.05761;stroke-linecap:round;stroke-linejoin:bevel;"
+     d="M 273.23298 161.16514 L 94.134456 161.13556 L 112.38658 122.57311 L 247.56828 122.57311 L 273.23298 161.16514 z M 273.23298 161.62724 L 248.51827 200.42737 L 113.89197 200.41267 L 94.071036 161.04182 "
+     id="path1038"
+     sodipodi:nodetypes="ccccccccc" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.244063pt;stroke-linejoin:bevel;"
+     d="M 531.81343 107.17073 L 531.81343 113.78393 L 538.08346 110.16392 L 531.81343 107.17073 z "
+     id="path1039" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.244063pt;stroke-linejoin:bevel;"
+     d="M 531.81343 163.28403 L 531.81343 169.89723 L 538.08346 166.27722 L 531.81343 163.28403 z "
+     id="path1040" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.244063pt;stroke-linejoin:bevel;"
+     d="M 531.81343 199.78848 L 531.81343 206.40168 L 538.08346 202.78167 L 531.81343 199.78848 z "
+     id="path1041" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.244063pt;stroke-linejoin:bevel;"
+     d="M 531.81343 239.05425 L 531.81343 245.66745 L 538.08346 242.04744 L 531.81343 239.05425 z "
+     id="path1042" />
+  <path
+     style="font-size:12;fill-rule:evenodd;stroke:#000000;stroke-width:0.244063pt;stroke-linejoin:bevel;"
+     d="M 531.81343 273.20377 L 531.81343 279.81698 L 538.08346 276.19697 L 531.81343 273.20377 z "
+     id="path1043" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.05761;"
+     d="M 373.5047 162.5514 L 394.76045 276.22348 L 533.84703 276.22348 M 373.96678 162.5514 L 395.19218 241.76566 L 531.99871 241.76566 M 373.96678 161.16516 L 397.78162 202.41364 L 531.99871 202.41364 M 374.42886 160.70308 L 395.68463 166.71013 L 532.92287 166.71013 M 374.89095 160.70308 L 399.38128 110.33617 L 532.46079 110.33617 M 374.42886 161.16516 L 398.5445 71.164402 L 531.53663 71.164402 "
+     id="path1056" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.513087pt;"
+     d="M 415.95324 44.594742 C 415.95324 44.594742 415.95324 44.594742 415.95324 44.594742 "
+     id="path1060" />
+  <text
+     xml:space="preserve"
+     style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;text-anchor:middle;"
+     x="395.820819"
+     y="33.7381900"
+     id="text1061"
+     transform="scale(1.173579,1.173579)"
+     sodipodi:linespacing="100%"><tspan
+       x="395.820831"
+       y="33.7381897"
+       sodipodi:role="line"
+       id="tspan1062">VEML</tspan><tspan
+       x="395.820831"
+       y="45.7381897"
+       sodipodi:role="line"
+       id="tspan1064">Communication</tspan></text>
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ad5800;stroke-width:0.846085;"
+     d="M 519.98078 20.535562 L 519.98078 297.51403 "
+     id="path1096" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ad5800;stroke-width:0.714365;"
+     d="M 234.82677 59.941272 L 234.82677 257.39183 "
+     id="path1097" />
+  <path
+     style="font-size:12;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ad5800;stroke-width:0.714365;"
+     d="M 122.34139 59.941272 L 122.34139 257.39183 "
+     id="path1101" />
+  <text
+     xml:space="preserve"
+     style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:helvetica;"
+     x="787.748921"
+     y="147.055353"
+     id="text1102"
+     transform="scale(0.537052,0.537052)"><tspan
+       id="tspan1103">Clip Monitor Communication</tspan><tspan
+       sodipodi:role="line"
+       id="tspan1105"
+       x="787.748901"
+       y="159.055359"></tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;"
+     x="765.594319"
+     y="220.502374"
+     id="text1107"
+     sodipodi:linespacing="100%"
+     transform="scale(0.537052,0.537052)"><tspan
+       x="765.594299"
+       y="220.502380"
+       sodipodi:role="line"
+       id="tspan1108">Workspace Monitor Communication</tspan><tspan
+       x="765.594299"
+       y="232.502380"
+       sodipodi:role="line"
+       id="tspan1110"></tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12;font-weight:normal;stroke-width:1pt;font-family:Arial;text-anchor:middle;"
+     x="866.364400"
+     y="400.415414"
+     id="text1112"
+     sodipodi:linespacing="100%"
+     transform="scale(0.537052,0.537052)"><tspan
+       x="866.364380"
+       y="400.415405"
+       sodipodi:role="line"
+       id="tspan1113">Document Communication</tspan><tspan
+       x="866.364380"
+       y="412.415405"
+       sodipodi:role="line"
+       id="tspan1115">(rendering, video file properties,</tspan><tspan
+       x="866.364380"
+       y="424.415405"
+       sodipodi:role="line"
+       id="tspan1117">renderer capabilities, etc.)</tspan><tspan
+       x="866.364380"
+       y="436.415405"
+       sodipodi:role="line"
+       id="tspan1119"></tspan></text>
+</svg>
--- a/doc/devel/uml_diagram.xmi
+++ b/doc/devel/uml_diagram.xmi
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XMI xmlns:UML="org.omg/standards/UML" verified="false" timestamp="" xmi.version="1.2" >
+ <XMI.header>
+  <XMI.documentation>
+   <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
+   <XMI.exporterVersion>1.2.0</XMI.exporterVersion>
+   <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>
+  </XMI.documentation>
+  <XMI.model xmi.name="uml_diagram" href="/home/uchian/cvs/kdenlive/doc/devel/uml_diagram.xmi" />
+  <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
+ </XMI.header>
+ <XMI.content>
+  <docsettings viewid="20" documentation="" uniqueid="42" />
+  <umlobjects>
+   <UML:Datatype stereotype="datatype" visibility="public" xmi.id="2" isAbstract="false" name="int" ownerScope="instance" />
+   <UML:Datatype stereotype="datatype" visibility="public" xmi.id="3" isAbstract="false" name="char" ownerScope="instance" />
+   <UML:Datatype stereotype="datatype" visibility="public" xmi.id="4" isAbstract="false" name="bool" ownerScope="instance" />
+   <UML:Datatype stereotype="datatype" visibility="public" xmi.id="5" isAbstract="false" name="float" ownerScope="instance" />
+   <UML:Datatype stereotype="datatype" visibility="public" xmi.id="6" isAbstract="false" name="double" ownerScope="instance" />
+   <UML:Datatype stereotype="datatype" visibility="public" xmi.id="7" isAbstract="false" name="long" ownerScope="instance" />
+   <UML:Datatype stereotype="datatype" visibility="public" xmi.id="8" isAbstract="false" name="short" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="25" isAbstract="false" name="Effect" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="26" isAbstract="false" name="EffectDesc" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="27" isAbstract="false" name="EffectDescriptionList" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="28" isAbstract="false" name="EffectKeyframe" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="29" isAbstract="false" name="EffectParamDesc" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="30" isAbstract="false" name="EffectParamDescFactory" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="31" isAbstract="false" name="EffectParameter" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="32" isAbstract="false" name="EffectStack" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="33" isAbstract="false" name="EffectParamDescFactoryBase" ownerScope="instance" />
+   <UML:Class stereotype="class" visibility="public" xmi.id="34" isAbstract="false" name="EffectParamDescFactoryTemplate" ownerScope="instance" />
+   <UML:Association nameb="" visibilitya="200" visibilityb="200" assoctype="500" rolea="34" roleb="33" visibility="public" multia="" doca="" multib="" docb="" xmi.id="36" isAbstract="false" name="" ownerScope="instance" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" visibilitya="200" visibilityb="200" assoctype="501" rolea="33" roleb="30" visibility="public" multia="" doca="" multib="" docb="" xmi.id="38" isAbstract="false" name="" ownerScope="instance" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" visibilitya="200" visibilityb="200" assoctype="501" rolea="28" roleb="31" visibility="public" multia="" doca="" multib="" docb="" xmi.id="39" isAbstract="false" name="" ownerScope="instance" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" visibilitya="200" visibilityb="200" assoctype="501" rolea="31" roleb="25" visibility="public" multia="" doca="" multib="" docb="" xmi.id="40" isAbstract="false" name="" ownerScope="instance" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" visibilitya="200" visibilityb="200" assoctype="501" rolea="25" roleb="32" visibility="public" multia="" doca="" multib="" docb="" xmi.id="41" isAbstract="false" name="" ownerScope="instance" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" visibilitya="200" visibilityb="200" assoctype="501" rolea="26" roleb="27" visibility="public" multia="" doca="" multib="" docb="" xmi.id="42" isAbstract="false" name="" ownerScope="instance" changeabilitya="900" changeabilityb="900" namea="" />
+  </umlobjects>
+  <diagrams>
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="808" snapy="10" showatts="1" xmi.id="1" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="610" >
+    <widgets/>
+    <messages/>
+    <associations/>
+   </diagram>
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="808" snapy="10" showatts="1" xmi.id="20" documentation="" type="402" showops="1" showpackage="0" name="Effect Framework" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="610" >
+    <widgets>
+     <UML:ClassWidget usesdiagramfillcolour="1" width="60" showattsigs="601" usesdiagramusefillcolour="1" x="547" linecolour="none" y="188" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="25" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="83" showattsigs="601" usesdiagramusefillcolour="1" x="360" linecolour="none" y="188" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="26" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="155" showattsigs="601" usesdiagramusefillcolour="1" x="324" linecolour="none" y="103" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="27" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="115" showattsigs="601" usesdiagramusefillcolour="1" x="519" linecolour="none" y="360" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="28" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="128" showattsigs="601" usesdiagramusefillcolour="1" x="337" linecolour="none" y="267" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="29" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="180" showattsigs="601" usesdiagramusefillcolour="1" x="58" linecolour="none" y="80" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="30" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="124" showattsigs="601" usesdiagramusefillcolour="1" x="514" linecolour="none" y="267" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="31" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="88" showattsigs="601" usesdiagramusefillcolour="1" x="664" linecolour="none" y="51" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="32" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="215" showattsigs="601" usesdiagramusefillcolour="1" x="42" linecolour="none" y="182" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="33" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="246" showattsigs="601" usesdiagramusefillcolour="1" x="26" linecolour="none" y="271" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="34" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
+    </widgets>
+    <messages/>
+    <associations>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="33" widgetaid="34" xmi.id="36" >
+      <linepath>
+       <startpoint startx="149" starty="271" />
+       <endpoint endx="149" endy="214" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="30" widgetaid="33" xmi.id="38" >
+      <linepath>
+       <startpoint startx="149" starty="182" />
+       <endpoint endx="149" endy="112" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="31" widgetaid="29" roleBdoc="" roleAdoc="" type="503" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <linepath>
+       <startpoint startx="465" starty="283" />
+       <endpoint endx="514" endy="283" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="25" widgetaid="26" roleBdoc="" roleAdoc="" type="503" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <linepath>
+       <startpoint startx="443" starty="204" />
+       <endpoint endx="547" endy="204" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="31" widgetaid="28" xmi.id="39" >
+      <linepath>
+       <startpoint startx="576" starty="360" />
+       <endpoint endx="576" endy="299" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="25" widgetaid="31" xmi.id="40" >
+      <linepath>
+       <startpoint startx="576" starty="267" />
+       <endpoint endx="577" endy="220" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="26" widgetaid="29" roleBdoc="" roleAdoc="" type="503" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <linepath>
+       <startpoint startx="401" starty="267" />
+       <endpoint endx="401" endy="220" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="32" widgetaid="25" xmi.id="41" >
+      <linepath>
+       <startpoint startx="577" starty="188" />
+       <endpoint endx="708" endy="83" />
+       <point x="577" y="141" />
+       <point x="717" y="139" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="27" widgetaid="26" xmi.id="42" >
+      <linepath>
+       <startpoint startx="401" starty="188" />
+       <endpoint endx="401" endy="135" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="29" widgetaid="34" roleBdoc="" roleAdoc="" type="503" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <linepath>
+       <startpoint startx="272" starty="287" />
+       <endpoint endx="337" endy="283" />
+      </linepath>
+     </UML:AssocWidget>
+    </associations>
+   </diagram>
+  </diagrams>
+  <listview>
+   <listitem open="1" type="800" id="-1" label="Views" >
+    <listitem open="1" type="801" id="-1" label="Logical View" >
+     <listitem open="0" type="807" id="20" label="Effect Framework" />
+     <listitem open="0" type="807" id="1" label="class diagram" />
+     <listitem open="1" type="813" id="25" label="Effect" />
+     <listitem open="1" type="813" id="26" label="EffectDesc" />
+     <listitem open="1" type="813" id="27" label="EffectDescriptionList" />
+     <listitem open="1" type="813" id="28" label="EffectKeyframe" />
+     <listitem open="1" type="813" id="29" label="EffectParamDesc" />
+     <listitem open="1" type="813" id="30" label="EffectParamDescFactory" />
+     <listitem open="1" type="813" id="33" label="EffectParamDescFactoryBase" />
+     <listitem open="1" type="813" id="34" label="EffectParamDescFactoryTemplate" />
+     <listitem open="1" type="813" id="31" label="EffectParameter" />
+     <listitem open="1" type="813" id="32" label="EffectStack" />
+     <listitem open="0" type="830" id="-1" label="Datatypes" >
+      <listitem open="1" type="829" id="4" label="bool" />
+      <listitem open="1" type="829" id="3" label="char" />
+      <listitem open="1" type="829" id="6" label="double" />
+      <listitem open="1" type="829" id="5" label="float" />
+      <listitem open="1" type="829" id="2" label="int" />
+      <listitem open="1" type="829" id="7" label="long" />
+      <listitem open="1" type="829" id="8" label="short" />
+     </listitem>
+    </listitem>
+    <listitem open="1" type="802" id="-1" label="Use Case View" />
+    <listitem open="1" type="821" id="-1" label="Component View" />
+    <listitem open="1" type="827" id="-1" label="Deployment View" />
+   </listitem>
+  </listview>
+  <codegeneration/>
+ </XMI.content>
+</XMI>
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -1,36 +1,2 @@
-####### kdevelop will overwrite this part!!! (begin)##########
-
-
-EXTRA_DIST = index.docbook mainwindow.png monitor_panel.png project_panel.png timeline_panel.png project_with_clips.png debug_tab.png setup_renderer.png rendering_project.png
-
-####### kdevelop will overwrite this part!!! (end)############
-
-endocbook_DATA = index.docbook
-endocbookdir = $(kde_htmldir)/en/kdenlive
-
-KDE_LANG = en
 KDE_DOCS = kdenlive
-DOCDIR = $(DESTDIR)${kde_htmldir}
-
-index_en.pot: index.docbook index-shifted.docbook
-	xml2pot index.docbook > index_en.pot
-
-index-shifted.docbook: index.docbook
-	cat index.docbook | expand | sed s/^[\ ]*// > index-shifted.docbook
-noinst_HEADERS =  index_en.pot index-shifted.docbook
-
-# --- Translated html help, not needed in distribution. Just for the Web site ---
-
-index.html: index.docbook
-	@MEINPROC@ --check index.docbook
-	mkdir -p ./html
-	mv *.html ./html/
-	cp -R *.png ./html/
-	rm -Rf ./common
-	mkdir -p ./html/common
-	cp -R ${DOCDIR}/en/common/* ./html/common
-	for file in ./html/*.html; do { \
-		echo $$file; \
-		cat $$file | sed s+help:/common+./common+g > $$file.new; \
-		mv $$file.new $$file; \
-	} done
+KDE_LANG = en
--- a/doc/en/debug_tab.png
+++ b/doc/en/debug_tab.png
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -2,6 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
  <!ENTITY kdenlive '<application>Kdenlive</application>'>
  <!ENTITY piave '<application>Piave</application>'>
+  <!ENTITY kino '<application>Kino</application>'>
  <!ENTITY kapp "&kdenlive;"><!-- replace kdenlive here -->
  <!ENTITY % addindex "IGNORE">
  <!ENTITY % English "INCLUDE"><!-- change language only here -->
@@ -808,7 +809,8 @@ or menu bars. -->
 </term>
 <listitem>
 <para>
-<action>Non-functional at present</action>
+<action>Delete the selected clip from the project. This deletes all references to the clip,
+including those on the timeline, or those within composite clips.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1301,9 +1303,76 @@ taken from that reference and shortened a bit for readability. -->
 	application work. -->

 	&reporting.bugs;
-	&updating.documentation;
+	<!--	&updating.documentation; -->

 	<qandaset id="faqlist">
+		<qandaentry>
+			<question>
+				<para>
+					What file formats does &kapp; support?
+				</para>
+			</question>
+			<answer>
+				<para>
+					Currently, &kapp; supports playback of AVI files that use the
+					DV codec (other types of AVI file will fail) and Raw DV files.
+					Both of these formats are exported by &kino;.
+				</para>
+				<note>
+					<para>
+						On a technical note, &kapp; does not provide any video formats
+						itself; all video formats are provided by the backend renderer,
+						&piave;.
+					</para>
+				</note>
+			</answer>
+		</qandaentry>
+		<qandaentry>
+			<question>
+				<para>
+					When will &kapp; support divx/mpeg files?
+				</para>
+			</question>
+			<answer>
+				<para>
+					Short answer : When somebody codes the relevant plugin for &piave;.
+				</para>
+				<para>
+					The long answer : Supporting divx files in an editing application
+				        is difficult. divx and mpeg formats are not designed for video editing.
+					Some frames contain only part of the information required to display that
+					frame, which makes the random acces required by a video editing application
+					difficult to achieve. There are also quality issues with decompressing and
+					recompressing files that need to be taken into account. For these reasons,
+					support for these formats in &kapp; itself are of low priority compared to
+				       	the effect framework, the capture program and other such features.
+				</para>
+				<para>
+					If somebody is interested is adding divx/mpeg support to &kapp; (or to
+					be technically correct, &piave;) then please contact me, and I will point
+					you in the right direction. In the meantime, it is suggested that you
+					capture video directly in Raw DV using &kino;, or convert your files to 
+					Raw DV format for use with &kapp;
+				</para>
+			</answer>
+		</qandaentry>
+		<qandaentry>
+			<question>
+				<para>
+					When will &kapp; support mp3 files and other audio formats?
+				</para>
+			</question>
+			<answer>
+				<para>
+					Sometime in the future, perhaps version 0.4.0 or 0.5.0.
+					The roadmap on the website gives a rough idea of the order in which 
+					features are being added to &kapp;. The next priority is the
+					effect framework, which will be the made addition for the 0.3.0 release.
+					Once &kapp; 0.3.0 is released, we will decide on the next most important
+					feature. This may be separate audio tracks.
+				</para>
+			</answer>
+		</qandaentry>
 		<qandaentry>
 			<question>
 				<para>When I add clips to the project, the times show up as 'unknown'. I
@@ -1444,7 +1513,7 @@ or the ChangeLog file, or ... -->
 		In order to compile and install &kdenlive; on your system, type the following in the base
 		directory of the &kdenlive; distribution:
 		<screen width="40">
-                        <prompt>%</prompt> <userinput>./configure</userinput>
+                        <prompt>%</prompt> <userinput>./configure --prefix=`kde-config --prefix`</userinput>
 		</screen>
 		<screen width="40">
                        <prompt>%</prompt> <userinput>make</userinput>
--- a/doc/en/mainwindow.png
+++ b/doc/en/mainwindow.png
--- a/doc/en/monitor_panel.png
+++ b/doc/en/monitor_panel.png
--- a/doc/en/project_panel.png
+++ b/doc/en/project_panel.png
--- a/doc/en/project_with_clips.png
+++ b/doc/en/project_with_clips.png
--- a/doc/en/rendering_project.png
+++ b/doc/en/rendering_project.png
--- a/doc/en/setup_renderer.png
+++ b/doc/en/setup_renderer.png
--- a/doc/en/timeline_panel.png
+++ b/doc/en/timeline_panel.png
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -1,38 +1,2 @@
-
-EXTRA_DIST = index.docbook mainwindow.png monitor_panel.png project_panel.png timeline_panel.png project_with_clips.png debug_tab.png setup_renderer.png rendering_project.png
-
-KDE_LANG = fr
 KDE_DOCS = kdenlive
-DOCDIR = $(DESTDIR)${kde_htmldir}
-
-docbook_DATA = index.docbook
-docbookdir = $(kde_htmldir)/fr/kdenlive
-
-
-index_fr.po: ../en/index_en.pot
-	msgmerge -o index_fr.po index_fr.po ../en/index_en.pot
-
-index.docbook: ../en/index.docbook ../en/index_en.pot index_fr.po
-	${MAKE} index_fr.po ../en/index-shifted.docbook
-	@echo "converting french help"
-	@echo "(this takes very very long, please be patient...)"
-	po2xml ../en/index-shifted.docbook index_fr.po | \
-	sed s/^\<\!ENTITY\ %\ English\ /\<\!ENTITY\ %\ French\ /g > $@
-
-noinst_HEADERS =  index_fr.po
-
-# --- Translated html help, not needed in distribution. Just for the Web site ---
-
-index.html: index.docbook
-	@MEINPROC@ --check index.docbook
-	mkdir -p ./html
-	mv *.html ./html/
-	cp -R *.png ./html/
-	rm -Rf ./common
-	mkdir -p ./html/common
-	cp -R ${DOCDIR}/fr/common/* ./html/common
-	for file in ./html/*.html; do { \
-		echo $$file; \
-		cat $$file | sed s+help:/common+./common+g > $$file.new; \
-		mv $$file.new $$file; \
-	} done
+KDE_LANG = fr
--- a/Show More
+++ b/Show More